From 1d40970d4b1e4d8dbe9e63d3ff304ea7cd03466a Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 29 Jun 2024 21:51:19 +0200 Subject: [PATCH 1/9] feat: port to minecraft 1.21 --- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .../issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 3 +- .github/workflows/resolved-issue-locking.yml | 2 +- .github/workflows/validate-branch-name.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- .../workflows/validate-commit-messages.yml | 2 +- .idea/dictionaries/refinedstorage2.xml | 1 + CHANGELOG.md | 15 + gradle.properties | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- .../platform/api/PlatformApi.java | 9 +- .../platform/api/PlatformApiProxy.java | 21 +- .../ConfigurationCardTarget.java | 5 +- .../AbstractStorageContainerBlockItem.java | 13 +- .../storage/AbstractStorageContainerItem.java | 24 +- .../api/storage/SerializableStorage.java | 12 +- .../api/storage/StorageContainerItem.java | 4 +- .../storage/StorageContainerItemHelper.java | 8 +- .../api/storage/StorageRepository.java | 8 +- .../platform/api/storage/StorageType.java | 9 +- .../energy/AbstractEnergyBlockItem.java | 4 +- .../support/energy/AbstractEnergyItem.java | 6 +- .../AbstractNetworkBoundEnergyItem.java | 5 +- .../network/bounditem/SlotReference.java | 3 - .../bounditem/SlotReferenceFactory.java | 25 +- .../support/registry/PlatformRegistry.java | 13 + .../support/resource/PlatformResourceKey.java | 6 - .../support/resource/ResourceContainer.java | 10 +- .../api/support/resource/ResourceType.java | 12 +- .../recipes/misc/coloring/black_cable.json | 2 +- .../misc/coloring/black_constructor.json | 2 +- .../misc/coloring/black_controller.json | 2 +- .../misc/coloring/black_crafting_grid.json | 2 +- .../misc/coloring/black_destructor.json | 2 +- .../recipes/misc/coloring/black_detector.json | 2 +- .../misc/coloring/black_disk_interface.json | 2 +- .../recipes/misc/coloring/black_exporter.json | 2 +- .../misc/coloring/black_external_storage.json | 2 +- .../recipes/misc/coloring/black_grid.json | 2 +- .../recipes/misc/coloring/black_importer.json | 2 +- .../misc/coloring/black_network_receiver.json | 2 +- .../coloring/black_network_transmitter.json | 2 +- .../recipes/misc/coloring/black_relay.json | 2 +- .../misc/coloring/black_security_manager.json | 2 +- .../coloring/black_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/blue_cable.json | 2 +- .../misc/coloring/blue_constructor.json | 2 +- .../misc/coloring/blue_controller.json | 2 +- .../misc/coloring/blue_crafting_grid.json | 2 +- .../misc/coloring/blue_destructor.json | 2 +- .../recipes/misc/coloring/blue_detector.json | 2 +- .../misc/coloring/blue_disk_interface.json | 2 +- .../recipes/misc/coloring/blue_exporter.json | 2 +- .../misc/coloring/blue_external_storage.json | 2 +- .../recipes/misc/coloring/blue_grid.json | 2 +- .../recipes/misc/coloring/blue_importer.json | 2 +- .../misc/coloring/blue_network_receiver.json | 2 +- .../coloring/blue_network_transmitter.json | 2 +- .../recipes/misc/coloring/blue_relay.json | 2 +- .../misc/coloring/blue_security_manager.json | 2 +- .../coloring/blue_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/brown_cable.json | 2 +- .../misc/coloring/brown_constructor.json | 2 +- .../misc/coloring/brown_controller.json | 2 +- .../misc/coloring/brown_crafting_grid.json | 2 +- .../misc/coloring/brown_destructor.json | 2 +- .../recipes/misc/coloring/brown_detector.json | 2 +- .../misc/coloring/brown_disk_interface.json | 2 +- .../recipes/misc/coloring/brown_exporter.json | 2 +- .../misc/coloring/brown_external_storage.json | 2 +- .../recipes/misc/coloring/brown_grid.json | 2 +- .../recipes/misc/coloring/brown_importer.json | 2 +- .../misc/coloring/brown_network_receiver.json | 2 +- .../coloring/brown_network_transmitter.json | 2 +- .../recipes/misc/coloring/brown_relay.json | 2 +- .../misc/coloring/brown_security_manager.json | 2 +- .../coloring/brown_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/cyan_cable.json | 2 +- .../misc/coloring/cyan_constructor.json | 2 +- .../misc/coloring/cyan_controller.json | 2 +- .../misc/coloring/cyan_crafting_grid.json | 2 +- .../misc/coloring/cyan_destructor.json | 2 +- .../recipes/misc/coloring/cyan_detector.json | 2 +- .../misc/coloring/cyan_disk_interface.json | 2 +- .../recipes/misc/coloring/cyan_exporter.json | 2 +- .../misc/coloring/cyan_external_storage.json | 2 +- .../recipes/misc/coloring/cyan_grid.json | 2 +- .../recipes/misc/coloring/cyan_importer.json | 2 +- .../misc/coloring/cyan_network_receiver.json | 2 +- .../coloring/cyan_network_transmitter.json | 2 +- .../recipes/misc/coloring/cyan_relay.json | 2 +- .../misc/coloring/cyan_security_manager.json | 2 +- .../coloring/cyan_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/gray_cable.json | 2 +- .../misc/coloring/gray_constructor.json | 2 +- .../misc/coloring/gray_controller.json | 2 +- .../misc/coloring/gray_crafting_grid.json | 2 +- .../misc/coloring/gray_destructor.json | 2 +- .../recipes/misc/coloring/gray_detector.json | 2 +- .../misc/coloring/gray_disk_interface.json | 2 +- .../recipes/misc/coloring/gray_exporter.json | 2 +- .../misc/coloring/gray_external_storage.json | 2 +- .../recipes/misc/coloring/gray_grid.json | 2 +- .../recipes/misc/coloring/gray_importer.json | 2 +- .../misc/coloring/gray_network_receiver.json | 2 +- .../coloring/gray_network_transmitter.json | 2 +- .../recipes/misc/coloring/gray_relay.json | 2 +- .../misc/coloring/gray_security_manager.json | 2 +- .../coloring/gray_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/green_cable.json | 2 +- .../misc/coloring/green_constructor.json | 2 +- .../misc/coloring/green_controller.json | 2 +- .../misc/coloring/green_crafting_grid.json | 2 +- .../misc/coloring/green_destructor.json | 2 +- .../recipes/misc/coloring/green_detector.json | 2 +- .../misc/coloring/green_disk_interface.json | 2 +- .../recipes/misc/coloring/green_exporter.json | 2 +- .../misc/coloring/green_external_storage.json | 2 +- .../recipes/misc/coloring/green_grid.json | 2 +- .../recipes/misc/coloring/green_importer.json | 2 +- .../misc/coloring/green_network_receiver.json | 2 +- .../coloring/green_network_transmitter.json | 2 +- .../recipes/misc/coloring/green_relay.json | 2 +- .../misc/coloring/green_security_manager.json | 2 +- .../coloring/green_wireless_transmitter.json | 2 +- .../misc/coloring/light_blue_cable.json | 2 +- .../misc/coloring/light_blue_constructor.json | 2 +- .../misc/coloring/light_blue_controller.json | 2 +- .../coloring/light_blue_crafting_grid.json | 2 +- .../misc/coloring/light_blue_destructor.json | 2 +- .../misc/coloring/light_blue_detector.json | 2 +- .../coloring/light_blue_disk_interface.json | 2 +- .../misc/coloring/light_blue_exporter.json | 2 +- .../coloring/light_blue_external_storage.json | 2 +- .../misc/coloring/light_blue_grid.json | 2 +- .../misc/coloring/light_blue_importer.json | 2 +- .../coloring/light_blue_network_receiver.json | 2 +- .../light_blue_network_transmitter.json | 2 +- .../misc/coloring/light_blue_relay.json | 2 +- .../coloring/light_blue_security_manager.json | 2 +- .../light_blue_wireless_transmitter.json | 2 +- .../misc/coloring/light_gray_cable.json | 2 +- .../misc/coloring/light_gray_constructor.json | 2 +- .../misc/coloring/light_gray_controller.json | 2 +- .../coloring/light_gray_crafting_grid.json | 2 +- .../misc/coloring/light_gray_destructor.json | 2 +- .../misc/coloring/light_gray_detector.json | 2 +- .../coloring/light_gray_disk_interface.json | 2 +- .../misc/coloring/light_gray_exporter.json | 2 +- .../coloring/light_gray_external_storage.json | 2 +- .../misc/coloring/light_gray_grid.json | 2 +- .../misc/coloring/light_gray_importer.json | 2 +- .../coloring/light_gray_network_receiver.json | 2 +- .../light_gray_network_transmitter.json | 2 +- .../misc/coloring/light_gray_relay.json | 2 +- .../coloring/light_gray_security_manager.json | 2 +- .../light_gray_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/lime_cable.json | 2 +- .../misc/coloring/lime_constructor.json | 2 +- .../misc/coloring/lime_controller.json | 2 +- .../misc/coloring/lime_crafting_grid.json | 2 +- .../misc/coloring/lime_destructor.json | 2 +- .../recipes/misc/coloring/lime_detector.json | 2 +- .../misc/coloring/lime_disk_interface.json | 2 +- .../recipes/misc/coloring/lime_exporter.json | 2 +- .../misc/coloring/lime_external_storage.json | 2 +- .../recipes/misc/coloring/lime_grid.json | 2 +- .../recipes/misc/coloring/lime_importer.json | 2 +- .../misc/coloring/lime_network_receiver.json | 2 +- .../coloring/lime_network_transmitter.json | 2 +- .../recipes/misc/coloring/lime_relay.json | 2 +- .../misc/coloring/lime_security_manager.json | 2 +- .../coloring/lime_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/magenta_cable.json | 2 +- .../misc/coloring/magenta_constructor.json | 2 +- .../misc/coloring/magenta_controller.json | 2 +- .../misc/coloring/magenta_crafting_grid.json | 2 +- .../misc/coloring/magenta_destructor.json | 2 +- .../misc/coloring/magenta_detector.json | 2 +- .../misc/coloring/magenta_disk_interface.json | 2 +- .../misc/coloring/magenta_exporter.json | 2 +- .../coloring/magenta_external_storage.json | 2 +- .../recipes/misc/coloring/magenta_grid.json | 2 +- .../misc/coloring/magenta_importer.json | 2 +- .../coloring/magenta_network_receiver.json | 2 +- .../coloring/magenta_network_transmitter.json | 2 +- .../recipes/misc/coloring/magenta_relay.json | 2 +- .../coloring/magenta_security_manager.json | 2 +- .../magenta_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/orange_cable.json | 2 +- .../misc/coloring/orange_constructor.json | 2 +- .../misc/coloring/orange_controller.json | 2 +- .../misc/coloring/orange_crafting_grid.json | 2 +- .../misc/coloring/orange_destructor.json | 2 +- .../misc/coloring/orange_detector.json | 2 +- .../misc/coloring/orange_disk_interface.json | 2 +- .../misc/coloring/orange_exporter.json | 2 +- .../coloring/orange_external_storage.json | 2 +- .../recipes/misc/coloring/orange_grid.json | 2 +- .../misc/coloring/orange_importer.json | 2 +- .../coloring/orange_network_receiver.json | 2 +- .../coloring/orange_network_transmitter.json | 2 +- .../recipes/misc/coloring/orange_relay.json | 2 +- .../coloring/orange_security_manager.json | 2 +- .../coloring/orange_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/pink_cable.json | 2 +- .../misc/coloring/pink_constructor.json | 2 +- .../misc/coloring/pink_controller.json | 2 +- .../misc/coloring/pink_crafting_grid.json | 2 +- .../misc/coloring/pink_destructor.json | 2 +- .../recipes/misc/coloring/pink_detector.json | 2 +- .../misc/coloring/pink_disk_interface.json | 2 +- .../recipes/misc/coloring/pink_exporter.json | 2 +- .../misc/coloring/pink_external_storage.json | 2 +- .../recipes/misc/coloring/pink_grid.json | 2 +- .../recipes/misc/coloring/pink_importer.json | 2 +- .../misc/coloring/pink_network_receiver.json | 2 +- .../coloring/pink_network_transmitter.json | 2 +- .../recipes/misc/coloring/pink_relay.json | 2 +- .../misc/coloring/pink_security_manager.json | 2 +- .../coloring/pink_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/purple_cable.json | 2 +- .../misc/coloring/purple_constructor.json | 2 +- .../misc/coloring/purple_controller.json | 2 +- .../misc/coloring/purple_crafting_grid.json | 2 +- .../misc/coloring/purple_destructor.json | 2 +- .../misc/coloring/purple_detector.json | 2 +- .../misc/coloring/purple_disk_interface.json | 2 +- .../misc/coloring/purple_exporter.json | 2 +- .../coloring/purple_external_storage.json | 2 +- .../recipes/misc/coloring/purple_grid.json | 2 +- .../misc/coloring/purple_importer.json | 2 +- .../coloring/purple_network_receiver.json | 2 +- .../coloring/purple_network_transmitter.json | 2 +- .../recipes/misc/coloring/purple_relay.json | 2 +- .../coloring/purple_security_manager.json | 2 +- .../coloring/purple_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/red_cable.json | 2 +- .../misc/coloring/red_constructor.json | 2 +- .../recipes/misc/coloring/red_controller.json | 2 +- .../misc/coloring/red_crafting_grid.json | 2 +- .../recipes/misc/coloring/red_destructor.json | 2 +- .../recipes/misc/coloring/red_detector.json | 2 +- .../misc/coloring/red_disk_interface.json | 2 +- .../recipes/misc/coloring/red_exporter.json | 2 +- .../misc/coloring/red_external_storage.json | 2 +- .../recipes/misc/coloring/red_grid.json | 2 +- .../recipes/misc/coloring/red_importer.json | 2 +- .../misc/coloring/red_network_receiver.json | 2 +- .../coloring/red_network_transmitter.json | 2 +- .../recipes/misc/coloring/red_relay.json | 2 +- .../misc/coloring/red_security_manager.json | 2 +- .../coloring/red_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/white_cable.json | 2 +- .../misc/coloring/white_constructor.json | 2 +- .../misc/coloring/white_controller.json | 2 +- .../misc/coloring/white_crafting_grid.json | 2 +- .../misc/coloring/white_destructor.json | 2 +- .../recipes/misc/coloring/white_detector.json | 2 +- .../misc/coloring/white_disk_interface.json | 2 +- .../recipes/misc/coloring/white_exporter.json | 2 +- .../misc/coloring/white_external_storage.json | 2 +- .../recipes/misc/coloring/white_grid.json | 2 +- .../recipes/misc/coloring/white_importer.json | 2 +- .../misc/coloring/white_network_receiver.json | 2 +- .../coloring/white_network_transmitter.json | 2 +- .../recipes/misc/coloring/white_relay.json | 2 +- .../misc/coloring/white_security_manager.json | 2 +- .../coloring/white_wireless_transmitter.json | 2 +- .../recipes/misc/coloring/yellow_cable.json | 2 +- .../misc/coloring/yellow_constructor.json | 2 +- .../misc/coloring/yellow_controller.json | 2 +- .../misc/coloring/yellow_crafting_grid.json | 2 +- .../misc/coloring/yellow_destructor.json | 2 +- .../misc/coloring/yellow_detector.json | 2 +- .../misc/coloring/yellow_disk_interface.json | 2 +- .../misc/coloring/yellow_exporter.json | 2 +- .../coloring/yellow_external_storage.json | 2 +- .../recipes/misc/coloring/yellow_grid.json | 2 +- .../misc/coloring/yellow_importer.json | 2 +- .../coloring/yellow_network_receiver.json | 2 +- .../coloring/yellow_network_transmitter.json | 2 +- .../recipes/misc/coloring/yellow_relay.json | 2 +- .../coloring/yellow_security_manager.json | 2 +- .../coloring/yellow_wireless_transmitter.json | 2 +- .../blocks/black_cable.json | 0 .../blocks/black_constructor.json | 0 .../blocks/black_controller.json | 0 .../blocks/black_crafting_grid.json | 0 .../blocks/black_creative_controller.json | 0 .../blocks/black_destructor.json | 0 .../blocks/black_detector.json | 0 .../blocks/black_disk_interface.json | 0 .../blocks/black_grid.json | 0 .../blocks/black_network_receiver.json | 0 .../blocks/black_network_transmitter.json | 0 .../blocks/black_relay.json | 0 .../blocks/black_security_manager.json | 0 .../blocks/black_wireless_transmitter.json | 0 .../blocks/blue_cable.json | 0 .../blocks/blue_constructor.json | 0 .../blocks/blue_controller.json | 0 .../blocks/blue_crafting_grid.json | 0 .../blocks/blue_creative_controller.json | 0 .../blocks/blue_destructor.json | 0 .../blocks/blue_detector.json | 0 .../blocks/blue_disk_interface.json | 0 .../blocks/blue_grid.json | 0 .../blocks/blue_network_receiver.json | 0 .../blocks/blue_network_transmitter.json | 0 .../blocks/blue_relay.json | 0 .../blocks/blue_security_manager.json | 0 .../blocks/blue_wireless_transmitter.json | 0 .../blocks/brown_cable.json | 0 .../blocks/brown_constructor.json | 0 .../blocks/brown_controller.json | 0 .../blocks/brown_crafting_grid.json | 0 .../blocks/brown_creative_controller.json | 0 .../blocks/brown_destructor.json | 0 .../blocks/brown_detector.json | 0 .../blocks/brown_disk_interface.json | 0 .../blocks/brown_grid.json | 0 .../blocks/brown_network_receiver.json | 0 .../blocks/brown_network_transmitter.json | 0 .../blocks/brown_relay.json | 0 .../blocks/brown_security_manager.json | 0 .../blocks/brown_wireless_transmitter.json | 0 .../blocks/cable.json | 0 .../blocks/constructor.json | 0 .../blocks/controller.json | 0 .../blocks/crafting_grid.json | 0 .../blocks/creative_controller.json | 0 .../blocks/cyan_cable.json | 0 .../blocks/cyan_constructor.json | 0 .../blocks/cyan_controller.json | 0 .../blocks/cyan_crafting_grid.json | 0 .../blocks/cyan_creative_controller.json | 0 .../blocks/cyan_destructor.json | 0 .../blocks/cyan_detector.json | 0 .../blocks/cyan_disk_interface.json | 0 .../blocks/cyan_grid.json | 0 .../blocks/cyan_network_receiver.json | 0 .../blocks/cyan_network_transmitter.json | 0 .../blocks/cyan_relay.json | 0 .../blocks/cyan_security_manager.json | 0 .../blocks/cyan_wireless_transmitter.json | 0 .../blocks/destructor.json | 0 .../blocks/detector.json | 0 .../blocks/disk_interface.json | 0 .../blocks/gray_controller.json | 0 .../blocks/gray_crafting_grid.json | 0 .../blocks/gray_creative_controller.json | 0 .../blocks/gray_detector.json | 0 .../blocks/gray_disk_interface.json | 0 .../blocks/gray_grid.json | 0 .../blocks/gray_network_receiver.json | 0 .../blocks/gray_network_transmitter.json | 0 .../blocks/gray_relay.json | 0 .../blocks/gray_security_manager.json | 0 .../blocks/gray_wireless_transmitter.json | 0 .../blocks/green_cable.json | 0 .../blocks/green_constructor.json | 0 .../blocks/green_controller.json | 0 .../blocks/green_crafting_grid.json | 0 .../blocks/green_creative_controller.json | 0 .../blocks/green_destructor.json | 0 .../blocks/green_detector.json | 0 .../blocks/green_disk_interface.json | 0 .../blocks/green_grid.json | 0 .../blocks/green_network_receiver.json | 0 .../blocks/green_network_transmitter.json | 0 .../blocks/green_relay.json | 0 .../blocks/green_security_manager.json | 0 .../blocks/green_wireless_transmitter.json | 0 .../blocks/grid.json | 0 .../blocks/light_blue_cable.json | 0 .../blocks/light_blue_constructor.json | 0 .../blocks/light_blue_destructor.json | 0 .../blocks/light_gray_cable.json | 0 .../blocks/light_gray_constructor.json | 0 .../blocks/light_gray_controller.json | 0 .../blocks/light_gray_crafting_grid.json | 0 .../light_gray_creative_controller.json | 0 .../blocks/light_gray_destructor.json | 0 .../blocks/light_gray_detector.json | 0 .../blocks/light_gray_disk_interface.json | 0 .../blocks/light_gray_grid.json | 0 .../blocks/light_gray_network_receiver.json | 0 .../light_gray_network_transmitter.json | 0 .../blocks/light_gray_relay.json | 0 .../blocks/light_gray_security_manager.json | 0 .../light_gray_wireless_transmitter.json | 0 .../blocks/lime_cable.json | 0 .../blocks/lime_constructor.json | 0 .../blocks/lime_controller.json | 0 .../blocks/lime_crafting_grid.json | 0 .../blocks/lime_creative_controller.json | 0 .../blocks/lime_destructor.json | 0 .../blocks/lime_detector.json | 0 .../blocks/lime_disk_interface.json | 0 .../blocks/lime_grid.json | 0 .../blocks/lime_network_receiver.json | 0 .../blocks/lime_network_transmitter.json | 0 .../blocks/lime_relay.json | 0 .../blocks/lime_security_manager.json | 0 .../blocks/lime_wireless_transmitter.json | 0 .../blocks/magenta_cable.json | 0 .../blocks/magenta_constructor.json | 0 .../blocks/magenta_controller.json | 0 .../blocks/magenta_crafting_grid.json | 0 .../blocks/magenta_creative_controller.json | 0 .../blocks/magenta_destructor.json | 0 .../blocks/magenta_detector.json | 0 .../blocks/magenta_disk_interface.json | 0 .../blocks/magenta_grid.json | 0 .../blocks/magenta_network_receiver.json | 0 .../blocks/magenta_network_transmitter.json | 0 .../blocks/magenta_relay.json | 0 .../blocks/magenta_security_manager.json | 0 .../blocks/magenta_wireless_transmitter.json | 0 .../blocks/network_receiver.json | 0 .../blocks/network_transmitter.json | 0 .../blocks/orange_cable.json | 0 .../blocks/orange_constructor.json | 0 .../blocks/orange_controller.json | 0 .../blocks/orange_crafting_grid.json | 0 .../blocks/orange_creative_controller.json | 0 .../blocks/orange_destructor.json | 0 .../blocks/orange_detector.json | 0 .../blocks/orange_disk_interface.json | 0 .../blocks/orange_grid.json | 0 .../blocks/orange_network_receiver.json | 0 .../blocks/orange_network_transmitter.json | 0 .../blocks/orange_relay.json | 0 .../blocks/orange_security_manager.json | 0 .../blocks/orange_wireless_transmitter.json | 0 .../blocks/pink_cable.json | 0 .../blocks/pink_constructor.json | 0 .../blocks/pink_controller.json | 0 .../blocks/pink_crafting_grid.json | 0 .../blocks/pink_creative_controller.json | 0 .../blocks/pink_destructor.json | 0 .../blocks/pink_detector.json | 0 .../blocks/pink_disk_interface.json | 0 .../blocks/pink_grid.json | 0 .../blocks/pink_network_receiver.json | 0 .../blocks/pink_network_transmitter.json | 0 .../blocks/pink_relay.json | 0 .../blocks/pink_security_manager.json | 0 .../blocks/pink_wireless_transmitter.json | 0 .../blocks/purple_cable.json | 0 .../blocks/purple_constructor.json | 0 .../blocks/purple_controller.json | 0 .../blocks/purple_crafting_grid.json | 0 .../blocks/purple_creative_controller.json | 0 .../blocks/purple_destructor.json | 0 .../blocks/purple_detector.json | 0 .../blocks/purple_disk_interface.json | 0 .../blocks/purple_grid.json | 0 .../blocks/purple_network_receiver.json | 0 .../blocks/purple_network_transmitter.json | 0 .../blocks/purple_relay.json | 0 .../blocks/purple_security_manager.json | 0 .../blocks/purple_wireless_transmitter.json | 0 .../blocks/red_cable.json | 0 .../blocks/red_constructor.json | 0 .../blocks/red_controller.json | 0 .../blocks/red_crafting_grid.json | 0 .../blocks/red_creative_controller.json | 0 .../blocks/red_destructor.json | 0 .../blocks/red_detector.json | 0 .../blocks/red_disk_interface.json | 0 .../blocks/red_grid.json | 0 .../blocks/red_network_receiver.json | 0 .../blocks/red_network_transmitter.json | 0 .../blocks/red_relay.json | 0 .../blocks/red_security_manager.json | 0 .../blocks/red_wireless_transmitter.json | 0 .../blocks/relay.json | 0 .../blocks/security_manager.json | 0 .../blocks/white_cable.json | 0 .../blocks/white_constructor.json | 0 .../blocks/white_controller.json | 0 .../blocks/white_crafting_grid.json | 0 .../blocks/white_creative_controller.json | 0 .../blocks/white_destructor.json | 0 .../blocks/white_detector.json | 0 .../blocks/white_disk_interface.json | 0 .../blocks/white_grid.json | 0 .../blocks/white_network_receiver.json | 0 .../blocks/white_network_transmitter.json | 0 .../blocks/white_relay.json | 0 .../blocks/white_security_manager.json | 0 .../blocks/white_wireless_transmitter.json | 0 .../blocks/wireless_transmitter.json | 0 .../blocks/yellow_cable.json | 0 .../blocks/yellow_constructor.json | 0 .../blocks/yellow_controller.json | 0 .../blocks/yellow_crafting_grid.json | 0 .../blocks/yellow_creative_controller.json | 0 .../blocks/yellow_destructor.json | 0 .../blocks/yellow_detector.json | 0 .../blocks/yellow_disk_interface.json | 0 .../blocks/yellow_grid.json | 0 .../blocks/yellow_network_receiver.json | 0 .../blocks/yellow_network_transmitter.json | 0 .../blocks/yellow_relay.json | 0 .../blocks/yellow_security_manager.json | 0 .../blocks/yellow_wireless_transmitter.json | 0 .../coloring/black_cable.json | 3 +- .../coloring/black_constructor.json | 3 +- .../coloring/black_controller.json | 3 +- .../coloring/black_crafting_grid.json | 3 +- .../coloring/black_destructor.json | 3 +- .../coloring/black_detector.json | 3 +- .../coloring/black_disk_interface.json | 3 +- .../coloring/black_exporter.json | 3 +- .../coloring/black_external_storage.json | 3 +- .../coloring/black_grid.json | 3 +- .../coloring/black_importer.json | 3 +- .../coloring/black_network_receiver.json | 3 +- .../coloring/black_network_transmitter.json | 3 +- .../coloring/black_relay.json | 3 +- .../coloring/black_security_manager.json | 3 +- .../coloring/black_wireless_transmitter.json | 3 +- .../coloring/blue_cable.json | 3 +- .../coloring/blue_constructor.json | 3 +- .../coloring/blue_controller.json | 3 +- .../coloring/blue_crafting_grid.json | 3 +- .../coloring/blue_destructor.json | 3 +- .../coloring/blue_detector.json | 3 +- .../coloring/blue_disk_interface.json | 3 +- .../coloring/blue_exporter.json | 3 +- .../coloring/blue_external_storage.json | 3 +- .../coloring/blue_grid.json | 3 +- .../coloring/blue_importer.json | 3 +- .../coloring/blue_network_receiver.json | 3 +- .../coloring/blue_network_transmitter.json | 3 +- .../coloring/blue_relay.json | 3 +- .../coloring/blue_security_manager.json | 3 +- .../coloring/blue_wireless_transmitter.json | 3 +- .../coloring/brown_cable.json | 3 +- .../coloring/brown_constructor.json | 3 +- .../coloring/brown_controller.json | 3 +- .../coloring/brown_crafting_grid.json | 3 +- .../coloring/brown_destructor.json | 3 +- .../coloring/brown_detector.json | 3 +- .../coloring/brown_disk_interface.json | 3 +- .../coloring/brown_exporter.json | 3 +- .../coloring/brown_external_storage.json | 3 +- .../coloring/brown_grid.json | 3 +- .../coloring/brown_importer.json | 3 +- .../coloring/brown_network_receiver.json | 3 +- .../coloring/brown_network_transmitter.json | 3 +- .../coloring/brown_relay.json | 3 +- .../coloring/brown_security_manager.json | 3 +- .../coloring/brown_wireless_transmitter.json | 3 +- .../coloring/cyan_cable.json | 3 +- .../coloring/cyan_constructor.json | 3 +- .../coloring/cyan_controller.json | 3 +- .../coloring/cyan_crafting_grid.json | 3 +- .../coloring/cyan_destructor.json | 3 +- .../coloring/cyan_detector.json | 3 +- .../coloring/cyan_disk_interface.json | 3 +- .../coloring/cyan_exporter.json | 3 +- .../coloring/cyan_external_storage.json | 3 +- .../coloring/cyan_grid.json | 3 +- .../coloring/cyan_importer.json | 3 +- .../coloring/cyan_network_receiver.json | 3 +- .../coloring/cyan_network_transmitter.json | 3 +- .../coloring/cyan_relay.json | 3 +- .../coloring/cyan_security_manager.json | 3 +- .../coloring/cyan_wireless_transmitter.json | 3 +- .../coloring/gray_cable.json | 3 +- .../coloring/gray_constructor.json | 3 +- .../coloring/gray_controller.json | 3 +- .../coloring/gray_crafting_grid.json | 3 +- .../coloring/gray_destructor.json | 3 +- .../coloring/gray_detector.json | 3 +- .../coloring/gray_disk_interface.json | 3 +- .../coloring/gray_exporter.json | 3 +- .../coloring/gray_external_storage.json | 3 +- .../coloring/gray_grid.json | 3 +- .../coloring/gray_importer.json | 3 +- .../coloring/gray_network_receiver.json | 3 +- .../coloring/gray_network_transmitter.json | 3 +- .../coloring/gray_relay.json | 3 +- .../coloring/gray_security_manager.json | 3 +- .../coloring/gray_wireless_transmitter.json | 3 +- .../coloring/green_cable.json | 3 +- .../coloring/green_constructor.json | 3 +- .../coloring/green_controller.json | 3 +- .../coloring/green_crafting_grid.json | 3 +- .../coloring/green_destructor.json | 3 +- .../coloring/green_detector.json | 3 +- .../coloring/green_disk_interface.json | 3 +- .../coloring/green_exporter.json | 3 +- .../coloring/green_external_storage.json | 3 +- .../coloring/green_grid.json | 3 +- .../coloring/green_importer.json | 3 +- .../coloring/green_network_receiver.json | 3 +- .../coloring/green_network_transmitter.json | 3 +- .../coloring/green_relay.json | 3 +- .../coloring/green_security_manager.json | 3 +- .../coloring/green_wireless_transmitter.json | 3 +- .../coloring/light_blue_cable.json | 3 +- .../coloring/light_blue_constructor.json | 3 +- .../coloring/light_blue_controller.json | 3 +- .../coloring/light_blue_crafting_grid.json | 3 +- .../coloring/light_blue_destructor.json | 3 +- .../coloring/light_blue_detector.json | 3 +- .../coloring/light_blue_disk_interface.json | 3 +- .../coloring/light_blue_exporter.json | 3 +- .../coloring/light_blue_external_storage.json | 3 +- .../coloring/light_blue_grid.json | 3 +- .../coloring/light_blue_importer.json | 3 +- .../coloring/light_blue_network_receiver.json | 3 +- .../light_blue_network_transmitter.json | 3 +- .../coloring/light_blue_relay.json | 3 +- .../coloring/light_blue_security_manager.json | 3 +- .../light_blue_wireless_transmitter.json | 3 +- .../coloring/light_gray_cable.json | 3 +- .../coloring/light_gray_constructor.json | 3 +- .../coloring/light_gray_controller.json | 3 +- .../coloring/light_gray_crafting_grid.json | 3 +- .../coloring/light_gray_destructor.json | 3 +- .../coloring/light_gray_detector.json | 3 +- .../coloring/light_gray_disk_interface.json | 3 +- .../coloring/light_gray_exporter.json | 3 +- .../coloring/light_gray_external_storage.json | 3 +- .../coloring/light_gray_grid.json | 3 +- .../coloring/light_gray_importer.json | 3 +- .../coloring/light_gray_network_receiver.json | 3 +- .../light_gray_network_transmitter.json | 3 +- .../coloring/light_gray_relay.json | 3 +- .../coloring/light_gray_security_manager.json | 3 +- .../light_gray_wireless_transmitter.json | 3 +- .../coloring/lime_cable.json | 3 +- .../coloring/lime_constructor.json | 3 +- .../coloring/lime_controller.json | 3 +- .../coloring/lime_crafting_grid.json | 3 +- .../coloring/lime_destructor.json | 3 +- .../coloring/lime_detector.json | 3 +- .../coloring/lime_disk_interface.json | 3 +- .../coloring/lime_exporter.json | 3 +- .../coloring/lime_external_storage.json | 3 +- .../coloring/lime_grid.json | 3 +- .../coloring/lime_importer.json | 3 +- .../coloring/lime_network_receiver.json | 3 +- .../coloring/lime_network_transmitter.json | 3 +- .../coloring/lime_relay.json | 3 +- .../coloring/lime_security_manager.json | 3 +- .../coloring/lime_wireless_transmitter.json | 3 +- .../coloring/magenta_cable.json | 3 +- .../coloring/magenta_constructor.json | 3 +- .../coloring/magenta_controller.json | 3 +- .../coloring/magenta_crafting_grid.json | 3 +- .../coloring/magenta_destructor.json | 3 +- .../coloring/magenta_detector.json | 3 +- .../coloring/magenta_disk_interface.json | 3 +- .../coloring/magenta_exporter.json | 3 +- .../coloring/magenta_external_storage.json | 3 +- .../coloring/magenta_grid.json | 3 +- .../coloring/magenta_importer.json | 3 +- .../coloring/magenta_network_receiver.json | 3 +- .../coloring/magenta_network_transmitter.json | 3 +- .../coloring/magenta_relay.json | 3 +- .../coloring/magenta_security_manager.json | 3 +- .../magenta_wireless_transmitter.json | 3 +- .../coloring/orange_cable.json | 3 +- .../coloring/orange_constructor.json | 3 +- .../coloring/orange_controller.json | 3 +- .../coloring/orange_crafting_grid.json | 3 +- .../coloring/orange_destructor.json | 3 +- .../coloring/orange_detector.json | 3 +- .../coloring/orange_disk_interface.json | 3 +- .../coloring/orange_exporter.json | 3 +- .../coloring/orange_external_storage.json | 3 +- .../coloring/orange_grid.json | 3 +- .../coloring/orange_importer.json | 3 +- .../coloring/orange_network_receiver.json | 3 +- .../coloring/orange_network_transmitter.json | 3 +- .../coloring/orange_relay.json | 3 +- .../coloring/orange_security_manager.json | 3 +- .../coloring/orange_wireless_transmitter.json | 3 +- .../coloring/pink_cable.json | 3 +- .../coloring/pink_constructor.json | 3 +- .../coloring/pink_controller.json | 3 +- .../coloring/pink_crafting_grid.json | 3 +- .../coloring/pink_destructor.json | 3 +- .../coloring/pink_detector.json | 3 +- .../coloring/pink_disk_interface.json | 3 +- .../coloring/pink_exporter.json | 3 +- .../coloring/pink_external_storage.json | 3 +- .../coloring/pink_grid.json | 3 +- .../coloring/pink_importer.json | 3 +- .../coloring/pink_network_receiver.json | 3 +- .../coloring/pink_network_transmitter.json | 3 +- .../coloring/pink_relay.json | 3 +- .../coloring/pink_security_manager.json | 3 +- .../coloring/pink_wireless_transmitter.json | 3 +- .../coloring/purple_cable.json | 3 +- .../coloring/purple_constructor.json | 3 +- .../coloring/purple_controller.json | 3 +- .../coloring/purple_crafting_grid.json | 3 +- .../coloring/purple_destructor.json | 3 +- .../coloring/purple_detector.json | 3 +- .../coloring/purple_disk_interface.json | 3 +- .../coloring/purple_exporter.json | 3 +- .../coloring/purple_external_storage.json | 3 +- .../coloring/purple_grid.json | 3 +- .../coloring/purple_importer.json | 3 +- .../coloring/purple_network_receiver.json | 3 +- .../coloring/purple_network_transmitter.json | 3 +- .../coloring/purple_relay.json | 3 +- .../coloring/purple_security_manager.json | 3 +- .../coloring/purple_wireless_transmitter.json | 3 +- .../coloring/red_cable.json | 3 +- .../coloring/red_constructor.json | 3 +- .../coloring/red_controller.json | 3 +- .../coloring/red_crafting_grid.json | 3 +- .../coloring/red_destructor.json | 3 +- .../coloring/red_detector.json | 3 +- .../coloring/red_disk_interface.json | 3 +- .../coloring/red_exporter.json | 3 +- .../coloring/red_external_storage.json | 3 +- .../coloring/red_grid.json | 3 +- .../coloring/red_importer.json | 3 +- .../coloring/red_network_receiver.json | 3 +- .../coloring/red_network_transmitter.json | 3 +- .../coloring/red_relay.json | 3 +- .../coloring/red_security_manager.json | 3 +- .../coloring/red_wireless_transmitter.json | 3 +- .../coloring/white_cable.json | 3 +- .../coloring/white_constructor.json | 3 +- .../coloring/white_controller.json | 3 +- .../coloring/white_crafting_grid.json | 3 +- .../coloring/white_destructor.json | 3 +- .../coloring/white_detector.json | 3 +- .../coloring/white_disk_interface.json | 3 +- .../coloring/white_exporter.json | 3 +- .../coloring/white_external_storage.json | 3 +- .../coloring/white_grid.json | 3 +- .../coloring/white_importer.json | 3 +- .../coloring/white_network_receiver.json | 3 +- .../coloring/white_network_transmitter.json | 3 +- .../coloring/white_relay.json | 3 +- .../coloring/white_security_manager.json | 3 +- .../coloring/white_wireless_transmitter.json | 3 +- .../coloring/yellow_cable.json | 3 +- .../coloring/yellow_constructor.json | 3 +- .../coloring/yellow_controller.json | 3 +- .../coloring/yellow_crafting_grid.json | 3 +- .../coloring/yellow_destructor.json | 3 +- .../coloring/yellow_detector.json | 3 +- .../coloring/yellow_disk_interface.json | 3 +- .../coloring/yellow_exporter.json | 3 +- .../coloring/yellow_external_storage.json | 3 +- .../coloring/yellow_grid.json | 3 +- .../coloring/yellow_importer.json | 3 +- .../coloring/yellow_network_receiver.json | 3 +- .../coloring/yellow_network_transmitter.json | 3 +- .../coloring/yellow_relay.json | 3 +- .../coloring/yellow_security_manager.json | 3 +- .../coloring/yellow_wireless_transmitter.json | 3 +- .../tags/{items => item}/cables.json | 0 .../tags/{items => item}/constructors.json | 0 .../tags/{items => item}/controllers.json | 0 .../tags/{items => item}/crafting_grids.json | 0 .../{items => item}/creative_controllers.json | 0 .../tags/{items => item}/destructors.json | 0 .../tags/{items => item}/detectors.json | 0 .../tags/{items => item}/disk_interfaces.json | 0 .../tags/{items => item}/exporters.json | 0 .../{items => item}/external_storages.json | 0 .../{items => item}/fluid_storage_disks.json | 0 .../tags/{items => item}/grids.json | 0 .../tags/{items => item}/importers.json | 0 .../{items => item}/network_receivers.json | 0 .../{items => item}/network_transmitters.json | 0 .../tags/{items => item}/relays.json | 0 .../{items => item}/security_managers.json | 0 .../tags/{items => item}/storage_disks.json | 0 .../wireless_transmitters.json | 0 .../common/AbstractModInitializer.java | 162 +++++--- .../platform/common/AbstractPlatform.java | 20 +- .../platform/common/Platform.java | 19 +- .../platform/common/PlatformApiImpl.java | 62 +--- .../platform/common/PlatformProxy.java | 36 +- .../ConfigurationCardItem.java | 104 ++---- ...ConfigurationCardItemPropertyFunction.java | 4 +- .../ConfigurationCardState.java | 37 ++ .../BlockBreakDestructorStrategyFactory.java | 38 +- .../ConstructorBlockEntity.java | 9 +- .../ConstructorContainerMenu.java | 8 +- .../DestructorBlockEntity.java | 31 +- .../DestructorContainerMenu.java | 8 +- .../FluidBreakDestructorStrategy.java | 4 +- .../platform/common/content/ColorMap.java | 2 +- .../platform/common/content/ContentNames.java | 2 +- .../common/content/DataComponents.java | 99 +++++ .../content/ExtendedMenuTypeFactory.java | 20 + .../common/content/LootFunctions.java | 24 +- .../common/content/MenuTypeFactory.java | 3 +- .../platform/common/content/Sounds.java | 4 +- .../controller/ControllerBlockEntity.java | 27 +- .../controller/ControllerContainerMenu.java | 11 +- .../common/controller/ControllerData.java | 13 + .../ControllerModelPredicateProvider.java | 3 - .../common/detector/DetectorBlockEntity.java | 38 +- .../detector/DetectorContainerMenu.java | 8 +- .../exporter/ExporterContainerMenu.java | 8 +- .../common/grid/AbstractGridBlockEntity.java | 16 +- .../grid/AbstractGridContainerMenu.java | 61 +-- .../common/grid/ClientCraftingGridSource.java | 9 +- .../common/grid/CraftingGridBlockEntity.java | 37 +- .../grid/CraftingGridContainerMenu.java | 7 +- .../common/grid/CraftingGridResultSlot.java | 28 +- .../common/grid/CraftingGridSource.java | 3 +- .../common/grid/CraftingGridSourceImpl.java | 7 +- .../common/grid/GridContainerMenu.java | 5 +- .../platform/common/grid/GridData.java | 45 +++ .../common/grid/PortableGridData.java | 20 + .../grid/WirelessGridContainerMenu.java | 10 +- .../common/grid/WirelessGridData.java | 15 + .../WirelessGridExtendedMenuProvider.java | 20 +- .../ClientGridExtractionStrategy.java | 4 +- .../strategy/ClientGridInsertionStrategy.java | 4 +- .../strategy/ClientGridScrollingStrategy.java | 4 +- .../view/AbstractItemGridResourceFactory.java | 2 +- .../common/iface/InterfaceBlockEntity.java | 70 +++- .../common/iface/InterfaceContainerMenu.java | 9 +- .../platform/common/iface/InterfaceData.java | 15 + .../common/importer/ImporterBlockEntity.java | 31 +- .../importer/ImporterContainerMenu.java | 8 +- .../common/networking/CableBlock.java | 12 +- .../common/networking/NetworkCardItem.java | 41 +- .../NetworkCardItemPropertyFunction.java | 4 +- .../networking/NetworkReceiverBlock.java | 6 +- .../networking/NetworkTransmitterBlock.java | 7 +- .../NetworkTransmitterBlockEntity.java | 45 ++- .../NetworkTransmitterContainerMenu.java | 22 +- .../networking/NetworkTransmitterData.java | 24 ++ .../networking/NetworkTransmitterScreen.java | 2 +- .../networking/NetworkTransmitterStatus.java | 13 - .../common/networking/RelayBlockEntity.java | 31 +- .../common/networking/RelayContainerMenu.java | 8 +- .../AbstractSecurityCardContainerMenu.java | 70 ++-- ...tractSecurityCardExtendedMenuProvider.java | 34 +- .../security/AbstractSecurityCardItem.java | 77 ++-- .../security/AbstractSecurityCardScreen.java | 26 +- .../FallbackSecurityCardContainerMenu.java | 5 +- ...lbackSecurityCardExtendedMenuProvider.java | 21 +- .../security/FallbackSecurityCardItem.java | 16 +- .../security/PlayerBoundSecurityCardData.java | 38 ++ .../security/SecurityCardBoundPlayer.java | 35 ++ .../security/SecurityCardContainerMenu.java | 39 +- .../common/security/SecurityCardData.java | 32 ++ .../SecurityCardExtendedMenuProvider.java | 49 ++- .../common/security/SecurityCardItem.java | 68 ++-- .../SecurityCardItemPropertyFunction.java | 4 +- .../security/SecurityCardPermissions.java | 52 +++ .../common/security/SecurityCardScreen.java | 4 +- .../security/SecurityManagerBlockEntity.java | 23 +- .../AbstractDiskContainerBlockEntity.java | 51 +-- .../storage/ClientStorageRepository.java | 8 +- .../common/storage/FluidStorageType.java | 114 ++---- .../common/storage/ItemStorageType.java | 109 +----- .../common/storage/PlatformStorage.java | 12 +- .../common/storage/StorageCodecs.java | 106 ++++++ .../StorageContainerItemHelperImpl.java | 26 +- .../common/storage/StorageRepositoryImpl.java | 96 ++--- .../platform/common/storage/StorageTypes.java | 23 ++ .../AbstractDiskDriveBlockEntity.java | 9 +- .../diskdrive/DiskDriveContainerMenu.java | 13 +- .../AbstractDiskInterfaceBlockEntity.java | 21 +- .../DiskInterfaceContainerMenu.java | 9 +- .../ExternalStorageBlockEntity.java | 48 ++- .../ExternalStorageContainerMenu.java | 9 +- ...ternalStorageTrackedStorageRepository.java | 87 ++--- .../AbstractPortableGridBlockEntity.java | 68 ++-- .../AbstractPortableGridContainerMenu.java | 12 +- .../PortableGridBlockContainerMenu.java | 6 +- .../portablegrid/PortableGridBlockItem.java | 65 ++-- .../PortableGridItemContainerMenu.java | 9 +- .../PortableGridItemExtendedMenuProvider.java | 27 +- .../PortableGridLootItemFunction.java | 8 +- .../AbstractStorageBlockBlockEntity.java | 53 +-- .../AbstractStorageBlockContainerMenu.java | 13 +- .../FluidStorageBlockBlockEntity.java | 4 +- .../FluidStorageBlockBlockItem.java | 27 ++ .../FluidStorageBlockContainerMenu.java | 5 +- .../ItemStorageBlockBlockEntity.java | 4 +- .../ItemStorageBlockBlockItem.java | 17 + .../ItemStorageBlockContainerMenu.java | 7 +- .../storageblock/StorageBlockData.java | 16 + .../StorageBlockLootItemFunction.java | 2 +- .../storagedisk/FluidStorageDiskItem.java | 31 +- .../storagedisk/ItemStorageDiskItem.java | 21 +- .../ItemStorageMonitorExtractionStrategy.java | 2 +- .../storagemonitor/StorageMonitorBlock.java | 35 +- .../StorageMonitorBlockEntity.java | 41 +- .../StorageMonitorContainerMenu.java | 9 +- .../common/support/AbstractBaseBlock.java | 31 +- .../AbstractDirectionalCableBlock.java | 6 +- .../common/support/AbstractSafeSavedData.java | 5 +- .../common/support/BlockEntityWithDrops.java | 1 + .../common/support/FilterWithFuzzyMode.java | 9 +- .../common/support/NetworkNodeBlockItem.java | 4 - .../support/ServerToClientCommunications.java | 38 -- .../support/amount/AbstractAmountScreen.java | 4 +- .../AbstractResourceContainerMenu.java | 11 +- .../AbstractSchedulingContainerMenu.java | 6 +- .../AbstractSimpleFilterContainerMenu.java | 7 +- .../AbstractSingleAmountContainerMenu.java | 37 +- .../support/containermenu/ClientProperty.java | 4 +- .../containermenu/ExtendedMenuProvider.java | 10 +- .../NetworkNodeExtendedMenuProvider.java | 4 + .../NetworkNodeMenuProvider.java | 3 +- .../support/containermenu/ResourceSlot.java | 12 +- .../containermenu/SingleAmountData.java | 22 ++ .../common/support/energy/EnergyInfo.java | 8 +- .../energy/EnergyLootItemFunction.java | 2 +- .../energy/ItemBlockEnergyStorage.java | 14 +- .../support/energy/ItemEnergyStorage.java | 9 +- ...neModeNetworkNodeContainerBlockEntity.java | 17 +- ...dulingNetworkNodeContainerBlockEntity.java | 31 +- ...deableNetworkNodeContainerBlockEntity.java | 13 +- .../bounditem/InventorySlotReference.java | 8 +- .../InventorySlotReferenceFactory.java | 15 +- .../bounditem/NetworkBoundItemHelperImpl.java | 47 +-- .../NetworkBoundItemItemPropertyFunction.java | 4 +- .../NetworkBoundItemSessionImpl.java | 21 +- .../common/support/packet/PacketContext.java | 8 + .../common/support/packet/PacketHandler.java | 6 + .../common/support/packet/PacketIds.java | 38 -- .../common/support/packet/c2s/C2SPackets.java | 83 +++++ .../packet/c2s/CraftingGridClearPacket.java | 31 ++ .../c2s/CraftingGridRecipeTransferPacket.java | 40 ++ .../support/packet/c2s/GridExtractPacket.java | 40 ++ .../support/packet/c2s/GridInsertPacket.java | 33 ++ .../support/packet/c2s/GridScrollPacket.java | 40 ++ .../packet/c2s/PropertyChangePacket.java | 32 ++ .../c2s/ResourceFilterSlotChangePacket.java | 38 ++ .../c2s/ResourceSlotAmountChangePacket.java | 34 ++ .../packet/c2s/ResourceSlotChangePacket.java | 34 ++ .../c2s/SecurityCardBoundPlayerPacket.java | 42 +++ .../c2s/SecurityCardPermissionPacket.java | 37 ++ .../SecurityCardResetPermissionPacket.java | 34 ++ .../packet/c2s/SingleAmountChangePacket.java | 33 ++ .../packet/c2s/StorageInfoRequestPacket.java | 41 ++ .../packet/c2s/UseNetworkBoundItemPacket.java | 46 +-- .../support/packet/c2s/package-info.java | 2 +- .../support/packet/s2c/EnergyInfoPacket.java | 33 ++ .../support/packet/s2c/GridActivePacket.java | 32 ++ .../support/packet/s2c/GridClearPacket.java | 32 ++ .../support/packet/s2c/GridUpdatePacket.java | 42 +++ .../s2c/NetworkTransmitterStatusPacket.java | 39 ++ .../packet/s2c/NoPermissionPacket.java | 28 ++ .../packet/s2c/ResourceSlotUpdatePacket.java | 41 ++ .../common/support/packet/s2c/S2CPackets.java | 76 ++++ .../packet/s2c/StorageInfoResponsePacket.java | 38 ++ .../s2c/WirelessTransmitterRangePacket.java | 34 ++ .../support}/packet/s2c/package-info.java | 2 +- .../registry/PlatformRegistryImpl.java | 29 ++ .../support/render/AbstractFluidRenderer.java | 85 +++-- .../common/support/render/CubeBuilder.java | 2 +- .../support/resource/FluidResource.java | 48 +-- .../support/resource/FluidResourceType.java | 29 +- .../common/support/resource/ItemResource.java | 63 +--- .../resource/ItemResourceRendering.java | 4 +- .../support/resource/ItemResourceType.java | 34 +- .../support/resource/ResourceCodecs.java | 92 +++++ .../resource/ResourceContainerData.java | 29 ++ .../resource/ResourceContainerImpl.java | 120 +++--- .../support/widget/CustomCheckboxWidget.java | 8 +- .../common/upgrade/FortuneUpgradeItem.java | 11 + .../common/upgrade/RangeUpgradeItem.java | 16 + .../RegulatorUpgradeContainerMenu.java | 8 +- .../common/upgrade/RegulatorUpgradeItem.java | 123 +++--- .../common/upgrade/RegulatorUpgradeState.java | 37 ++ .../common/upgrade/SimpleUpgradeItem.java | 49 ++- .../common/upgrade/UpgradeContainer.java | 5 +- .../UpgradeWithEnchantedBookRecipe.java | 82 ++-- ...radeWithEnchantedBookRecipeSerializer.java | 22 +- .../platform/common/util/ContainerUtil.java | 28 +- .../platform/common/util/IdentifierUtil.java | 2 +- .../platform/common/util/PacketUtil.java | 47 +-- ...oastHelper.java => SecurityToastUtil.java} | 4 +- .../WirelessTransmitterBlockEntity.java | 34 +- .../WirelessTransmitterContainerMenu.java | 12 +- .../WirelessTransmitterData.java | 13 + .../assets/refinedstorage2/lang/en_us.json | 21 +- .../models/item/configuration_card.json | 4 +- .../models/item/creative_wireless_grid.json | 4 +- .../models/item/network_card.json | 4 +- .../models/item/security_card.json | 4 +- .../models/item/wireless_grid.json | 4 +- .../data/c/tags/item}/tools/wrench.json | 0 .../better_than_a_barrel.json | 2 +- .../conditional_connecting.json | 2 +- .../connecting.json | 2 +- .../construction.json | 2 +- .../destruction.json | 2 +- .../detecting.json | 2 +- .../{advancements => advancement}/drives.json | 2 +- .../exporting.json | 2 +- .../importing.json | 2 +- .../interface_to_the_world.json | 2 +- .../interfacing_with_disks.json | 2 +- .../no_cables_required.json | 2 +- .../portable_storage.json | 2 +- .../{advancements => advancement}/root.json | 2 +- .../security.json | 2 +- .../storing_externally.json | 2 +- .../storing_fluids.json | 2 +- .../storing_items.json | 2 +- .../upgrading.json | 2 +- .../upgrading_your_grid.json | 2 +- .../viewing_your_storage.json | 2 +- .../wireless.json | 2 +- .../blocks/1024b_fluid_storage_block.json | 0 .../blocks/16k_storage_block.json | 0 .../blocks/1k_storage_block.json | 0 .../blocks/256b_fluid_storage_block.json | 0 .../blocks/4096b_fluid_storage_block.json | 0 .../blocks/4k_storage_block.json | 0 .../blocks/64b_fluid_storage_block.json | 0 .../blocks/64k_storage_block.json | 0 .../blocks/creative_fluid_storage_block.json | 0 .../blocks/creative_portable_grid.json | 0 .../blocks/creative_storage_block.json | 0 .../blocks/disk_drive.json | 0 .../blocks/exporter.json | 0 .../blocks/external_storage.json | 0 .../blocks/importer.json | 0 .../blocks/interface.json | 0 .../blocks/machine_casing.json | 0 .../blocks/portable_grid.json | 0 .../blocks/quartz_enriched_iron_block.json | 0 .../blocks/storage_monitor.json | 0 .../1024b_fluid_storage_block.json | 2 +- .../1024b_fluid_storage_disk.json | 2 +- ...uid_storage_disk_from_storage_housing.json | 2 +- .../1024b_fluid_storage_part.json | 2 +- .../16k_storage_block.json | 2 +- .../{recipes => recipe}/16k_storage_disk.json | 2 +- ...16k_storage_disk_from_storage_housing.json | 2 +- .../{recipes => recipe}/16k_storage_part.json | 2 +- .../{recipes => recipe}/1k_storage_block.json | 2 +- .../{recipes => recipe}/1k_storage_disk.json | 2 +- .../1k_storage_disk_from_storage_housing.json | 2 +- .../{recipes => recipe}/1k_storage_part.json | 2 +- .../256b_fluid_storage_block.json | 2 +- .../256b_fluid_storage_disk.json | 2 +- ...uid_storage_disk_from_storage_housing.json | 2 +- .../256b_fluid_storage_part.json | 2 +- .../4096b_fluid_storage_block.json | 2 +- .../4096b_fluid_storage_disk.json | 2 +- ...uid_storage_disk_from_storage_housing.json | 2 +- .../4096b_fluid_storage_part.json | 2 +- .../{recipes => recipe}/4k_storage_block.json | 2 +- .../{recipes => recipe}/4k_storage_disk.json | 2 +- .../4k_storage_disk_from_storage_housing.json | 2 +- .../{recipes => recipe}/4k_storage_part.json | 2 +- .../64b_fluid_storage_block.json | 2 +- .../64b_fluid_storage_disk.json | 2 +- ...uid_storage_disk_from_storage_housing.json | 2 +- .../64b_fluid_storage_part.json | 2 +- .../64k_storage_block.json | 2 +- .../{recipes => recipe}/64k_storage_disk.json | 2 +- ...64k_storage_disk_from_storage_housing.json | 2 +- .../{recipes => recipe}/64k_storage_part.json | 2 +- .../advanced_processor.json | 4 +- .../{recipes => recipe}/basic_processor.json | 4 +- .../block_of_quartz_enriched_iron.json | 2 +- .../{recipes => recipe}/cable.json | 2 +- .../configuration_card.json | 2 +- .../construction_core.json | 2 +- .../{recipes => recipe}/constructor.json | 2 +- .../{recipes => recipe}/controller.json | 2 +- .../{recipes => recipe}/crafting_grid.json | 2 +- .../{recipes => recipe}/destruction_core.json | 2 +- .../{recipes => recipe}/destructor.json | 2 +- .../{recipes => recipe}/detector.json | 2 +- .../{recipes => recipe}/disk_drive.json | 2 +- .../{recipes => recipe}/disk_interface.json | 2 +- .../{recipes => recipe}/exporter.json | 2 +- .../{recipes => recipe}/external_storage.json | 2 +- .../fallback_security_card.json | 2 +- .../fortune_1_upgrade.json | 4 +- .../fortune_2_upgrade.json | 4 +- .../fortune_3_upgrade.json | 4 +- .../{recipes => recipe}/grid.json | 2 +- .../{recipes => recipe}/importer.json | 2 +- .../improved_processor.json | 4 +- .../{recipes => recipe}/interface.json | 2 +- .../{recipes => recipe}/machine_casing.json | 2 +- .../{recipes => recipe}/network_card.json | 2 +- .../{recipes => recipe}/network_receiver.json | 2 +- .../network_transmitter.json | 2 +- .../{recipes => recipe}/portable_grid.json | 2 +- .../processor_binding.json | 2 +- .../quartz_enriched_iron.json | 2 +- .../quartz_enriched_iron_from_block.json | 2 +- .../{recipes => recipe}/range_upgrade.json | 2 +- .../raw_advanced_processor.json | 2 +- .../raw_basic_processor.json | 2 +- .../raw_improved_processor.json | 2 +- .../regulator_upgrade.json | 2 +- .../{recipes => recipe}/relay.json | 2 +- .../{recipes => recipe}/security_card.json | 2 +- .../{recipes => recipe}/security_manager.json | 2 +- .../{recipes => recipe}/silicon.json | 4 +- .../silk_touch_upgrade.json | 4 +- .../{recipes => recipe}/speed_upgrade.json | 2 +- .../{recipes => recipe}/stack_upgrade.json | 2 +- .../{recipes => recipe}/storage_housing.json | 2 +- .../{recipes => recipe}/storage_monitor.json | 2 +- .../{recipes => recipe}/upgrade.json | 2 +- .../{recipes => recipe}/wireless_grid.json | 2 +- .../wireless_transmitter.json | 2 +- .../{recipes => recipe}/wrench.json | 2 +- .../platform/common/PlatformTestFixtures.java | 19 - .../platform/common/TestPlatform.java | 34 +- .../common/grid/GridSortingTypesTest.java | 7 +- .../common/storage/FluidStorageTypeTest.java | 139 ------- .../common/storage/ItemStorageTypeTest.java | 136 ------- .../common/storage/PlatformStorageTest.java | 98 ----- .../storage/StorageRepositoryImplTest.java | 281 -------------- .../registry/PlatformRegistryImplTest.java | 6 +- .../support/resource/FluidResourceTest.java | 86 ----- .../support/resource/ItemResourceTest.java | 98 ----- .../list/FuzzyResourceListImplTest.java | 16 +- refinedstorage2-platform-fabric/build.gradle | 8 +- .../fabric/ClientModInitializerImpl.java | 301 ++++++--------- .../platform/fabric/ConfigImpl.java | 4 +- .../platform/fabric/ModInitializerImpl.java | 285 ++++++++++---- .../platform/fabric/PlatformImpl.java | 44 +-- .../strategy/FluidGridExtractionStrategy.java | 2 +- .../strategy/ItemGridInsertionStrategy.java | 2 +- .../mixin/AbstractModelBakerImplMixin.java | 39 +- .../c2s/ClientToServerCommunicationsImpl.java | 162 -------- .../packet/c2s/CraftingGridClearPacket.java | 28 -- .../c2s/CraftingGridRecipeTransferPacket.java | 45 --- .../fabric/packet/c2s/GridExtractPacket.java | 59 --- .../fabric/packet/c2s/GridInsertPacket.java | 31 -- .../fabric/packet/c2s/GridScrollPacket.java | 61 --- .../packet/c2s/PropertyChangePacket.java | 29 -- .../c2s/ResourceFilterSlotChangePacket.java | 42 --- .../c2s/ResourceSlotAmountChangePacket.java | 27 -- .../packet/c2s/ResourceSlotChangePacket.java | 27 -- .../c2s/SecurityCardBoundPlayerPacket.java | 26 -- .../c2s/SecurityCardPermissionPacket.java | 26 -- .../SecurityCardResetPermissionPacket.java | 25 -- .../packet/c2s/SingleAmountChangePacket.java | 28 -- .../packet/c2s/StorageInfoRequestPacket.java | 33 -- .../packet/c2s/UseNetworkBoundItemPacket.java | 37 -- .../fabric/packet/c2s/package-info.java | 7 - .../platform/fabric/packet/package-info.java | 7 - .../fabric/packet/s2c/EnergyInfoPacket.java | 26 -- .../fabric/packet/s2c/GridActivePacket.java | 25 -- .../fabric/packet/s2c/GridClearPacket.java | 23 -- .../fabric/packet/s2c/GridUpdatePacket.java | 40 -- .../s2c/NetworkTransmitterStatusPacket.java | 28 -- .../fabric/packet/s2c/NoPermissionPacket.java | 21 -- .../packet/s2c/ResourceSlotUpdatePacket.java | 56 --- .../s2c/ServerToClientCommunicationsImpl.java | 124 ------- .../packet/s2c/StorageInfoResponsePacket.java | 31 -- .../s2c/WirelessTransmitterRangePacket.java | 25 -- .../AbstractDiskContainerBakedModel.java | 18 +- .../diskdrive/DiskDriveUnbakedModel.java | 3 +- .../DiskInterfaceUnbakedModel.java | 3 +- .../PortableGridUnbakedModel.java | 3 +- .../FabricExtendedMenuProviderAdapter.java | 37 -- .../support/containermenu/MenuOpenerImpl.java | 31 +- .../support/render/EmissiveModelRegistry.java | 9 +- .../fabric/support/resource/VariantUtil.java | 8 +- .../resources/data/c/tags/items/wrenches.json | 6 - .../src/main/resources/fabric.mod.json | 4 +- refinedstorage2-platform-forge/build.gradle | 2 + .../platform/forge/ConfigImpl.java | 4 +- .../platform/forge/ModInitializer.java | 351 ++++++++++-------- .../platform/forge/PlatformImpl.java | 48 +-- .../forge/datagen/DataGenerators.java | 30 +- .../forge/datagen/ItemModelProviderImpl.java | 2 +- .../forge/datagen/loot/BlockDropProvider.java | 5 +- .../datagen/loot/LootTableProviderImpl.java | 6 +- .../recipe/RecoloringRecipeProvider.java | 8 +- .../grid/strategy/CursorItemHandler.java | 7 +- .../strategy/FluidGridExtractionStrategy.java | 4 +- .../strategy/ItemGridInsertionStrategy.java | 2 +- .../view/ForgeFluidGridResourceFactory.java | 2 +- .../storage/DiskContainerItemOverrides.java | 15 +- .../forge/storage/ForgeHandlerUtil.java | 2 +- .../ItemHandlerExtractableStorage.java | 5 +- .../diskdrive/DiskDriveUnbakedGeometry.java | 3 +- .../DiskInterfaceUnbakedGeometry.java | 3 +- .../portablegrid/PortableGridBakedModel.java | 3 + .../PortableGridUnbakedGeometry.java | 3 +- .../support/containermenu/MenuOpenerImpl.java | 12 +- .../c2s/ClientToServerCommunicationsImpl.java | 117 ------ .../packet/c2s/CraftingGridClearPacket.java | 33 -- .../c2s/CraftingGridRecipeTransferPacket.java | 54 --- .../support/packet/c2s/GridExtractPacket.java | 75 ---- .../support/packet/c2s/GridInsertPacket.java | 38 -- .../support/packet/c2s/GridScrollPacket.java | 77 ---- .../packet/c2s/PropertyChangePacket.java | 34 -- .../c2s/ResourceFilterSlotChangePacket.java | 63 ---- .../c2s/ResourceSlotAmountChangePacket.java | 34 -- .../packet/c2s/ResourceSlotChangePacket.java | 35 -- .../c2s/SecurityCardBoundPlayerPacket.java | 38 -- .../c2s/SecurityCardPermissionPacket.java | 35 -- .../SecurityCardResetPermissionPacket.java | 33 -- .../packet/c2s/SingleAmountChangePacket.java | 33 -- .../packet/c2s/StorageInfoRequestPacket.java | 43 --- .../support/packet/s2c/EnergyInfoPacket.java | 36 -- .../support/packet/s2c/GridActivePacket.java | 35 -- .../support/packet/s2c/GridClearPacket.java | 31 -- .../support/packet/s2c/GridUpdatePacket.java | 61 --- .../s2c/NetworkTransmitterStatusPacket.java | 38 -- .../packet/s2c/NoPermissionPacket.java | 30 -- .../packet/s2c/ResourceSlotUpdatePacket.java | 67 ---- .../s2c/ServerToClientCommunicationsImpl.java | 94 ----- .../packet/s2c/StorageInfoResponsePacket.java | 38 -- .../s2c/WirelessTransmitterRangePacket.java | 33 -- .../support/packet/s2c/package-info.java | 7 - .../render/FluidStackFluidRenderer.java | 9 +- .../forge/support/resource/VariantUtil.java | 14 +- .../{mods.toml => neoforge.mods.toml} | 0 .../src/main/resources/pack.mcmeta | 4 +- .../platform/forge/GameTestUtil.java | 24 +- .../{structures => structure}/empty_15x15.nbt | Bin settings.gradle | 2 +- 1237 files changed, 5532 insertions(+), 6649 deletions(-) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/black_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/blue_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/brown_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/cyan_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/gray_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/green_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_blue_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/light_gray_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/lime_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/magenta_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/orange_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/pink_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/purple_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/red_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/white_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_cable.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_constructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_controller.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_crafting_grid.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_destructor.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_detector.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_disk_interface.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_exporter.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_external_storage.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_grid.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_importer.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_network_receiver.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_network_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_relay.json (92%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_security_manager.json (91%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{advancements => advancement}/recipes/misc/coloring/yellow_wireless_transmitter.json (90%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/black_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/blue_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/brown_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/cyan_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/gray_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/green_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_blue_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_blue_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_blue_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/light_gray_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/lime_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/magenta_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/orange_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/pink_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/purple_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/red_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/white_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_cable.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_constructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_crafting_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_creative_controller.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_destructor.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_detector.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_disk_interface.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_grid.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_network_receiver.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_network_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_relay.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_security_manager.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/yellow_wireless_transmitter.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_cable.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_disk_interface.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_exporter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_importer.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_relay.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/black_wireless_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_cable.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_disk_interface.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_exporter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_importer.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_relay.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/blue_wireless_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_cable.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_disk_interface.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_exporter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_importer.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_relay.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/brown_wireless_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_cable.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_disk_interface.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_exporter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_importer.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_relay.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/cyan_wireless_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_cable.json (80%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_constructor.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_destructor.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_disk_interface.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_exporter.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_external_storage.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_importer.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_relay.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/gray_wireless_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_cable.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_disk_interface.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_exporter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_importer.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_relay.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/green_wireless_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_cable.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_constructor.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_controller.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_crafting_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_destructor.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_detector.json (80%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_disk_interface.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_exporter.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_external_storage.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_grid.json (81%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_importer.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_network_receiver.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_network_transmitter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_relay.json (80%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_security_manager.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_blue_wireless_transmitter.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_cable.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_constructor.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_controller.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_crafting_grid.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_destructor.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_detector.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_disk_interface.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_exporter.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_external_storage.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_importer.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_network_receiver.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_network_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_relay.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_security_manager.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/light_gray_wireless_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_cable.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_disk_interface.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_exporter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_importer.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_relay.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/lime_wireless_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_cable.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_crafting_grid.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_detector.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_disk_interface.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_exporter.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_grid.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_importer.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_network_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_relay.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/magenta_wireless_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_cable.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_crafting_grid.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_detector.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_disk_interface.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_exporter.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_grid.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_importer.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_network_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_relay.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/orange_wireless_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_cable.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_disk_interface.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_exporter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_importer.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_relay.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/pink_wireless_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_cable.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_crafting_grid.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_detector.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_disk_interface.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_exporter.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_grid.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_importer.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_network_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_relay.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/purple_wireless_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_cable.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_controller.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_destructor.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_disk_interface.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_exporter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_importer.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_relay.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/red_wireless_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_cable.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_crafting_grid.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_detector.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_disk_interface.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_exporter.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_grid.json (79%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_importer.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_network_transmitter.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_relay.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/white_wireless_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_cable.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_constructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_controller.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_crafting_grid.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_destructor.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_detector.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_disk_interface.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_exporter.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_external_storage.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_grid.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_importer.json (77%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_network_receiver.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_network_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_relay.json (78%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_security_manager.json (76%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/{recipes => recipe}/coloring/yellow_wireless_transmitter.json (75%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/cables.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/constructors.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/controllers.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/crafting_grids.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/creative_controllers.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/destructors.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/detectors.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/disk_interfaces.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/exporters.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/external_storages.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/fluid_storage_disks.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/grids.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/importers.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/network_receivers.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/network_transmitters.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/relays.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/security_managers.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/storage_disks.json (100%) rename refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/{items => item}/wireless_transmitters.json (100%) create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardState.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DataComponents.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ExtendedMenuTypeFactory.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerData.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridData.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/PortableGridData.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridData.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceData.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterData.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterStatus.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerBoundSecurityCardData.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardBoundPlayer.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardData.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardPermissions.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageCodecs.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockData.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ServerToClientCommunications.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/SingleAmountData.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketContext.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketHandler.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketIds.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/C2SPackets.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridClearPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridExtractPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridInsertPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridScrollPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/PropertyChangePacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotChangePacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SingleAmountChangePacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/StorageInfoRequestPacket.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common}/support/packet/c2s/UseNetworkBoundItemPacket.java (50%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common}/support/packet/c2s/package-info.java (73%) create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/EnergyInfoPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridActivePacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridClearPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridUpdatePacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NoPermissionPacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/S2CPackets.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/StorageInfoResponsePacket.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric => refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support}/packet/s2c/package-info.java (73%) create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceCodecs.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerData.java create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeState.java rename refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/{SecurityToastHelper.java => SecurityToastUtil.java} (90%) create mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterData.java rename {refinedstorage2-platform-forge/src/main/resources/data/forge/tags/items => refinedstorage2-platform-common/src/main/resources/data/c/tags/item}/tools/wrench.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/better_than_a_barrel.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/conditional_connecting.json (93%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/connecting.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/construction.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/destruction.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/detecting.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/drives.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/exporting.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/importing.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/interface_to_the_world.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/interfacing_with_disks.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/no_cables_required.json (93%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/portable_storage.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/root.json (90%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/security.json (93%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/storing_externally.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/storing_fluids.json (90%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/storing_items.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/upgrading.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/upgrading_your_grid.json (92%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/viewing_your_storage.json (93%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{advancements => advancement}/wireless.json (93%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/1024b_fluid_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/16k_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/1k_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/256b_fluid_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/4096b_fluid_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/4k_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/64b_fluid_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/64k_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/creative_fluid_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/creative_portable_grid.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/creative_storage_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/disk_drive.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/exporter.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/external_storage.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/importer.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/interface.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/machine_casing.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/portable_grid.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/quartz_enriched_iron_block.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{loot_tables => loot_table}/blocks/storage_monitor.json (100%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/1024b_fluid_storage_block.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/1024b_fluid_storage_disk.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/1024b_fluid_storage_disk_from_storage_housing.json (79%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/1024b_fluid_storage_part.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/16k_storage_block.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/16k_storage_disk.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/16k_storage_disk_from_storage_housing.json (81%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/16k_storage_part.json (89%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/1k_storage_block.json (89%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/1k_storage_disk.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/1k_storage_disk_from_storage_housing.json (81%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/1k_storage_part.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/256b_fluid_storage_block.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/256b_fluid_storage_disk.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/256b_fluid_storage_disk_from_storage_housing.json (80%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/256b_fluid_storage_part.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/4096b_fluid_storage_block.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/4096b_fluid_storage_disk.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/4096b_fluid_storage_disk_from_storage_housing.json (79%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/4096b_fluid_storage_part.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/4k_storage_block.json (89%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/4k_storage_disk.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/4k_storage_disk_from_storage_housing.json (81%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/4k_storage_part.json (89%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/64b_fluid_storage_block.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/64b_fluid_storage_disk.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/64b_fluid_storage_disk_from_storage_housing.json (80%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/64b_fluid_storage_part.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/64k_storage_block.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/64k_storage_disk.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/64k_storage_disk_from_storage_housing.json (81%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/64k_storage_part.json (89%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/advanced_processor.json (66%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/basic_processor.json (67%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/block_of_quartz_enriched_iron.json (77%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/cable.json (89%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/configuration_card.json (86%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/construction_core.json (80%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/constructor.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/controller.json (90%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/crafting_grid.json (85%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/destruction_core.json (80%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/destructor.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/detector.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/disk_drive.json (90%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/disk_interface.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/exporter.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/external_storage.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/fallback_security_card.json (78%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/fortune_1_upgrade.json (63%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/fortune_2_upgrade.json (63%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/fortune_3_upgrade.json (63%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/grid.json (93%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/importer.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/improved_processor.json (66%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/interface.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/machine_casing.json (84%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/network_card.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/network_receiver.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/network_transmitter.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/portable_grid.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/processor_binding.json (83%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/quartz_enriched_iron.json (81%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/quartz_enriched_iron_from_block.json (76%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/range_upgrade.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/raw_advanced_processor.json (84%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/raw_basic_processor.json (85%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/raw_improved_processor.json (85%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/regulator_upgrade.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/relay.json (89%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/security_card.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/security_manager.json (90%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/silicon.json (66%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/silk_touch_upgrade.json (60%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/speed_upgrade.json (87%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/stack_upgrade.json (84%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/storage_housing.json (86%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/storage_monitor.json (91%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/upgrade.json (89%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/wireless_grid.json (89%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/wireless_transmitter.json (88%) rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/{recipes => recipe}/wrench.json (87%) delete mode 100644 refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/PlatformTestFixtures.java delete mode 100644 refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageTypeTest.java delete mode 100644 refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageTypeTest.java delete mode 100644 refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorageTest.java delete mode 100644 refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImplTest.java delete mode 100644 refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceTest.java delete mode 100644 refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceTest.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ClientToServerCommunicationsImpl.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/CraftingGridClearPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/CraftingGridRecipeTransferPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridExtractPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridInsertPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridScrollPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/PropertyChangePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceFilterSlotChangePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceSlotAmountChangePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceSlotChangePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardBoundPlayerPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardPermissionPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardResetPermissionPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SingleAmountChangePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/StorageInfoRequestPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/UseNetworkBoundItemPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/EnergyInfoPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridActivePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridClearPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridUpdatePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/NetworkTransmitterStatusPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/NoPermissionPacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/ResourceSlotUpdatePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/ServerToClientCommunicationsImpl.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/StorageInfoResponsePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/WirelessTransmitterRangePacket.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/FabricExtendedMenuProviderAdapter.java delete mode 100644 refinedstorage2-platform-fabric/src/main/resources/data/c/tags/items/wrenches.json delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ClientToServerCommunicationsImpl.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/CraftingGridClearPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/CraftingGridRecipeTransferPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridExtractPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridInsertPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridScrollPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/PropertyChangePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceFilterSlotChangePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceSlotAmountChangePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceSlotChangePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardBoundPlayerPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardPermissionPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardResetPermissionPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SingleAmountChangePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/StorageInfoRequestPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/EnergyInfoPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridActivePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridClearPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridUpdatePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/NetworkTransmitterStatusPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/NoPermissionPacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/ResourceSlotUpdatePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/ServerToClientCommunicationsImpl.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/StorageInfoResponsePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/WirelessTransmitterRangePacket.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/package-info.java rename refinedstorage2-platform-forge/src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (100%) rename refinedstorage2-platform-forge/src/test/resources/data/refinedstorage2/{structures => structure}/empty_15x15.nbt (100%) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 247bb242b..de53558c3 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -35,7 +35,7 @@ body: description: | If your Minecraft version isn't listed here, it means that it isn't supported. In that case, don't create an issue. options: - - Minecraft 1.20.4 + - Minecraft 1.21 validations: required: true - type: input diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc884518b..26ea270df 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.13.4 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.14.3 with: gametests: true secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 5ea1d94ee..2498347be 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.13.4 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.14.3 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index 9f9ee90e4..fbe1751c1 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.13.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.14.3 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index d0391af4b..de7a0f22c 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,8 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.13.4 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.14.3 secrets: inherit with: project-name: 'Refined Storage' + gametests: true diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index 16b1cf9e1..46aca1095 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -4,4 +4,4 @@ on: - cron: '0 0 * * *' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.13.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.14.3 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index b2ddb776a..48b3acb59 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.13.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.14.3 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 2adc54f63..797504050 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.13.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.14.3 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 8ef06cd33..72b08ed2e 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.13.4 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.14.3 \ No newline at end of file diff --git a/.idea/dictionaries/refinedstorage2.xml b/.idea/dictionaries/refinedstorage2.xml index 358caf40a..aeda850ec 100644 --- a/.idea/dictionaries/refinedstorage2.xml +++ b/.idea/dictionaries/refinedstorage2.xml @@ -2,6 +2,7 @@ autocrafting + emissive redstone diff --git a/CHANGELOG.md b/CHANGELOG.md index ddf7695d6..35a292131 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,21 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added + +- Ported to Minecraft 1.21. +- More help information for items. + +### Fixed + +- Regulator Upgrade having wrong GUI title. +- Crafting Grid not dropping crafting matrix contents when broken. +- "+1" amount screen button not doing anything. + +### Changed + +- Internal data format for storages. Storages from milestone 3 are incompatible and will not be transferred. + ## [2.0.0-milestone.3.14] - 2024-06-28 ### Added diff --git a/gradle.properties b/gradle.properties index 1e6a9cb58..a8d260d7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,2 @@ -noIndiumVersion=1.1.0+1.20.4 # Gradle org.gradle.jvmargs=-Xmx1G diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a4..a4413138c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java index 0fb88e195..ffec6dfd1 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java @@ -52,7 +52,6 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; @@ -72,6 +71,8 @@ public interface PlatformApi { PlatformRegistry getStorageTypeRegistry(); + StorageRepository getClientStorageRepository(); + StorageRepository getStorageRepository(Level level); StorageContainerItemHelper getStorageContainerItemHelper(); @@ -106,8 +107,6 @@ public interface PlatformApi { PlatformRegistry getGridSynchronizerRegistry(); - void writeGridScreenOpeningData(Grid grid, FriendlyByteBuf buf); - UpgradeRegistry getUpgradeRegistry(); BuiltinUpgradeDestinations getBuiltinUpgradeDestinations(); @@ -189,10 +188,6 @@ EnergyStorage asBlockItemEnergyStorage( PlatformRegistry getSlotReferenceFactoryRegistry(); - void writeSlotReference(SlotReference slotReference, FriendlyByteBuf buf); - - Optional getSlotReference(FriendlyByteBuf buf); - void addSlotReferenceProvider(SlotReferenceProvider slotReferenceProvider); SlotReference createInventorySlotReference(Player player, InteractionHand hand); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java index abfbb6044..234263513 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java @@ -52,7 +52,6 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; @@ -81,6 +80,11 @@ public PlatformRegistry getStorageTypeRegistry() { return ensureLoaded().getStorageTypeRegistry(); } + @Override + public StorageRepository getClientStorageRepository() { + return ensureLoaded().getClientStorageRepository(); + } + @Override public StorageRepository getStorageRepository(final Level level) { return ensureLoaded().getStorageRepository(level); @@ -166,11 +170,6 @@ public PlatformRegistry getGridSynchronizerRegistry() { return ensureLoaded().getGridSynchronizerRegistry(); } - @Override - public void writeGridScreenOpeningData(final Grid grid, final FriendlyByteBuf buf) { - ensureLoaded().writeGridScreenOpeningData(grid, buf); - } - @Override public UpgradeRegistry getUpgradeRegistry() { return ensureLoaded().getUpgradeRegistry(); @@ -358,16 +357,6 @@ public PlatformRegistry getSlotReferenceFactoryRegistry() return ensureLoaded().getSlotReferenceFactoryRegistry(); } - @Override - public void writeSlotReference(final SlotReference slotReference, final FriendlyByteBuf buf) { - ensureLoaded().writeSlotReference(slotReference, buf); - } - - @Override - public Optional getSlotReference(final FriendlyByteBuf buf) { - return ensureLoaded().getSlotReference(buf); - } - @Override public void addSlotReferenceProvider(final SlotReferenceProvider slotReferenceProvider) { ensureLoaded().addSlotReferenceProvider(slotReferenceProvider); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/ConfigurationCardTarget.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/ConfigurationCardTarget.java index e3f8c79d0..846a96fe1 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/ConfigurationCardTarget.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/ConfigurationCardTarget.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.List; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.Item; import org.apiguardian.api.API; @@ -12,9 +13,9 @@ */ @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.2") public interface ConfigurationCardTarget { - void writeConfiguration(CompoundTag tag); + void writeConfiguration(CompoundTag tag, HolderLookup.Provider provider); - void readConfiguration(CompoundTag tag); + void readConfiguration(CompoundTag tag, HolderLookup.Provider provider); default List getUpgradeItems() { return Collections.emptyList(); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerBlockItem.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerBlockItem.java index f4c499eae..7173fe2e6 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerBlockItem.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerBlockItem.java @@ -71,15 +71,12 @@ private void updateBlockEntityTag(final BlockPos pos, @Override public void appendHoverText(final ItemStack stack, - @Nullable final Level level, + final TooltipContext context, final List tooltip, - final TooltipFlag context) { - super.appendHoverText(stack, level, tooltip, context); - if (level == null) { - return; - } - final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); - helper.appendToTooltip(stack, storageRepository, tooltip, context, this::formatAmount, hasCapacity()); + final TooltipFlag flag) { + super.appendHoverText(stack, context, tooltip, flag); + final StorageRepository storageRepository = PlatformApi.INSTANCE.getClientStorageRepository(); + helper.appendToTooltip(stack, storageRepository, tooltip, flag, this::formatAmount, hasCapacity()); } protected abstract boolean hasCapacity(); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerItem.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerItem.java index f82f05397..b9d56b401 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerItem.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerItem.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage2.platform.api.storage; -import com.refinedmods.refinedstorage2.api.storage.Storage; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import java.util.List; @@ -28,8 +27,8 @@ protected AbstractStorageContainerItem(final Properties properties, final Storag } @Override - public Optional resolve(final StorageRepository storageRepository, final ItemStack stack) { - return helper.resolve(storageRepository, stack); + public Optional resolve(final StorageRepository storageRepository, final ItemStack stack) { + return helper.resolveStorage(storageRepository, stack); } @Override @@ -52,30 +51,27 @@ public void inventoryTick(final ItemStack stack, final int slot, final boolean selected) { super.inventoryTick(stack, level, entity, slot, selected); - if (!level.isClientSide() && !stack.hasTag() && entity instanceof Player) { + if (!level.isClientSide() && !helper.hasStorage(stack) && entity instanceof Player) { final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); - helper.set(storageRepository, stack, createStorage(storageRepository)); + helper.setStorage(storageRepository, stack, createStorage(storageRepository)); } } @Override public void appendHoverText(final ItemStack stack, - @Nullable final Level level, + final TooltipContext context, final List tooltip, - final TooltipFlag context) { - super.appendHoverText(stack, level, tooltip, context); - if (level == null) { - return; - } - final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); - helper.appendToTooltip(stack, storageRepository, tooltip, context, this::formatAmount, hasCapacity()); + final TooltipFlag flag) { + super.appendHoverText(stack, context, tooltip, flag); + final StorageRepository storageRepository = PlatformApi.INSTANCE.getClientStorageRepository(); + helper.appendToTooltip(stack, storageRepository, tooltip, flag, this::formatAmount, hasCapacity()); } protected abstract boolean hasCapacity(); protected abstract String formatAmount(long amount); - protected abstract Storage createStorage(StorageRepository storageRepository); + protected abstract SerializableStorage createStorage(StorageRepository storageRepository); protected abstract ItemStack createPrimaryDisassemblyByproduct(int count); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/SerializableStorage.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/SerializableStorage.java index 801799a1e..57732b1e4 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/SerializableStorage.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/SerializableStorage.java @@ -1,8 +1,18 @@ package com.refinedmods.refinedstorage2.platform.api.storage; +import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; + +import com.mojang.serialization.Codec; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") -public interface SerializableStorage { +public interface SerializableStorage extends Storage { StorageType getType(); + + static Codec getCodec(final Runnable listener) { + return PlatformApi.INSTANCE.getStorageTypeRegistry() + .codec() + .dispatch(SerializableStorage::getType, storage -> storage.getMapCodec(listener)); + } } diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java index 9d33a3bfa..b41fe46c4 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java @@ -1,7 +1,5 @@ package com.refinedmods.refinedstorage2.platform.api.storage; -import com.refinedmods.refinedstorage2.api.storage.Storage; - import java.util.Optional; import java.util.function.Predicate; @@ -10,7 +8,7 @@ @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") public interface StorageContainerItem { - Optional resolve(StorageRepository storageRepository, ItemStack stack); + Optional resolve(StorageRepository storageRepository, ItemStack stack); Optional getInfo(StorageRepository storageRepository, ItemStack stack); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItemHelper.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItemHelper.java index c2428eac2..3e0b8131f 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItemHelper.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItemHelper.java @@ -1,7 +1,5 @@ package com.refinedmods.refinedstorage2.platform.api.storage; -import com.refinedmods.refinedstorage2.api.storage.Storage; - import java.util.List; import java.util.Map; import java.util.Optional; @@ -21,9 +19,11 @@ @API(status = API.Status.STABLE, since = "2.0.0-milestone.2.5") public interface StorageContainerItemHelper { - Optional resolve(StorageRepository storageRepository, ItemStack stack); + Optional resolveStorage(StorageRepository storageRepository, ItemStack stack); + + void setStorage(StorageRepository storageRepository, ItemStack stack, SerializableStorage storage); - void set(StorageRepository storageRepository, ItemStack stack, Storage storage); + boolean hasStorage(ItemStack stack); Optional getInfo(StorageRepository storageRepository, ItemStack stack); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageRepository.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageRepository.java index 163833237..2ccffb075 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageRepository.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageRepository.java @@ -1,7 +1,5 @@ package com.refinedmods.refinedstorage2.platform.api.storage; -import com.refinedmods.refinedstorage2.api.storage.Storage; - import java.util.Optional; import java.util.UUID; @@ -15,7 +13,7 @@ public interface StorageRepository { * @param id the id * @return the storage, if present */ - Optional get(UUID id); + Optional get(UUID id); /** * Sets a storage by ID. @@ -23,7 +21,7 @@ public interface StorageRepository { * @param id the id * @param storage the storage */ - void set(UUID id, Storage storage); + void set(UUID id, SerializableStorage storage); /** * If the storage exists, and is empty, it will remove the storage from the repository. @@ -31,7 +29,7 @@ public interface StorageRepository { * @param id the id * @return the removed storage, if it existed and was empty */ - Optional removeIfEmpty(UUID id); + Optional removeIfEmpty(UUID id); /** * Retrieves info for a given storage ID. diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java index af53007ed..7ab762f3a 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java @@ -1,20 +1,17 @@ package com.refinedmods.refinedstorage2.platform.api.storage; import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Storage; import javax.annotation.Nullable; -import net.minecraft.nbt.CompoundTag; +import com.mojang.serialization.MapCodec; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") public interface StorageType { - Storage create(@Nullable Long capacity, Runnable listener); + SerializableStorage create(@Nullable Long capacity, Runnable listener); - Storage fromTag(CompoundTag tag, Runnable listener); - - CompoundTag toTag(Storage storage); + MapCodec getMapCodec(Runnable listener); boolean isAllowed(ResourceKey resource); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyBlockItem.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyBlockItem.java index af084eaf1..aa3675f35 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyBlockItem.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyBlockItem.java @@ -26,11 +26,11 @@ protected AbstractEnergyBlockItem(final Block block, final Properties properties @Override public void appendHoverText( final ItemStack stack, - @Nullable final Level level, + final TooltipContext context, final List lines, final TooltipFlag flag ) { - super.appendHoverText(stack, level, lines, flag); + super.appendHoverText(stack, context, lines, flag); helper.addTooltip(stack, lines); } diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyItem.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyItem.java index 0d3c846b6..1018e5cc6 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyItem.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyItem.java @@ -1,13 +1,11 @@ package com.refinedmods.refinedstorage2.platform.api.support.energy; import java.util.List; -import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") @@ -22,11 +20,11 @@ protected AbstractEnergyItem(final Properties properties, final EnergyItemHelper @Override public void appendHoverText( final ItemStack stack, - @Nullable final Level level, + final TooltipContext context, final List lines, final TooltipFlag flag ) { - super.appendHoverText(stack, level, lines, flag); + super.appendHoverText(stack, context, lines, flag); helper.addTooltip(stack, lines); } diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java index 16770c32c..7b8f679ea 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; @@ -45,10 +44,10 @@ public Optional getTooltipImage(final ItemStack stack) { @Override public void appendHoverText(final ItemStack stack, - @Nullable final Level level, + final TooltipContext context, final List tooltip, final TooltipFlag flag) { - super.appendHoverText(stack, level, tooltip, flag); + super.appendHoverText(stack, context, tooltip, flag); networkBoundItemHelper.addTooltip(stack, tooltip); } diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReference.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReference.java index 2affc8478..c5a365111 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReference.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReference.java @@ -2,7 +2,6 @@ import java.util.Optional; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import org.apiguardian.api.API; @@ -11,8 +10,6 @@ public interface SlotReference { boolean isDisabledSlot(int playerSlotIndex); - void writeToBuffer(FriendlyByteBuf buf); - Optional resolve(Player player); SlotReferenceFactory getFactory(); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceFactory.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceFactory.java index 3bd695536..f94b1da7a 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceFactory.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceFactory.java @@ -1,9 +1,30 @@ package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem; -import net.minecraft.network.FriendlyByteBuf; +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.resources.ResourceLocation; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") public interface SlotReferenceFactory { - SlotReference create(FriendlyByteBuf buf); + StreamCodec STREAM_CODEC = StreamCodec.of( + (buf, slotReference) -> { + final ResourceLocation factoryId = PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry() + .getId(slotReference.getFactory()) + .orElseThrow(); + buf.writeResourceLocation(factoryId); + slotReference.getFactory().getStreamCodec().encode(buf, slotReference); + }, + buf -> { + final ResourceLocation factoryId = buf.readResourceLocation(); + final SlotReferenceFactory factory = PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry() + .get(factoryId) + .orElseThrow(); + return factory.getStreamCodec().decode(buf); + } + ); + + StreamCodec getStreamCodec(); } diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/PlatformRegistry.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/PlatformRegistry.java index 29a490e35..18ead5170 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/PlatformRegistry.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/PlatformRegistry.java @@ -4,6 +4,9 @@ import java.util.Optional; import javax.annotation.Nullable; +import com.mojang.serialization.Codec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceLocation; import org.apiguardian.api.API; @@ -48,4 +51,14 @@ public interface PlatformRegistry { */ @Nullable T nextOrNullIfLast(T value); + + /** + * @return a {@link Codec} for this registry + */ + Codec codec(); + + /** + * @return a {@link StreamCodec} for this registry + */ + StreamCodec streamCodec(); } diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/PlatformResourceKey.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/PlatformResourceKey.java index b6987d6c6..b12fe2831 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/PlatformResourceKey.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/PlatformResourceKey.java @@ -2,16 +2,10 @@ import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.4") public interface PlatformResourceKey extends ResourceKey { - CompoundTag toTag(); - - void toBuffer(FriendlyByteBuf buf); - long getInterfaceExportLimit(); ResourceType getResourceType(); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceContainer.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceContainer.java index 69ada0d77..df726ee9e 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceContainer.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceContainer.java @@ -8,8 +8,8 @@ import java.util.Set; import javax.annotation.Nullable; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; import org.apiguardian.api.API; @@ -57,13 +57,9 @@ default boolean isEmpty(int index) { List getResources(); - void writeToUpdatePacket(FriendlyByteBuf buf); + CompoundTag toTag(HolderLookup.Provider provider); - void readFromUpdatePacket(int index, FriendlyByteBuf buf); - - CompoundTag toTag(); - - void fromTag(CompoundTag tag); + void fromTag(CompoundTag tag, HolderLookup.Provider provider); ResourceFactory getPrimaryResourceFactory(); diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceType.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceType.java index a494eb278..f91131952 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceType.java +++ b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceType.java @@ -8,17 +8,21 @@ import java.util.Optional; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceLocation; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.4") public interface ResourceType { - Optional fromTag(CompoundTag tag); + MapCodec getMapCodec(); - PlatformResourceKey fromBuffer(FriendlyByteBuf buf); + Codec getCodec(); + + StreamCodec getStreamCodec(); MutableComponent getTitle(); diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_cable.json index d3db991f0..ab4bdd4ec 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_constructor.json index 1dd5e8d4b..aeb4c584f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_controller.json index 9c61d03da..a5f09a2e2 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_crafting_grid.json index f63aa8ac7..64ac26b02 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_destructor.json index 084f62c1f..f60464039 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_detector.json index 647cf0300..e38cf2ea4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_disk_interface.json index 2257e11c5..659d2dde5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_exporter.json index 19461a32b..187e40bba 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_external_storage.json index b63faf1bc..e6ef99543 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_grid.json index dc32ec5e7..79d1c6cc1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_importer.json index e1e5f246c..7fe610011 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_receiver.json index a25c7205b..ec3342f03 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_transmitter.json index b31d9bcc2..035a09847 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_relay.json index 3377dcb4c..cf3855aba 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_security_manager.json index 1c8eadbfb..46d3f4359 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_wireless_transmitter.json index 75467defa..71757e533 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/black_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_cable.json index d6ab78505..887460773 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_constructor.json index 7f14346e2..462cb7d94 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_controller.json index eed4ee1ef..9fd5c5017 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_crafting_grid.json index 7d5bc773a..acac86f6f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_destructor.json index 10284b92a..bd31981f4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_detector.json index c46103976..23195504e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_disk_interface.json index 41ca613dd..04dbd716c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_exporter.json index 3293b363d..59349bfd7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_external_storage.json index 021e6300b..2f5be5923 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_grid.json index c43c0b299..918085fc4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_importer.json index 6ed2abe77..ff786a7b1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_receiver.json index 79acce956..73e02bd65 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_transmitter.json index d692e772c..9bdfe44f9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_relay.json index 15e6f885c..c632b9f0d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_security_manager.json index 160bfa32b..b05c0ea9c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_wireless_transmitter.json index 0297bb91c..0da302949 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/blue_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_cable.json index 36eb6d6ff..1114fc3ba 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_constructor.json index 1826b2c6d..0802a7620 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_controller.json index 153a130df..695e39e8d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_crafting_grid.json index 85633ff2d..e79e6defe 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_destructor.json index 23445c672..07750f9dc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_detector.json index a3badbb5e..02a226bf0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_disk_interface.json index e0ae1f4fc..0ec7a7bce 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_exporter.json index a376591e8..3ecd6d90d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_external_storage.json index f32dd9ca8..ec47de81e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_grid.json index b0030066e..bff3a2da3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_importer.json index 4314c14e9..53f6390c3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_receiver.json index 194e86e3a..c528846d3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_transmitter.json index 88736f539..21ad97f20 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_relay.json index cffbbfee1..7cfd069de 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_security_manager.json index 1b680cccb..765f9db04 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_wireless_transmitter.json index 163ff2101..3c993f21e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/brown_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_cable.json index 0302bfb36..818e8688a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_constructor.json index d1ae5f9ea..ea007af43 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_controller.json index db27f5170..84a7203ef 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_crafting_grid.json index 26cfd294c..a8093f848 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_destructor.json index 6067674d3..005eb9abb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_detector.json index 1e09263e9..b54a6dbdc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_disk_interface.json index 858d22003..10bafc03f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_exporter.json index 60ab95120..172dac938 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_external_storage.json index 92c1398d8..6e9d813da 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_grid.json index b091dacfa..65d08104a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_importer.json index 8878b3d27..99579df09 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_receiver.json index 5816a373b..34a1bd5ba 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_transmitter.json index 1d4f20b4c..11be23a3a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_relay.json index 776a551b8..1d2891dff 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_security_manager.json index dc3fa7712..bf696080d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json index fef581b84..81d706af3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/cyan_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_cable.json index 70d872141..992e45a17 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_constructor.json index 1ec85077d..8fdb3a574 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_controller.json index 4239623f9..39260847d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_crafting_grid.json index 58e0adb2c..374f9b1a8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_destructor.json index 74d9347fb..51c84af5a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_detector.json index 7040db113..0b26f68b9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_disk_interface.json index e1dd246f9..9fc5b6617 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_exporter.json index de6223b7d..bfef9412b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_external_storage.json index 1050b7fe6..c082be2f9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_grid.json index 1c5ccba36..7c30db465 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_importer.json index 2c8c3581f..72c4237be 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_receiver.json index 0de56015d..37a41b196 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_transmitter.json index 5de9bb735..1eae61331 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_relay.json index eafcb62d5..2bd2d0f3b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_security_manager.json index 8dfa953ea..06a91266e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_wireless_transmitter.json index 2a6d0da6b..8869b2e84 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/gray_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_cable.json index 24be1c12e..cad2e17ac 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_constructor.json index d3f92385d..49f4a6cb0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_controller.json index 9439a48be..e9df569ff 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_crafting_grid.json index 691ede3dd..d9455ec6d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_destructor.json index 82e6917cf..2cf25b095 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_detector.json index c19a599cb..88bc00f52 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_disk_interface.json index cc710d923..273634d77 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_exporter.json index 3625522a6..0784ffe2c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_external_storage.json index d1f361f81..636dfd661 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_grid.json index b8f0def56..3f57b02aa 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_importer.json index 6c45f05f1..5ebf53839 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_receiver.json index 0aac86085..ac73fada5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_transmitter.json index e1c1680dc..7dfd6647d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_relay.json index 82699eef5..9c2d5a8f6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_security_manager.json index da323c613..44e6cb5c7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_wireless_transmitter.json index 49164ba8b..8402525ad 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/green_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_cable.json index ed91eb4d0..b25eac900 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_constructor.json index 3396ea2b1..dffd46d35 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_controller.json index afc6b1b15..cd06eeb69 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_crafting_grid.json index 4d8a692d6..c16b97ab5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_destructor.json index 071729d51..5227118a7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_detector.json index 3a7b78639..8cab3fb1b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_disk_interface.json index fb3a61b9a..95b484a9f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_exporter.json index 4a255bab4..43796a9ea 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_external_storage.json index 49a924928..34a655642 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_grid.json index 610baf8c0..7d5011598 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_importer.json index 13a4bc3da..86e4e49ea 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_receiver.json index 00638c4ac..149e495f0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_transmitter.json index 0ba8c5ccb..f691c712b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_relay.json index a59f37c02..f45e93526 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_security_manager.json index 509373708..1f44c5ff0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json index 0750362c6..03423f6c3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_blue_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_cable.json index f2a2ddc6a..0d2ae3acc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_constructor.json index b40e6a001..95e632cb8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_controller.json index 2a0344eb4..c8a6ae6d0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_crafting_grid.json index 1fc9ad612..9506f708b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_destructor.json index f2a798a2d..5802b49dd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_detector.json index 4d554feca..b39d6cf9f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_disk_interface.json index ab7a7dced..5b5391441 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_exporter.json index baa2b23aa..bb8b77c72 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_external_storage.json index 7b9b00cb3..89259016e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_grid.json index 8a5d3f4d4..0c5b98aaf 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_importer.json index 1229fb09e..b894c97a8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_receiver.json index edc0cafe1..27041877d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_transmitter.json index 81ee89e5f..18eba00c8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_relay.json index 83690021d..f838a20ba 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_security_manager.json index be6a18ddb..a97c2c689 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json index bf5c05053..866f6b0d0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/light_gray_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_cable.json index f036152b7..b36f1200d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_constructor.json index af59234ad..f04dd8e06 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_controller.json index 98a0b48c6..759cce2f4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_crafting_grid.json index e8d644c80..2f38abb49 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_destructor.json index 7000778a6..b263d9b09 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_detector.json index 059a9cec8..29e3772f1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_disk_interface.json index 2764afa20..0862348c4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_exporter.json index 3a080ef54..ed0d1fce6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_external_storage.json index 5251287c0..8f6a90bfd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_grid.json index 3b644ae8e..6d7934f1c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_importer.json index c18d8d042..32a9d974e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_receiver.json index 13226fa91..922f20e1c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_transmitter.json index 8186b4d10..bfa5e9530 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_relay.json index fb2918db3..9ee088762 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_security_manager.json index 727c71661..4839ab98a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_wireless_transmitter.json index 6268dc123..dafef7bab 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/lime_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_cable.json index fabef1c76..27e8ab7f6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_constructor.json index 1303f9eba..40106ad61 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_controller.json index 45b19c436..7384a9b78 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_crafting_grid.json index e553a097e..5e2ac7077 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_destructor.json index 1285cc6ce..f2fed5377 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_detector.json index 62d44798d..3380cd263 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_disk_interface.json index 119f28827..a8ca43d8f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_exporter.json index 400335a10..d81e1e842 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_external_storage.json index 19ffa164c..03452cd2b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_grid.json index a9e38b2d0..7a717dd89 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_importer.json index bf6e0a693..565d37f4a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_receiver.json index 186fdc0e1..a888735f0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_transmitter.json index 99be2e932..d31c07686 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_relay.json index 80665cba1..98ce17bfd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_security_manager.json index 4a1a0ae89..5e995a1c0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json index fea49c827..538a7f3f5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/magenta_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_cable.json index 0285255cb..b828e936c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_constructor.json index 32c8ad26c..d5421099e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_controller.json index 49c981231..45a04416f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_crafting_grid.json index e3539cf72..3f4adea8e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_destructor.json index f5f2a7aa2..0e8278b53 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_detector.json index 0e74d3dc6..352bed32a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_disk_interface.json index cf3152b32..292a7f033 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_exporter.json index b75722db9..d8480b016 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_external_storage.json index 231a43c1a..07f6171bf 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_grid.json index 851c33b29..ce7e23c70 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_importer.json index 7a61d79f6..c37a08599 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_receiver.json index b431a22cb..4acec5b00 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_transmitter.json index b5c9fee67..d9d4e6854 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_relay.json index 2e38b0954..2b37288ca 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_security_manager.json index f53c67264..cb361b1e7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_wireless_transmitter.json index cf0d51e26..84fae67ba 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/orange_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_cable.json index 075f77bf9..9b896d5d9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_constructor.json index 77a35f5e0..590235f5a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_controller.json index ddcf2b74b..dd6844a90 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_crafting_grid.json index 55eafcb5a..f789f3df2 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_destructor.json index c0d6b97e1..80d1e140b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_detector.json index bb09f83da..c5cb09fb0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_disk_interface.json index 390609317..bb6af5ac6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_exporter.json index 9b15831dc..5737ee7cf 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_external_storage.json index b8992ae5d..f7c193d0e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_grid.json index ba5e6b45c..57cf192eb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_importer.json index 7d6ae0423..b467bda6d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_receiver.json index 7f409edd2..110da26fc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_transmitter.json index 2a182295a..67c6b7c05 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_relay.json index bce19fbb8..59f925d4a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_security_manager.json index dc4adf64e..cebfd1411 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_wireless_transmitter.json index 74e50c3f3..94d9e6930 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/pink_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_cable.json index c3f5c4b7c..73948842b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_constructor.json index 6491e37b5..532a6a107 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_controller.json index 3b99479f9..5d749fce1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_crafting_grid.json index 6131d8467..fddbcf83b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_destructor.json index 1adb6c96a..3fcd7e7aa 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_detector.json index 9bef13044..a1a88d96d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_disk_interface.json index 9fe40f476..6b8c1c548 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_exporter.json index 97ed5f52b..d8c675f45 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_external_storage.json index 5129f4a43..52f3be2c5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_grid.json index 0daf73dc0..120a948c9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_importer.json index 32b71ef30..d31b9eec4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_receiver.json index 53cb7df95..624fbc222 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_transmitter.json index 9babbd664..74a3abcb7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_relay.json index 8defcc832..a6ea128cb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_security_manager.json index 8fb8d9831..28f07edc0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_wireless_transmitter.json index e82d0ed5d..72c8ca98a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/purple_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_cable.json index ebdc8bc40..c6bfbceda 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_constructor.json index 06d07941c..e29bb0e07 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_controller.json index dac1b12d5..a1ee215d4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_crafting_grid.json index 2de8f3d60..0f66ba87f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_destructor.json index 47d2b537c..83fbcbb36 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_detector.json index 88044470f..d4d2f421f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_disk_interface.json index f79298968..d3c68dbfe 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_exporter.json index b1bda95f9..62c4a3cc8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_external_storage.json index ca6b06064..d8b3da12a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_grid.json index 20c87df16..cafd73caa 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_importer.json index 34b68501b..ef6c08452 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_receiver.json index e19c1aca1..dab15f6a6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_transmitter.json index 04ca13c8a..05abb06a7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_relay.json index 850719359..22699a7ad 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_security_manager.json index 91eb31661..92f1a2643 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_wireless_transmitter.json index 01070f18d..8119ecad7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/red_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_cable.json index a7b1b118a..5c01b2dda 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_constructor.json index ed20df42f..9ac402a84 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_controller.json index 4801f1d09..5d9a2bf31 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_crafting_grid.json index 86d8d6d4f..aaf1827b8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_destructor.json index 1b16d153f..f8dd49d83 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_detector.json index cbcba7a1d..2f29558be 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_disk_interface.json index d4a3b8de3..596d4c3db 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_exporter.json index 44ced3052..edc903ed8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_external_storage.json index ef91d74df..be9bdd23d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_grid.json index 946abadf9..4752ba123 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_importer.json index 4c4b35fac..e96405e91 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_receiver.json index d1630ef19..c43a3c3ed 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_transmitter.json index 36b49b2ae..a5cd19a0e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_relay.json index 7260c1feb..08f44a42b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_security_manager.json index cb8ea3ca4..c74df0f1e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_wireless_transmitter.json index 0ae9fd1ec..a83b407a1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/white_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_cable.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_cable.json index f725523f7..8e1e26eb8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_cable.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_constructor.json index 93ddb72fa..7be5a92ba 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_constructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_controller.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_controller.json index dc7fc6e3f..e3989aa47 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_controller.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_crafting_grid.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_crafting_grid.json index 793f0105a..55878f9a0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_crafting_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_destructor.json index 0a1688f8e..271941d65 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_destructor.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_detector.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_detector.json index ea594146f..0c241b64d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_detector.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_disk_interface.json index bc490b195..787f2f838 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_disk_interface.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_exporter.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_exporter.json index 50b5808ed..96328752c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_exporter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_external_storage.json index fa82da1df..683e67880 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_external_storage.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_grid.json index e1ffee07d..70affa4f3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_grid.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_importer.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_importer.json index 38e632731..75ec200e6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_importer.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_receiver.json index 9ef41ddc1..cbb5a32be 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_receiver.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_transmitter.json index 503197c8b..b6dcf8edd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_transmitter.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_relay.json similarity index 92% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_relay.json index bd7759ea9..f9c2f6021 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_relay.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_security_manager.json similarity index 91% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_security_manager.json index 3a3b93a86..7fb7a521e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_security_manager.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json similarity index 90% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json index ced350d20..e76b3bafe 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancements/recipes/misc/coloring/yellow_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] }, diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/black_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/blue_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/brown_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/cyan_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/gray_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/green_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_blue_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_blue_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_blue_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/light_gray_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/lime_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/magenta_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/orange_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/pink_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/purple_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/red_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/white_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_cable.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_cable.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_constructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_constructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_crafting_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_crafting_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_creative_controller.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_creative_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_creative_controller.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_destructor.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_destructor.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_detector.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_detector.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_disk_interface.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_disk_interface.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_grid.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_receiver.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_receiver.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_relay.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_relay.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_security_manager.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_security_manager.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_wireless_transmitter.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_tables/blocks/yellow_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_wireless_transmitter.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json index e48698846..debc2df42 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_cable" + "count": 1, + "id": "refinedstorage2:black_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json index 8db2ec9f2..3719b7e52 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_constructor" + "count": 1, + "id": "refinedstorage2:black_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json index 0fcc17545..85e3a1837 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_controller" + "count": 1, + "id": "refinedstorage2:black_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json index 8f0faa890..5b283fdfc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_crafting_grid" + "count": 1, + "id": "refinedstorage2:black_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json index 68e7beb72..c2ba2f622 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_destructor" + "count": 1, + "id": "refinedstorage2:black_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json index a4e53da1c..4d6daa81a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_detector" + "count": 1, + "id": "refinedstorage2:black_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json index 8899166f8..5100d0bd4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_disk_interface" + "count": 1, + "id": "refinedstorage2:black_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json index 4dabece75..dc9924a00 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_exporter" + "count": 1, + "id": "refinedstorage2:black_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json index 693847b54..967be6d4f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_external_storage" + "count": 1, + "id": "refinedstorage2:black_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json index 0b2b67ff7..6c3045d1c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_grid" + "count": 1, + "id": "refinedstorage2:black_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json index 178d2dede..1f790c440 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_importer" + "count": 1, + "id": "refinedstorage2:black_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json index 10adc17ab..e0db45771 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_network_receiver" + "count": 1, + "id": "refinedstorage2:black_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json index 36b859db6..e2420a424 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_network_transmitter" + "count": 1, + "id": "refinedstorage2:black_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json index 37ad99430..f643ad840 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_relay" + "count": 1, + "id": "refinedstorage2:black_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json index 82f2b3780..a63defcdd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_security_manager" + "count": 1, + "id": "refinedstorage2:black_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json index 1b63b86cb..4a53eb0b4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/black_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:black_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:black_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json index 5bcd5edfd..cad915b22 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_cable" + "count": 1, + "id": "refinedstorage2:blue_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json index d74858a46..9c6961cc3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_constructor" + "count": 1, + "id": "refinedstorage2:blue_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json index f04481333..1ef6c3497 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_controller" + "count": 1, + "id": "refinedstorage2:blue_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json index ae7919c39..e38c5b73c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_crafting_grid" + "count": 1, + "id": "refinedstorage2:blue_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json index 9b604005d..00494d4f5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_destructor" + "count": 1, + "id": "refinedstorage2:blue_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json index 2761aaacc..1451a8c5d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_detector" + "count": 1, + "id": "refinedstorage2:blue_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json index 8fcd8ee90..75eae19c0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_disk_interface" + "count": 1, + "id": "refinedstorage2:blue_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json index f513359fc..af84484fa 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_exporter" + "count": 1, + "id": "refinedstorage2:blue_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json index 38b289401..5da2f6a0a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_external_storage" + "count": 1, + "id": "refinedstorage2:blue_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json index 57b56e809..2076c0799 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_grid" + "count": 1, + "id": "refinedstorage2:blue_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json index 91fe8860b..1e4656b26 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_importer" + "count": 1, + "id": "refinedstorage2:blue_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json index 2cf78ae46..375ded113 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_network_receiver" + "count": 1, + "id": "refinedstorage2:blue_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json index a4e2bd0a0..db0de7a2b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_network_transmitter" + "count": 1, + "id": "refinedstorage2:blue_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json index 2c4374cd8..66272954a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_relay" + "count": 1, + "id": "refinedstorage2:blue_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json index c5416e72f..3bb08baf4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_security_manager" + "count": 1, + "id": "refinedstorage2:blue_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json index 50622ac43..c6cd74473 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/blue_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:blue_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:blue_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json index 0d0cb079d..cc3b0bbd1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_cable" + "count": 1, + "id": "refinedstorage2:brown_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json index 1efe766f7..08c3a7a40 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_constructor" + "count": 1, + "id": "refinedstorage2:brown_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json index 7e7a52ea4..5a39d4537 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_controller" + "count": 1, + "id": "refinedstorage2:brown_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json index 0d5932e6f..f73036219 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_crafting_grid" + "count": 1, + "id": "refinedstorage2:brown_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json index ccd541f71..2b3ac8808 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_destructor" + "count": 1, + "id": "refinedstorage2:brown_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json index fd2f645eb..7b9cfc921 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_detector" + "count": 1, + "id": "refinedstorage2:brown_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json index 2137c39b4..33a0641cd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_disk_interface" + "count": 1, + "id": "refinedstorage2:brown_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json index de1579903..cde41172a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_exporter" + "count": 1, + "id": "refinedstorage2:brown_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json index 70ccb21dc..be411530b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_external_storage" + "count": 1, + "id": "refinedstorage2:brown_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json index b4de570d8..a2814ed09 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_grid" + "count": 1, + "id": "refinedstorage2:brown_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json index be54438e7..96f172768 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_importer" + "count": 1, + "id": "refinedstorage2:brown_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json index 8f315166a..4f39a2970 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_network_receiver" + "count": 1, + "id": "refinedstorage2:brown_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json index e7c68912d..e8c807129 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_network_transmitter" + "count": 1, + "id": "refinedstorage2:brown_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json index 49c08e3ae..eeb0f5ee0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_relay" + "count": 1, + "id": "refinedstorage2:brown_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json index 287036f5a..219f7a4cd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_security_manager" + "count": 1, + "id": "refinedstorage2:brown_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json index 1766affaa..f4601cd51 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/brown_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:brown_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:brown_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json index ecb8aabd6..becb2d0f9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_cable" + "count": 1, + "id": "refinedstorage2:cyan_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json index 07e766830..7d0896f2d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_constructor" + "count": 1, + "id": "refinedstorage2:cyan_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json index d207650b9..b18c29934 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_controller" + "count": 1, + "id": "refinedstorage2:cyan_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json index 7b47fd448..3cf596d12 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_crafting_grid" + "count": 1, + "id": "refinedstorage2:cyan_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json index f83b93ffe..2b9cae809 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_destructor" + "count": 1, + "id": "refinedstorage2:cyan_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json index 152ce8f36..30349d1dd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_detector" + "count": 1, + "id": "refinedstorage2:cyan_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json index addc70460..a814de3a0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_disk_interface" + "count": 1, + "id": "refinedstorage2:cyan_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json index cc6267745..1593d8cd3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_exporter" + "count": 1, + "id": "refinedstorage2:cyan_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json index 6fc9c019d..e1c1c22ce 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_external_storage" + "count": 1, + "id": "refinedstorage2:cyan_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json index 17f543c3b..800cbf692 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_grid" + "count": 1, + "id": "refinedstorage2:cyan_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json index 1c2a2c3f7..3ba0319e7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_importer" + "count": 1, + "id": "refinedstorage2:cyan_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json index 1740e8a1b..f03b423d0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_network_receiver" + "count": 1, + "id": "refinedstorage2:cyan_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json index f84a9cfba..5da50b678 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_network_transmitter" + "count": 1, + "id": "refinedstorage2:cyan_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json index 5e680e821..1e60588ac 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_relay" + "count": 1, + "id": "refinedstorage2:cyan_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json index 8f3dd7cc5..c8a809c6f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_security_manager" + "count": 1, + "id": "refinedstorage2:cyan_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json index 23b00b985..a1c5240be 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/cyan_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cyan_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:cyan_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json similarity index 80% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json index af661b33f..b6a840240 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:cable" + "count": 1, + "id": "refinedstorage2:cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json index ddb5a782a..a1ef435fb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:constructor" + "count": 1, + "id": "refinedstorage2:constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json index 57ec1f243..dc3255814 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_controller" + "count": 1, + "id": "refinedstorage2:gray_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json index d2ff4f253..728e1ce4c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_crafting_grid" + "count": 1, + "id": "refinedstorage2:gray_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json index 1307e58d2..323148a5f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:destructor" + "count": 1, + "id": "refinedstorage2:destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json index e7add5891..edb298397 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_detector" + "count": 1, + "id": "refinedstorage2:gray_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json index 8deecdabf..d71c83ac4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_disk_interface" + "count": 1, + "id": "refinedstorage2:gray_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json index 7c3c58c2a..541aa2c0f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:exporter" + "count": 1, + "id": "refinedstorage2:exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json index 4b026875a..880c0c76e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:external_storage" + "count": 1, + "id": "refinedstorage2:external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json index 0c35ce3d6..0beabdc7a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_grid" + "count": 1, + "id": "refinedstorage2:gray_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json index 312555d44..9c8f1effb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:importer" + "count": 1, + "id": "refinedstorage2:importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json index d81adf188..ea58cb43c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_network_receiver" + "count": 1, + "id": "refinedstorage2:gray_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json index 70a07df91..c19d4aaec 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_network_transmitter" + "count": 1, + "id": "refinedstorage2:gray_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json index c6676fcbf..458fb3b20 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_relay" + "count": 1, + "id": "refinedstorage2:gray_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json index f5926ad95..c017fb0a0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_security_manager" + "count": 1, + "id": "refinedstorage2:gray_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json index bbf671537..5721dbc0c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/gray_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:gray_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:gray_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json index bb2dd7ca8..7e92262ed 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_cable" + "count": 1, + "id": "refinedstorage2:green_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json index 73dfc7a8a..9c75aed07 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_constructor" + "count": 1, + "id": "refinedstorage2:green_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json index f70633d98..2a17c68e3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_controller" + "count": 1, + "id": "refinedstorage2:green_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json index bc294023e..6ad997e96 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_crafting_grid" + "count": 1, + "id": "refinedstorage2:green_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json index a8ae00284..e9163f9a3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_destructor" + "count": 1, + "id": "refinedstorage2:green_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json index f5cd236a8..347a76744 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_detector" + "count": 1, + "id": "refinedstorage2:green_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json index 9b74acbb7..ecb2bb6ce 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_disk_interface" + "count": 1, + "id": "refinedstorage2:green_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json index f44fe822f..22e9fdbdf 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_exporter" + "count": 1, + "id": "refinedstorage2:green_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json index 98432deaa..39143546b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_external_storage" + "count": 1, + "id": "refinedstorage2:green_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json index 33dab8e26..2e96f705d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_grid" + "count": 1, + "id": "refinedstorage2:green_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json index e8954da13..89391617c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_importer" + "count": 1, + "id": "refinedstorage2:green_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json index 17bebbdbc..d9f4cce95 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_network_receiver" + "count": 1, + "id": "refinedstorage2:green_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json index df1b74eb0..2fbac9138 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_network_transmitter" + "count": 1, + "id": "refinedstorage2:green_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json index da3689085..b1889301c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_relay" + "count": 1, + "id": "refinedstorage2:green_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json index 5e9f5db34..394b6d4b8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_security_manager" + "count": 1, + "id": "refinedstorage2:green_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json index 3424885f4..1bd8abe1e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/green_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:green_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:green_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json index b048178e6..63d51c903 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_blue_cable" + "count": 1, + "id": "refinedstorage2:light_blue_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json index a2626d698..5281c40c1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_blue_constructor" + "count": 1, + "id": "refinedstorage2:light_blue_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json index 4d427d798..57886944c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:controller" + "count": 1, + "id": "refinedstorage2:controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json index 160f490e1..8c2d9cbdc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:crafting_grid" + "count": 1, + "id": "refinedstorage2:crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json index a4225d775..89de9a4ca 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_blue_destructor" + "count": 1, + "id": "refinedstorage2:light_blue_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json similarity index 80% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json index d0ed985b1..8485463d8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:detector" + "count": 1, + "id": "refinedstorage2:detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json index 89ea9102b..a6ba20645 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:disk_interface" + "count": 1, + "id": "refinedstorage2:disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json index 6eeb49cb3..758408a81 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_blue_exporter" + "count": 1, + "id": "refinedstorage2:light_blue_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json index d96e0cf51..2fde5246b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_blue_external_storage" + "count": 1, + "id": "refinedstorage2:light_blue_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json similarity index 81% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json index b07a63f31..a82c84a29 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:grid" + "count": 1, + "id": "refinedstorage2:grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json index 1f0939a9e..7171cb87f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_blue_importer" + "count": 1, + "id": "refinedstorage2:light_blue_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json index 76b5e6fc4..dd30e6c77 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:network_receiver" + "count": 1, + "id": "refinedstorage2:network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json index b1479d3a7..2981dfbf1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:network_transmitter" + "count": 1, + "id": "refinedstorage2:network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json similarity index 80% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json index 37fb39142..8fea0cc22 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:relay" + "count": 1, + "id": "refinedstorage2:relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json index d9026e427..756cd8e90 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:security_manager" + "count": 1, + "id": "refinedstorage2:security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json index 079c8c7c6..9be26bf2a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_blue_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:wireless_transmitter" + "count": 1, + "id": "refinedstorage2:wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json index 5f8541b89..a44074eab 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_cable" + "count": 1, + "id": "refinedstorage2:light_gray_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json index 05cfc96cc..8f174256d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_constructor" + "count": 1, + "id": "refinedstorage2:light_gray_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json index 5b526647c..9836d6e50 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_controller" + "count": 1, + "id": "refinedstorage2:light_gray_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json index 808f17577..d5cf86ce5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_crafting_grid" + "count": 1, + "id": "refinedstorage2:light_gray_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json index 25a8906d0..e71d00cc3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_destructor" + "count": 1, + "id": "refinedstorage2:light_gray_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json index 4a633b213..bd0cd7dfb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_detector" + "count": 1, + "id": "refinedstorage2:light_gray_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json index 326986dc8..db53c5d81 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_disk_interface" + "count": 1, + "id": "refinedstorage2:light_gray_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json index 5abe2413c..2da35dc8d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_exporter" + "count": 1, + "id": "refinedstorage2:light_gray_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json index 286e45aad..8c2e70b04 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_external_storage" + "count": 1, + "id": "refinedstorage2:light_gray_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json index eacbfd4e1..d029f7b20 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_grid" + "count": 1, + "id": "refinedstorage2:light_gray_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json index 8588b5e6b..5fd210c8c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_importer" + "count": 1, + "id": "refinedstorage2:light_gray_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json index 0e08e1676..925ecbd89 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_network_receiver" + "count": 1, + "id": "refinedstorage2:light_gray_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json index f47ee6865..f7892de62 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_network_transmitter" + "count": 1, + "id": "refinedstorage2:light_gray_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json index 108d49c9f..6656c82eb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_relay" + "count": 1, + "id": "refinedstorage2:light_gray_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json index 8d044e90f..1ba063e22 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_security_manager" + "count": 1, + "id": "refinedstorage2:light_gray_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json index 842a8f574..ec11cdb61 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/light_gray_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:light_gray_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:light_gray_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json index 63c4ac175..f128fe7e8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_cable" + "count": 1, + "id": "refinedstorage2:lime_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json index c247576c8..e935ea868 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_constructor" + "count": 1, + "id": "refinedstorage2:lime_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json index b47f8ca07..76550f2de 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_controller" + "count": 1, + "id": "refinedstorage2:lime_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json index 9f37720a0..19602be94 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_crafting_grid" + "count": 1, + "id": "refinedstorage2:lime_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json index ad595c899..43536e5f5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_destructor" + "count": 1, + "id": "refinedstorage2:lime_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json index 70971a140..c7b1321c7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_detector" + "count": 1, + "id": "refinedstorage2:lime_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json index 9c5e02f19..af1d95983 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_disk_interface" + "count": 1, + "id": "refinedstorage2:lime_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json index 091aa3b64..8959d5d8c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_exporter" + "count": 1, + "id": "refinedstorage2:lime_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json index 9c5dabe2d..2ac30b7ce 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_external_storage" + "count": 1, + "id": "refinedstorage2:lime_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json index 0df5d9e80..709e73500 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_grid" + "count": 1, + "id": "refinedstorage2:lime_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json index 041a38299..302330b5e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_importer" + "count": 1, + "id": "refinedstorage2:lime_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json index cc0ae467a..a254ce162 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_network_receiver" + "count": 1, + "id": "refinedstorage2:lime_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json index 695ac7837..3a5bb7601 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_network_transmitter" + "count": 1, + "id": "refinedstorage2:lime_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json index f327a70cd..513f8abb3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_relay" + "count": 1, + "id": "refinedstorage2:lime_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json index b66210948..6cfc79411 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_security_manager" + "count": 1, + "id": "refinedstorage2:lime_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json index 433477fa0..42baf0e99 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/lime_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:lime_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:lime_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json index 4ba9ed0ee..a88690261 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_cable" + "count": 1, + "id": "refinedstorage2:magenta_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json index b30857c8b..3e5a1f16f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_constructor" + "count": 1, + "id": "refinedstorage2:magenta_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json index 3ef95812c..0069aea35 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_controller" + "count": 1, + "id": "refinedstorage2:magenta_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json index 5392adec5..53fafb8f3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_crafting_grid" + "count": 1, + "id": "refinedstorage2:magenta_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json index 18c6e5319..9237499b0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_destructor" + "count": 1, + "id": "refinedstorage2:magenta_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json index 48b471405..f1cf2d692 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_detector" + "count": 1, + "id": "refinedstorage2:magenta_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json index ecc5b7197..52d78334c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_disk_interface" + "count": 1, + "id": "refinedstorage2:magenta_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json index 82675308a..36a901e09 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_exporter" + "count": 1, + "id": "refinedstorage2:magenta_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json index bf9112a71..2790f4b12 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_external_storage" + "count": 1, + "id": "refinedstorage2:magenta_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json index dc14e9fd9..150e3b9cd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_grid" + "count": 1, + "id": "refinedstorage2:magenta_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json index 5ef7d1cbe..3194f4e55 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_importer" + "count": 1, + "id": "refinedstorage2:magenta_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json index 3a51f49ad..c37424607 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_network_receiver" + "count": 1, + "id": "refinedstorage2:magenta_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json index 83e87448e..fcb235352 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_network_transmitter" + "count": 1, + "id": "refinedstorage2:magenta_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json index b20acee6f..e3ff2ff05 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_relay" + "count": 1, + "id": "refinedstorage2:magenta_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json index 29a1ef8de..a75604191 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_security_manager" + "count": 1, + "id": "refinedstorage2:magenta_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json index ac923b7ab..f0cdd7cdc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/magenta_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:magenta_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:magenta_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json index 58743ab2c..ba3f2662b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_cable" + "count": 1, + "id": "refinedstorage2:orange_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json index d3ea00e8d..a45f61fc2 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_constructor" + "count": 1, + "id": "refinedstorage2:orange_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json index a49f4d0a0..26e0c3af1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_controller" + "count": 1, + "id": "refinedstorage2:orange_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json index 1701ad6b1..d1676f5d1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_crafting_grid" + "count": 1, + "id": "refinedstorage2:orange_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json index beeed7aa7..9131135f6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_destructor" + "count": 1, + "id": "refinedstorage2:orange_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json index 15a279eea..7e914e39c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_detector" + "count": 1, + "id": "refinedstorage2:orange_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json index b9a234195..afe8f7eb2 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_disk_interface" + "count": 1, + "id": "refinedstorage2:orange_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json index 58644dbbd..a710e27d8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_exporter" + "count": 1, + "id": "refinedstorage2:orange_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json index bf39d933c..e3d617223 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_external_storage" + "count": 1, + "id": "refinedstorage2:orange_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json index ed4db5c58..baed3c065 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_grid" + "count": 1, + "id": "refinedstorage2:orange_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json index 31a19d0d1..f961bcef6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_importer" + "count": 1, + "id": "refinedstorage2:orange_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json index 7f5f93995..d2160a4a3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_network_receiver" + "count": 1, + "id": "refinedstorage2:orange_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json index 2a883881c..1c13bc247 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_network_transmitter" + "count": 1, + "id": "refinedstorage2:orange_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json index 383053a5b..27dcb242a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_relay" + "count": 1, + "id": "refinedstorage2:orange_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json index 1d1d32708..82e953060 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_security_manager" + "count": 1, + "id": "refinedstorage2:orange_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json index bf313bc0a..847b99400 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/orange_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:orange_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:orange_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json index 66b092220..6125d7f16 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_cable" + "count": 1, + "id": "refinedstorage2:pink_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json index fd11b2c52..1832b4279 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_constructor" + "count": 1, + "id": "refinedstorage2:pink_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json index 621994d06..898edec5c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_controller" + "count": 1, + "id": "refinedstorage2:pink_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json index 973fb1627..bd8ec135c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_crafting_grid" + "count": 1, + "id": "refinedstorage2:pink_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json index d5c5e50db..f65615431 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_destructor" + "count": 1, + "id": "refinedstorage2:pink_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json index b7604037c..ad7314bec 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_detector" + "count": 1, + "id": "refinedstorage2:pink_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json index 7f35efabf..deba0cd09 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_disk_interface" + "count": 1, + "id": "refinedstorage2:pink_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json index 3f1bf0a89..8c6f003eb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_exporter" + "count": 1, + "id": "refinedstorage2:pink_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json index 9374906ca..c2b362925 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_external_storage" + "count": 1, + "id": "refinedstorage2:pink_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json index f3023407b..3cd54a98e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_grid" + "count": 1, + "id": "refinedstorage2:pink_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json index b71de635b..e267982f1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_importer" + "count": 1, + "id": "refinedstorage2:pink_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json index 8108f41b8..935162fa3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_network_receiver" + "count": 1, + "id": "refinedstorage2:pink_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json index 45cca06c1..7b5b3ab2f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_network_transmitter" + "count": 1, + "id": "refinedstorage2:pink_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json index 46eacad2d..c30fa6ccb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_relay" + "count": 1, + "id": "refinedstorage2:pink_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json index 0730360e5..802f8f711 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_security_manager" + "count": 1, + "id": "refinedstorage2:pink_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json index 1cadb50c8..b47b60bed 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/pink_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:pink_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:pink_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json index 686b58e42..6902a76dc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_cable" + "count": 1, + "id": "refinedstorage2:purple_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json index 048217a80..8be003cb6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_constructor" + "count": 1, + "id": "refinedstorage2:purple_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json index ff5078bc6..725fb84a7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_controller" + "count": 1, + "id": "refinedstorage2:purple_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json index 582b8e657..1b20618ea 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_crafting_grid" + "count": 1, + "id": "refinedstorage2:purple_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json index e44e9d9d9..7a8271d38 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_destructor" + "count": 1, + "id": "refinedstorage2:purple_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json index 232c58672..5a5b4809f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_detector" + "count": 1, + "id": "refinedstorage2:purple_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json index 871acd659..990eae42f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_disk_interface" + "count": 1, + "id": "refinedstorage2:purple_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json index e604423dd..41b8b407b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_exporter" + "count": 1, + "id": "refinedstorage2:purple_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json index a66f6b08c..b2b68d492 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_external_storage" + "count": 1, + "id": "refinedstorage2:purple_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json index 2e5a4123f..da0703769 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_grid" + "count": 1, + "id": "refinedstorage2:purple_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json index 445ef41d8..3e437907b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_importer" + "count": 1, + "id": "refinedstorage2:purple_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json index e62460fb2..22a889f04 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_network_receiver" + "count": 1, + "id": "refinedstorage2:purple_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json index 936c7bb9a..1c8978139 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_network_transmitter" + "count": 1, + "id": "refinedstorage2:purple_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json index b069db8ad..602b86204 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_relay" + "count": 1, + "id": "refinedstorage2:purple_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json index 014bf959a..ddbf99df3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_security_manager" + "count": 1, + "id": "refinedstorage2:purple_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json index 3988644af..a2ddf6b85 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/purple_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:purple_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:purple_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json index f5c4dba6b..10348f9c5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_cable" + "count": 1, + "id": "refinedstorage2:red_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json index 320c72120..e304c5334 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_constructor" + "count": 1, + "id": "refinedstorage2:red_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json index c45328352..9054c8584 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_controller" + "count": 1, + "id": "refinedstorage2:red_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json index 86bcd269f..3d64b32ad 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_crafting_grid" + "count": 1, + "id": "refinedstorage2:red_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json index c696d0362..cae7b16b9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_destructor" + "count": 1, + "id": "refinedstorage2:red_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json index 9ff1ac242..8c375bc69 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_detector" + "count": 1, + "id": "refinedstorage2:red_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json index db3119371..d420da852 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_disk_interface" + "count": 1, + "id": "refinedstorage2:red_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json index ec0055d3f..1b8f2acba 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_exporter" + "count": 1, + "id": "refinedstorage2:red_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json index fcfed520b..e7d51a577 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_external_storage" + "count": 1, + "id": "refinedstorage2:red_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json index cca9f3a58..5f9dec672 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_grid" + "count": 1, + "id": "refinedstorage2:red_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json index 62cb81780..cbd7b4e82 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_importer" + "count": 1, + "id": "refinedstorage2:red_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json index 9648c407a..b5de717f3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_network_receiver" + "count": 1, + "id": "refinedstorage2:red_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json index c0640bffb..0759f926b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_network_transmitter" + "count": 1, + "id": "refinedstorage2:red_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json index 8f04b7e21..94403f52b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_relay" + "count": 1, + "id": "refinedstorage2:red_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json index 5183299ab..d5ad1443b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_security_manager" + "count": 1, + "id": "refinedstorage2:red_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json index 97575a878..a2abdf06a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/red_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:red_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:red_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json index 391ef5069..3f58a1530 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_cable" + "count": 1, + "id": "refinedstorage2:white_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json index 9962380f6..4492c9cc4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_constructor" + "count": 1, + "id": "refinedstorage2:white_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json index 31286ec3d..a8a708824 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_controller" + "count": 1, + "id": "refinedstorage2:white_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json index 39ab72213..7176b64d4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_crafting_grid" + "count": 1, + "id": "refinedstorage2:white_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json index bd9cd406b..d7ab63ab9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_destructor" + "count": 1, + "id": "refinedstorage2:white_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json index 56e8cece0..41ef43891 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_detector" + "count": 1, + "id": "refinedstorage2:white_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json index 1e8012e2f..952443656 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_disk_interface" + "count": 1, + "id": "refinedstorage2:white_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json index 1a88c2bee..f8a9ee929 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_exporter" + "count": 1, + "id": "refinedstorage2:white_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json index 96e00eb2e..1e85f0544 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_external_storage" + "count": 1, + "id": "refinedstorage2:white_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json similarity index 79% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json index 1ccc44f9d..5c844c592 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_grid" + "count": 1, + "id": "refinedstorage2:white_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json index 15c6abdd6..d30d2c9a3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_importer" + "count": 1, + "id": "refinedstorage2:white_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json index c8250b9ae..74495545d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_network_receiver" + "count": 1, + "id": "refinedstorage2:white_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json index c793b5352..c89918fd9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_network_transmitter" + "count": 1, + "id": "refinedstorage2:white_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json index d58f4f5ed..b33a77203 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_relay" + "count": 1, + "id": "refinedstorage2:white_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json index c84fd7abc..128eedae6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_security_manager" + "count": 1, + "id": "refinedstorage2:white_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json index 72ec2e841..55eedeaee 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/white_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:white_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:white_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_cable.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json index b06496b40..8d18120c5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_cable" + "count": 1, + "id": "refinedstorage2:yellow_cable" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_constructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json index e79a9b969..a8e9ab438 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_constructor" + "count": 1, + "id": "refinedstorage2:yellow_constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_controller.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json index a3e4dfd95..6cc0cc417 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_controller" + "count": 1, + "id": "refinedstorage2:yellow_controller" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_crafting_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json index 001f372ca..629286c35 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_crafting_grid" + "count": 1, + "id": "refinedstorage2:yellow_crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_destructor.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json index 89577b02a..8f7bdcb54 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_destructor" + "count": 1, + "id": "refinedstorage2:yellow_destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_detector.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json index d4f652b5e..542d1ebb1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_detector" + "count": 1, + "id": "refinedstorage2:yellow_detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_disk_interface.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json index a65a2a5e1..44e7e1c7a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_disk_interface" + "count": 1, + "id": "refinedstorage2:yellow_disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_exporter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json index 63fce49cb..335b86a12 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_exporter" + "count": 1, + "id": "refinedstorage2:yellow_exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_external_storage.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json index bdc510acc..384a7d77d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_external_storage" + "count": 1, + "id": "refinedstorage2:yellow_external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_grid.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json index 1fbd7fb19..954976753 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_grid" + "count": 1, + "id": "refinedstorage2:yellow_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json similarity index 77% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_importer.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json index 686a65d37..f6e0f055f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_importer" + "count": 1, + "id": "refinedstorage2:yellow_importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_network_receiver.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json index 1c9a4ce3e..5fb8b5e35 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_network_receiver" + "count": 1, + "id": "refinedstorage2:yellow_network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_network_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json index 6b0da48b5..55b07054a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_network_transmitter" + "count": 1, + "id": "refinedstorage2:yellow_network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json similarity index 78% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_relay.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json index d2c04d4b0..1af3c9fbc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_relay" + "count": 1, + "id": "refinedstorage2:yellow_relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json similarity index 76% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_security_manager.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json index c6a01a55f..11488de4b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_security_manager" + "count": 1, + "id": "refinedstorage2:yellow_security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json similarity index 75% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_wireless_transmitter.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json index f3b6744ca..0c0aee654 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipes/coloring/yellow_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json @@ -10,6 +10,7 @@ } ], "result": { - "item": "refinedstorage2:yellow_wireless_transmitter" + "count": 1, + "id": "refinedstorage2:yellow_wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/cables.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/cables.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/cables.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/cables.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/constructors.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/constructors.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/constructors.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/constructors.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/controllers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/controllers.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/controllers.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/controllers.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/crafting_grids.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/crafting_grids.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/crafting_grids.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/crafting_grids.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/creative_controllers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/creative_controllers.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/creative_controllers.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/creative_controllers.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/destructors.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/destructors.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/destructors.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/destructors.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/detectors.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/detectors.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/detectors.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/detectors.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/disk_interfaces.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/disk_interfaces.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/disk_interfaces.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/disk_interfaces.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/exporters.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/exporters.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/exporters.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/exporters.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/external_storages.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/external_storages.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/external_storages.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/external_storages.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/fluid_storage_disks.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/fluid_storage_disks.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/fluid_storage_disks.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/fluid_storage_disks.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/grids.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/grids.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/grids.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/grids.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/importers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/importers.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/importers.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/importers.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/network_receivers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_receivers.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/network_receivers.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_receivers.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/network_transmitters.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_transmitters.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/network_transmitters.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_transmitters.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/relays.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/relays.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/relays.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/relays.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/security_managers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/security_managers.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/security_managers.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/security_managers.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/storage_disks.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/storage_disks.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/storage_disks.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/storage_disks.json diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/wireless_transmitters.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/wireless_transmitters.json similarity index 100% rename from refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/items/wireless_transmitters.json rename to refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/wireless_transmitters.json diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java index 8ea62326c..9b8a74e48 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java @@ -13,6 +13,7 @@ import com.refinedmods.refinedstorage2.platform.api.security.PlatformSecurityNetworkComponent; import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; import com.refinedmods.refinedstorage2.platform.common.configurationcard.ConfigurationCardItem; +import com.refinedmods.refinedstorage2.platform.common.configurationcard.ConfigurationCardState; import com.refinedmods.refinedstorage2.platform.common.constructordestructor.BlockBreakDestructorStrategyFactory; import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorBlockEntity; import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorContainerMenu; @@ -28,6 +29,8 @@ import com.refinedmods.refinedstorage2.platform.common.content.BlockEntityTypeFactory; import com.refinedmods.refinedstorage2.platform.common.content.Blocks; import com.refinedmods.refinedstorage2.platform.common.content.ContentIds; +import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage2.platform.common.content.ExtendedMenuTypeFactory; import com.refinedmods.refinedstorage2.platform.common.content.Items; import com.refinedmods.refinedstorage2.platform.common.content.LootFunctions; import com.refinedmods.refinedstorage2.platform.common.content.MenuTypeFactory; @@ -36,6 +39,7 @@ import com.refinedmods.refinedstorage2.platform.common.content.Sounds; import com.refinedmods.refinedstorage2.platform.common.controller.ControllerBlockEntity; import com.refinedmods.refinedstorage2.platform.common.controller.ControllerContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.controller.ControllerData; import com.refinedmods.refinedstorage2.platform.common.controller.ControllerType; import com.refinedmods.refinedstorage2.platform.common.detector.DetectorBlockEntity; import com.refinedmods.refinedstorage2.platform.common.detector.DetectorContainerMenu; @@ -45,10 +49,14 @@ import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; import com.refinedmods.refinedstorage2.platform.common.grid.GridBlockEntity; import com.refinedmods.refinedstorage2.platform.common.grid.GridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.grid.GridData; +import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridData; import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceBlock; import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceBlockEntity; import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceData; import com.refinedmods.refinedstorage2.platform.common.importer.ImporterBlockEntity; import com.refinedmods.refinedstorage2.platform.common.importer.ImporterContainerMenu; import com.refinedmods.refinedstorage2.platform.common.misc.ProcessorItem; @@ -57,12 +65,17 @@ import com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverBlockEntity; import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterBlockEntity; import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterData; import com.refinedmods.refinedstorage2.platform.common.networking.RelayBlockEntity; import com.refinedmods.refinedstorage2.platform.common.networking.RelayContainerMenu; import com.refinedmods.refinedstorage2.platform.common.security.BuiltinPermission; import com.refinedmods.refinedstorage2.platform.common.security.FallbackSecurityCardContainerMenu; import com.refinedmods.refinedstorage2.platform.common.security.PlatformSecurityNetworkComponentImpl; +import com.refinedmods.refinedstorage2.platform.common.security.PlayerBoundSecurityCardData; +import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardBoundPlayer; import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardData; +import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardPermissions; import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerBlockEntity; import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerContainerMenu; import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; @@ -89,6 +102,7 @@ import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockBlockEntity; import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockBlockItem; import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.StorageBlockData; import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.StorageBlockLootItemFunction; import com.refinedmods.refinedstorage2.platform.common.storage.storagedisk.FluidStorageDiskItem; import com.refinedmods.refinedstorage2.platform.common.storage.storagedisk.ItemStorageDiskItem; @@ -100,18 +114,20 @@ import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntity; import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorContainerMenu; import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; import com.refinedmods.refinedstorage2.platform.common.support.SimpleBlock; import com.refinedmods.refinedstorage2.platform.common.support.SimpleItem; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyLootItemFunction; import com.refinedmods.refinedstorage2.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.InventorySlotReferenceFactory; import com.refinedmods.refinedstorage2.platform.common.support.network.component.PlatformStorageNetworkComponent; import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceFactory; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; import com.refinedmods.refinedstorage2.platform.common.upgrade.FortuneUpgradeItem; import com.refinedmods.refinedstorage2.platform.common.upgrade.RangeUpgradeItem; import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeState; import com.refinedmods.refinedstorage2.platform.common.upgrade.SimpleUpgradeItem; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeWithEnchantedBookRecipeSerializer; @@ -120,13 +136,20 @@ import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.RangeUpgradeWirelessTransmitterRangeModifier; import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterBlockEntity; import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterData; import java.util.Optional; +import java.util.UUID; import java.util.function.BiFunction; import java.util.function.Supplier; import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; +import net.minecraft.core.GlobalPos; +import net.minecraft.core.UUIDUtil; +import net.minecraft.core.component.DataComponentType; +import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.Item; @@ -200,7 +223,7 @@ protected final void initializePlatformApi() { registerNetworkComponents(); registerWirelessTransmitterRangeModifiers(); registerPermissions(); - registerSlotReferenceProvider(); + registerInventorySlotReference(); } private void registerStorageTypes() { @@ -380,7 +403,7 @@ private void registerSimpleItems(final RegistryCallback callback) { Items.INSTANCE.setWrench(callback.register(WRENCH, WrenchItem::new)); Items.INSTANCE.setStorageHousing(callback.register(STORAGE_HOUSING, SimpleItem::new)); callback.register(MACHINE_CASING, () -> new BaseBlockItem(Blocks.INSTANCE.getMachineCasing())); - callback.register(STORAGE_MONITOR, () -> new NetworkNodeBlockItem(Blocks.INSTANCE.getStorageMonitor())); + callback.register(STORAGE_MONITOR, () -> Blocks.INSTANCE.getStorageMonitor().createBlockItem()); callback.register(INTERFACE, () -> Blocks.INSTANCE.getInterface().createBlockItem()); Items.INSTANCE.setConstructionCore(callback.register(CONSTRUCTION_CORE, SimpleItem::new)); Items.INSTANCE.setDestructionCore(callback.register(DESTRUCTION_CORE, SimpleItem::new)); @@ -450,20 +473,12 @@ private void registerUpgrades(final RegistryCallback callback) { )); final Supplier speedUpgrade = callback.register( ContentIds.SPEED_UPGRADE, - () -> new SimpleUpgradeItem( - PlatformApi.INSTANCE.getUpgradeRegistry(), - Platform.INSTANCE.getConfig().getUpgrade()::getSpeedUpgradeEnergyUsage, - false - ) + SimpleUpgradeItem::speedUpgrade ); Items.INSTANCE.setSpeedUpgrade(speedUpgrade); final Supplier stackUpgrade = callback.register( ContentIds.STACK_UPGRADE, - () -> new SimpleUpgradeItem( - PlatformApi.INSTANCE.getUpgradeRegistry(), - Platform.INSTANCE.getConfig().getUpgrade()::getStackUpgradeEnergyUsage, - false - ) + SimpleUpgradeItem::stackUpgrade ); Items.INSTANCE.setStackUpgrade(stackUpgrade); final Supplier fortune1Upgrade = callback.register( @@ -483,11 +498,7 @@ private void registerUpgrades(final RegistryCallback callback) { Items.INSTANCE.setFortune3Upgrade(fortune3Upgrade); final Supplier silkTouchUpgrade = callback.register( ContentIds.SILK_TOUCH_UPGRADE, - () -> new SimpleUpgradeItem( - PlatformApi.INSTANCE.getUpgradeRegistry(), - Platform.INSTANCE.getConfig().getUpgrade()::getSilkTouchUpgradeEnergyUsage, - true - ) + SimpleUpgradeItem::silkTouchUpgrade ); Items.INSTANCE.setSilkTouchUpgrade(silkTouchUpgrade); Items.INSTANCE.setRangeUpgrade(callback.register( @@ -676,120 +687,125 @@ protected final void registerBlockEntities( } protected final void registerMenus(final RegistryCallback> callback, - final MenuTypeFactory menuTypeFactory) { + final MenuTypeFactory menuTypeFactory, + final ExtendedMenuTypeFactory extendedMenuTypeFactory) { Menus.INSTANCE.setController(callback.register( CONTROLLER, - () -> menuTypeFactory.create(ControllerContainerMenu::new) + () -> extendedMenuTypeFactory.create(ControllerContainerMenu::new, ControllerData.STREAM_CODEC) )); Menus.INSTANCE.setDiskDrive(callback.register( DISK_DRIVE, - () -> menuTypeFactory.create(DiskDriveContainerMenu::new) + () -> extendedMenuTypeFactory.create(DiskDriveContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setGrid(callback.register( GRID, - () -> menuTypeFactory.create(GridContainerMenu::new) + () -> extendedMenuTypeFactory.create(GridContainerMenu::new, GridData.STREAM_CODEC) )); Menus.INSTANCE.setCraftingGrid(callback.register( CRAFTING_GRID, - () -> menuTypeFactory.create(CraftingGridContainerMenu::new) + () -> extendedMenuTypeFactory.create(CraftingGridContainerMenu::new, GridData.STREAM_CODEC) )); Menus.INSTANCE.setWirelessGrid(callback.register( WIRELESS_GRID, - () -> menuTypeFactory.create(WirelessGridContainerMenu::new) + () -> extendedMenuTypeFactory.create(WirelessGridContainerMenu::new, WirelessGridData.STREAM_CODEC) )); Menus.INSTANCE.setItemStorage(callback.register( ITEM_STORAGE_BLOCK, - () -> menuTypeFactory.create(ItemStorageBlockContainerMenu::new) + () -> extendedMenuTypeFactory.create(ItemStorageBlockContainerMenu::new, StorageBlockData.STREAM_CODEC) )); Menus.INSTANCE.setFluidStorage(callback.register( FLUID_STORAGE_BLOCK, - () -> menuTypeFactory.create(FluidStorageBlockContainerMenu::new) + () -> extendedMenuTypeFactory.create(FluidStorageBlockContainerMenu::new, StorageBlockData.STREAM_CODEC) )); Menus.INSTANCE.setImporter(callback.register( IMPORTER, - () -> menuTypeFactory.create(ImporterContainerMenu::new) + () -> extendedMenuTypeFactory.create(ImporterContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setExporter(callback.register( EXPORTER, - () -> menuTypeFactory.create(ExporterContainerMenu::new) + () -> extendedMenuTypeFactory.create(ExporterContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setInterface(callback.register( INTERFACE, - () -> menuTypeFactory.create(InterfaceContainerMenu::new) + () -> extendedMenuTypeFactory.create(InterfaceContainerMenu::new, InterfaceData.STREAM_CODEC) )); Menus.INSTANCE.setExternalStorage(callback.register( EXTERNAL_STORAGE, - () -> menuTypeFactory.create(ExternalStorageContainerMenu::new) + () -> extendedMenuTypeFactory.create(ExternalStorageContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setDetector(callback.register( DETECTOR, - () -> menuTypeFactory.create(DetectorContainerMenu::new) + () -> extendedMenuTypeFactory.create(DetectorContainerMenu::new, SingleAmountData.STREAM_CODEC) )); Menus.INSTANCE.setDestructor(callback.register( DESTRUCTOR, - () -> menuTypeFactory.create(DestructorContainerMenu::new) + () -> extendedMenuTypeFactory.create(DestructorContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setConstructor(callback.register( CONSTRUCTOR, - () -> menuTypeFactory.create(ConstructorContainerMenu::new) + () -> extendedMenuTypeFactory.create(ConstructorContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setRegulatorUpgrade(callback.register( REGULATOR_UPGRADE, - () -> menuTypeFactory.create(RegulatorUpgradeContainerMenu::new) + () -> extendedMenuTypeFactory.create(RegulatorUpgradeContainerMenu::new, SingleAmountData.STREAM_CODEC) )); Menus.INSTANCE.setWirelessTransmitter(callback.register( WIRELESS_TRANSMITTER, - () -> menuTypeFactory.create(WirelessTransmitterContainerMenu::new) + () -> extendedMenuTypeFactory.create(WirelessTransmitterContainerMenu::new, + WirelessTransmitterData.STREAM_CODEC) )); Menus.INSTANCE.setStorageMonitor(callback.register( STORAGE_MONITOR, - () -> menuTypeFactory.create(StorageMonitorContainerMenu::new) + () -> extendedMenuTypeFactory.create(StorageMonitorContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setNetworkTransmitter(callback.register( NETWORK_TRANSMITTER, - () -> menuTypeFactory.create(NetworkTransmitterContainerMenu::new) + () -> extendedMenuTypeFactory.create(NetworkTransmitterContainerMenu::new, + NetworkTransmitterData.STREAM_CODEC) )); Menus.INSTANCE.setPortableGridBlock(callback.register( createIdentifier("portable_grid_block"), - () -> menuTypeFactory.create(PortableGridBlockContainerMenu::new) + () -> extendedMenuTypeFactory.create(PortableGridBlockContainerMenu::new, PortableGridData.STREAM_CODEC) )); Menus.INSTANCE.setPortableGridItem(callback.register( createIdentifier("portable_grid_item"), - () -> menuTypeFactory.create(PortableGridItemContainerMenu::new) + () -> extendedMenuTypeFactory.create(PortableGridItemContainerMenu::new, PortableGridData.STREAM_CODEC) )); Menus.INSTANCE.setSecurityCard(callback.register( SECURITY_CARD, - () -> menuTypeFactory.create(SecurityCardContainerMenu::new) + () -> extendedMenuTypeFactory.create(SecurityCardContainerMenu::new, + PlayerBoundSecurityCardData.STREAM_CODEC) )); Menus.INSTANCE.setFallbackSecurityCard(callback.register( FALLBACK_SECURITY_CARD, - () -> menuTypeFactory.create(FallbackSecurityCardContainerMenu::new) + () -> extendedMenuTypeFactory.create(FallbackSecurityCardContainerMenu::new, SecurityCardData.STREAM_CODEC) + )); + Menus.INSTANCE.setSecurityManager(callback.register( + SECURITY_MANAGER, + () -> menuTypeFactory.create(SecurityManagerContainerMenu::new) )); - Menus.INSTANCE.setSecurityManager(callback.register(SECURITY_MANAGER, () -> menuTypeFactory.create( - (syncId, playerInventory, buf) -> new SecurityManagerContainerMenu(syncId, playerInventory) - ))); Menus.INSTANCE.setRelay(callback.register( RELAY, - () -> menuTypeFactory.create(RelayContainerMenu::new) + () -> extendedMenuTypeFactory.create(RelayContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); Menus.INSTANCE.setDiskInterface(callback.register( DISK_INTERFACE, - () -> menuTypeFactory.create(DiskInterfaceContainerMenu::new) + () -> extendedMenuTypeFactory.create(DiskInterfaceContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); } - protected final void registerLootFunctions(final RegistryCallback callback) { + protected final void registerLootFunctions(final RegistryCallback> callback) { LootFunctions.INSTANCE.setStorageBlock(callback.register( STORAGE_BLOCK, - () -> new LootItemFunctionType(Codec.unit(new StorageBlockLootItemFunction())) + () -> new LootItemFunctionType<>(MapCodec.unit(new StorageBlockLootItemFunction())) )); LootFunctions.INSTANCE.setPortableGrid(callback.register( PORTABLE_GRID, - () -> new LootItemFunctionType(Codec.unit(new PortableGridLootItemFunction())) + () -> new LootItemFunctionType<>(MapCodec.unit(new PortableGridLootItemFunction())) )); LootFunctions.INSTANCE.setEnergy(callback.register( createIdentifier("energy"), - () -> new LootItemFunctionType(Codec.unit(new EnergyLootItemFunction())) + () -> new LootItemFunctionType<>(MapCodec.unit(new EnergyLootItemFunction())) )); } @@ -807,14 +823,56 @@ protected final void registerRecipeSerializers(final RegistryCallback> callback) { + DataComponents.INSTANCE.setEnergy( + callback.register(createIdentifier("energy"), () -> DataComponentType.builder() + .persistent(Codec.LONG) + .networkSynchronized(ByteBufCodecs.VAR_LONG) + .build())); + DataComponents.INSTANCE.setNetworkLocation( + callback.register(createIdentifier("network_location"), () -> DataComponentType.builder() + .persistent(GlobalPos.CODEC) + .networkSynchronized(GlobalPos.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setStorageReference( + callback.register(createIdentifier("storage_reference"), () -> DataComponentType.builder() + .persistent(UUIDUtil.CODEC) + .networkSynchronized(UUIDUtil.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setRegulatorUpgradeState( + callback.register(createIdentifier("regulator_upgrade_state"), + () -> DataComponentType.builder() + .persistent(RegulatorUpgradeState.CODEC) + .networkSynchronized(RegulatorUpgradeState.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setSecurityCardBoundPlayer( + callback.register(createIdentifier("security_card_bound_player"), + () -> DataComponentType.builder() + .persistent(SecurityCardBoundPlayer.CODEC) + .networkSynchronized(SecurityCardBoundPlayer.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setSecurityCardPermissions( + callback.register(createIdentifier("security_card_permissions"), + () -> DataComponentType.builder() + .persistent(SecurityCardPermissions.CODEC) + .networkSynchronized(SecurityCardPermissions.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setConfigurationCardState( + callback.register(createIdentifier("configuration_card_state"), + () -> DataComponentType.builder() + .persistent(ConfigurationCardState.CODEC) + .networkSynchronized(ConfigurationCardState.STREAM_CODEC) + .build())); + } + + protected final void registerInventorySlotReference() { PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry().register( createIdentifier("inventory"), InventorySlotReferenceFactory.INSTANCE ); } - protected static boolean allowNbtUpdateAnimation(final ItemStack oldStack, final ItemStack newStack) { + protected static boolean allowComponentsUpdateAnimation(final ItemStack oldStack, final ItemStack newStack) { return oldStack.getItem() != newStack.getItem(); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractPlatform.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractPlatform.java index 6f84b85a8..70c66290a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractPlatform.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractPlatform.java @@ -1,40 +1,22 @@ package com.refinedmods.refinedstorage2.platform.common; import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.support.ClientToServerCommunications; -import com.refinedmods.refinedstorage2.platform.common.support.ServerToClientCommunications; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer; public abstract class AbstractPlatform implements Platform { - private final ServerToClientCommunications serverToClientCommunications; - private final ClientToServerCommunications clientToServerCommunications; private final MenuOpener menuOpener; private final FluidRenderer fluidRenderer; private final GridInsertionStrategyFactory defaultGridInsertionStrategyFactory; - protected AbstractPlatform(final ServerToClientCommunications serverToClientCommunications, - final ClientToServerCommunications clientToServerCommunications, - final MenuOpener menuOpener, + protected AbstractPlatform(final MenuOpener menuOpener, final FluidRenderer fluidRenderer, final GridInsertionStrategyFactory defaultGridInsertionStrategyFactory) { - this.serverToClientCommunications = serverToClientCommunications; - this.clientToServerCommunications = clientToServerCommunications; this.menuOpener = menuOpener; this.fluidRenderer = fluidRenderer; this.defaultGridInsertionStrategyFactory = defaultGridInsertionStrategyFactory; } - @Override - public ServerToClientCommunications getServerToClientCommunications() { - return serverToClientCommunications; - } - - @Override - public ClientToServerCommunications getClientToServerCommunications() { - return clientToServerCommunications; - } - @Override public MenuOpener getMenuOpener() { return menuOpener; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Platform.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Platform.java index 81851872f..c790ac1ac 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Platform.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Platform.java @@ -4,8 +4,6 @@ import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.support.ClientToServerCommunications; -import com.refinedmods.refinedstorage2.platform.common.support.ServerToClientCommunications; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager; import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer; @@ -25,16 +23,17 @@ import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; -import net.minecraft.tags.TagKey; 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.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; @@ -46,16 +45,10 @@ public interface Platform { Platform INSTANCE = new PlatformProxy(); - ServerToClientCommunications getServerToClientCommunications(); - - ClientToServerCommunications getClientToServerCommunications(); - MenuOpener getMenuOpener(); long getBucketAmount(); - TagKey getWrenchTag(); - Config getConfig(); boolean canEditBoxLoseFocus(EditBox editBox); @@ -82,7 +75,7 @@ public interface Platform { NonNullList getRemainingCraftingItems(Player player, CraftingRecipe craftingRecipe, - CraftingContainer container); + CraftingInput input); void onItemCrafted(Player player, ItemStack craftedStack, CraftingContainer container); @@ -115,6 +108,10 @@ List processTooltipComponents( Optional getEnergyStorage(ItemStack stack); + void sendPacketToServer(T packet); + + void sendPacketToClient(ServerPlayer player, T packet); + record ContainedFluid(ItemStack remainderContainer, FluidResource fluid, long amount) { } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java index 8591e8b07..84d70c482 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java @@ -49,7 +49,6 @@ import com.refinedmods.refinedstorage2.platform.api.upgrade.BuiltinUpgradeDestinations; import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; import com.refinedmods.refinedstorage2.platform.common.grid.NoopGridSynchronizer; import com.refinedmods.refinedstorage2.platform.common.grid.screen.hint.GridInsertionHintsImpl; import com.refinedmods.refinedstorage2.platform.common.grid.screen.hint.ItemGridInsertionHint; @@ -72,6 +71,8 @@ import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.CompositeSlotReferenceProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.InventorySlotReference; import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.NetworkBoundItemHelperImpl; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; import com.refinedmods.refinedstorage2.platform.common.support.registry.PlatformRegistryImpl; import com.refinedmods.refinedstorage2.platform.common.support.resource.CompositeRecipeModIngredientConverter; import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceFactory; @@ -99,10 +100,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; @@ -121,8 +119,9 @@ import static java.util.Objects.requireNonNull; public class PlatformApiImpl implements PlatformApi { - private final StorageRepository clientStorageRepository = - new ClientStorageRepository(Platform.INSTANCE.getClientToServerCommunications()::sendStorageInfoRequest); + private final StorageRepository clientStorageRepository = new ClientStorageRepository( + C2SPackets::sendStorageInfoRequest + ); private final ComponentMapFactory networkComponentMapFactory = new ComponentMapFactory<>(); private final NetworkBuilder networkBuilder = @@ -180,16 +179,18 @@ public PlatformRegistry getStorageTypeRegistry() { return storageTypeRegistry; } + @Override + public StorageRepository getClientStorageRepository() { + return clientStorageRepository; + } + @SuppressWarnings("DataFlowIssue") // NeoForge makes null datafixer safe @Override public StorageRepository getStorageRepository(final Level level) { - if (level.getServer() == null) { - return clientStorageRepository; - } final ServerLevel serverLevel = requireNonNull(level.getServer().getLevel(Level.OVERWORLD)); return serverLevel.getDataStorage().computeIfAbsent(new SavedData.Factory<>( - this::createStorageRepository, - this::createStorageRepository, + StorageRepositoryImpl::new, + StorageRepositoryImpl::new, null ), StorageRepositoryImpl.NAME); } @@ -199,16 +200,6 @@ public StorageContainerItemHelper getStorageContainerItemHelper() { return storageContainerItemHelper; } - private StorageRepositoryImpl createStorageRepository(final CompoundTag tag) { - final StorageRepositoryImpl repository = createStorageRepository(); - repository.read(tag); - return repository; - } - - private StorageRepositoryImpl createStorageRepository() { - return new StorageRepositoryImpl(storageTypeRegistry); - } - @Override public PlatformRegistry getResourceTypeRegistry() { return resourceTypeRegistry; @@ -284,11 +275,6 @@ public PlatformRegistry getGridSynchronizerRegistry() { return gridSynchronizerRegistry; } - @Override - public void writeGridScreenOpeningData(final Grid grid, final FriendlyByteBuf buf) { - AbstractGridContainerMenu.writeScreenOpeningData(grid, buf); - } - @Override public UpgradeRegistry getUpgradeRegistry() { return upgradeRegistry; @@ -522,24 +508,6 @@ public PlatformRegistry getSlotReferenceFactoryRegistry() return slotReferenceFactoryRegistry; } - @Override - public void writeSlotReference(final SlotReference slotReference, final FriendlyByteBuf buf) { - this.slotReferenceFactoryRegistry.getId(slotReference.getFactory()).ifPresentOrElse(id -> { - buf.writeBoolean(true); - buf.writeResourceLocation(id); - slotReference.writeToBuffer(buf); - }, () -> buf.writeBoolean(false)); - } - - @Override - public Optional getSlotReference(final FriendlyByteBuf buf) { - if (!buf.readBoolean()) { - return Optional.empty(); - } - final ResourceLocation id = buf.readResourceLocation(); - return slotReferenceFactoryRegistry.get(id).map(factory -> factory.create(buf)); - } - @Override public void addSlotReferenceProvider(final SlotReferenceProvider provider) { slotReferenceProvider.addProvider(provider); @@ -553,9 +521,7 @@ public SlotReference createInventorySlotReference(final Player player, final Int @Override public void useNetworkBoundItem(final Player player, final Item... items) { final Set validItems = new HashSet<>(Arrays.asList(items)); - slotReferenceProvider.findForUse(player, items[0], validItems).ifPresent( - slotReference -> Platform.INSTANCE.getClientToServerCommunications().sendUseNetworkBoundItem(slotReference) - ); + slotReferenceProvider.findForUse(player, items[0], validItems).ifPresent(C2SPackets::sendUseNetworkBoundItem); } @Override @@ -583,7 +549,7 @@ public void sendNoPermissionToOpenMessage(final ServerPlayer player, final Compo @Override public void sendNoPermissionMessage(final ServerPlayer player, final Component message) { - Platform.INSTANCE.getServerToClientCommunications().sendNoPermission(player, message); + S2CPackets.sendNoPermission(player, message); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformProxy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformProxy.java index 651d552e5..844b1d4b0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformProxy.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformProxy.java @@ -4,8 +4,6 @@ import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.support.ClientToServerCommunications; -import com.refinedmods.refinedstorage2.platform.common.support.ServerToClientCommunications; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager; import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer; @@ -25,16 +23,17 @@ import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; -import net.minecraft.tags.TagKey; 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.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; @@ -55,16 +54,6 @@ public static void loadPlatform(final Platform platform) { proxy.platform = platform; } - @Override - public ServerToClientCommunications getServerToClientCommunications() { - return ensureLoaded().getServerToClientCommunications(); - } - - @Override - public ClientToServerCommunications getClientToServerCommunications() { - return ensureLoaded().getClientToServerCommunications(); - } - @Override public MenuOpener getMenuOpener() { return ensureLoaded().getMenuOpener(); @@ -75,11 +64,6 @@ public long getBucketAmount() { return ensureLoaded().getBucketAmount(); } - @Override - public TagKey getWrenchTag() { - return ensureLoaded().getWrenchTag(); - } - @Override public Config getConfig() { return ensureLoaded().getConfig(); @@ -149,8 +133,8 @@ public ItemStack getCloneItemStack(final BlockState state, @Override public NonNullList getRemainingCraftingItems(final Player player, final CraftingRecipe craftingRecipe, - final CraftingContainer container) { - return ensureLoaded().getRemainingCraftingItems(player, craftingRecipe, container); + final CraftingInput input) { + return ensureLoaded().getRemainingCraftingItems(player, craftingRecipe, input); } @Override @@ -223,6 +207,16 @@ public Optional getEnergyStorage(final ItemStack stack) { return ensureLoaded().getEnergyStorage(stack); } + @Override + public void sendPacketToServer(final T packet) { + ensureLoaded().sendPacketToServer(packet); + } + + @Override + public void sendPacketToClient(final ServerPlayer player, final T packet) { + ensureLoaded().sendPacketToClient(player, packet); + } + private Platform ensureLoaded() { if (platform == null) { throw new IllegalStateException("Platform not loaded yet"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItem.java index eb4bdaa99..a98f98010 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItem.java @@ -2,17 +2,16 @@ import com.refinedmods.refinedstorage2.platform.api.configurationcard.ConfigurationCardTarget; import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; import java.util.List; import java.util.Optional; import javax.annotation.Nullable; import net.minecraft.ChatFormatting; +import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.StringTag; -import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; @@ -30,19 +29,13 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; -import static java.util.Objects.requireNonNull; public class ConfigurationCardItem extends Item { private static final Component EMPTY_HELP = createTranslation("item", "configuration_card.empty_help"); private static final Component CONFIGURED_HELP = createTranslation("item", "configuration_card.configured_help"); - private static final Component EMPTY = createTranslation("item", "configuration_card.empty") .withStyle(ChatFormatting.GRAY); - private static final String TAG_TYPE = "type"; - private static final String TAG_CONFIG = "config"; - private static final String TAG_UPGRADES = "upgrades"; - public ConfigurationCardItem() { super(new Item.Properties().stacksTo(1)); } @@ -57,35 +50,40 @@ public InteractionResult useOn(final UseOnContext ctx) { return InteractionResult.CONSUME; } final ItemStack stack = ctx.getItemInHand(); - if (stack.getTag() == null) { - writeConfiguration(stack, ctx.getPlayer(), target, blockEntity.getType()); + final ConfigurationCardState state = stack.get(DataComponents.INSTANCE.getConfigurationCardState()); + if (state == null) { + stack.set(DataComponents.INSTANCE.getConfigurationCardState(), new ConfigurationCardState( + blockEntity.getType(), + createConfigTag(target, ctx.getLevel().registryAccess()), + target.getUpgradeItems() + )); + sendCopiedConfigurationMessage(ctx.getPlayer(), blockEntity.getType()); return InteractionResult.CONSUME; } - return applyConfiguration(ctx.getPlayer(), blockEntity, target, stack.getTag()); + return applyConfiguration(ctx.getPlayer(), blockEntity, target, state, ctx.getLevel().registryAccess()); } private InteractionResult applyConfiguration( final Player player, final BlockEntity targetBlockEntity, final ConfigurationCardTarget target, - final CompoundTag tag + final ConfigurationCardState state, + final HolderLookup.Provider provider ) { - final BlockEntityType existingConfiguredType = getConfiguredType(tag); - if (existingConfiguredType != targetBlockEntity.getType()) { - return configurationCardIsConfiguredForDifferentType(player, existingConfiguredType); + if (state.blockEntityType() != targetBlockEntity.getType()) { + return configurationCardIsConfiguredForDifferentType(player, state.blockEntityType()); } - target.readConfiguration(tag.getCompound(TAG_CONFIG)); - tryTransferUpgrades(player, target, tag); + target.readConfiguration(state.config(), provider); + tryTransferUpgrades(player, target, state.upgradeItems()); targetBlockEntity.setChanged(); player.sendSystemMessage(createTranslation("item", "configuration_card.applied_configuration")); return InteractionResult.SUCCESS; } - private void tryTransferUpgrades(final Player player, final ConfigurationCardTarget target, final CompoundTag tag) { - final ListTag upgradesTag = tag.getList(TAG_UPGRADES, Tag.TAG_STRING); - for (final Tag upgradeItemTag : upgradesTag) { - final ResourceLocation upgradeItemKey = new ResourceLocation(upgradeItemTag.getAsString()); - final Item upgradeItem = BuiltInRegistries.ITEM.get(upgradeItemKey); + private void tryTransferUpgrades(final Player player, + final ConfigurationCardTarget target, + final List upgradeItems) { + for (final Item upgradeItem : upgradeItems) { final int upgradeIndexInPlayerInventory = player.getInventory().findSlotMatchingItem( new ItemStack(upgradeItem) ); @@ -109,30 +107,9 @@ private InteractionResult configurationCardIsConfiguredForDifferentType( return InteractionResult.CONSUME; } - private void writeConfiguration(final ItemStack stack, - final Player player, - final ConfigurationCardTarget target, - final BlockEntityType type) { + private CompoundTag createConfigTag(final ConfigurationCardTarget target, final HolderLookup.Provider provider) { final CompoundTag tag = new CompoundTag(); - tag.putString(TAG_TYPE, requireNonNull(BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(type)).toString()); - tag.put(TAG_CONFIG, createConfigTag(target)); - tag.put(TAG_UPGRADES, createUpgradesTag(target)); - stack.setTag(tag); - sendCopiedConfigurationMessage(player, type); - } - - private CompoundTag createConfigTag(final ConfigurationCardTarget target) { - final CompoundTag tag = new CompoundTag(); - target.writeConfiguration(tag); - return tag; - } - - private ListTag createUpgradesTag(final ConfigurationCardTarget target) { - final ListTag tag = new ListTag(); - target.getUpgradeItems().forEach(item -> { - final ResourceLocation itemKey = BuiltInRegistries.ITEM.getKey(item); - tag.add(StringTag.valueOf(itemKey.toString())); - }); + target.writeConfiguration(tag, provider); return tag; } @@ -160,45 +137,36 @@ public InteractionResultHolder use(final Level level, final Player pl @Override public void appendHoverText(final ItemStack stack, - @Nullable final Level level, + final TooltipContext context, final List lines, final TooltipFlag flag) { - super.appendHoverText(stack, level, lines, flag); - if (stack.getTag() == null) { + super.appendHoverText(stack, context, lines, flag); + final ConfigurationCardState state = stack.get(DataComponents.INSTANCE.getConfigurationCardState()); + if (state == null) { lines.add(EMPTY); return; } - final BlockEntityType configuredType = getConfiguredType(stack.getTag()); - if (configuredType == null) { - return; - } lines.add(createTranslation( "item", "configuration_card.configured", - getConfiguredTypeTranslation(configuredType).withStyle(ChatFormatting.WHITE) + getConfiguredTypeTranslation(state.blockEntityType()).withStyle(ChatFormatting.WHITE) ).withStyle(ChatFormatting.GRAY)); } - @Nullable - private BlockEntityType getConfiguredType(final CompoundTag tag) { - final ResourceLocation type = new ResourceLocation(tag.getString(TAG_TYPE)); - return BuiltInRegistries.BLOCK_ENTITY_TYPE.get(type); + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(isActive(stack) ? CONFIGURED_HELP : EMPTY_HELP)); + } + + boolean isActive(final ItemStack stack) { + return stack.has(DataComponents.INSTANCE.getConfigurationCardState()); } - private MutableComponent getConfiguredTypeTranslation(final BlockEntityType type) { + private static MutableComponent getConfiguredTypeTranslation(final BlockEntityType type) { final ResourceLocation typeId = BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(type); if (typeId == null) { return Component.empty(); } return Component.translatable("block." + typeId.getNamespace() + "." + typeId.getPath()); } - - @Override - public Optional getTooltipImage(final ItemStack stack) { - return Optional.of(new HelpTooltipComponent(isActive(stack) ? CONFIGURED_HELP : EMPTY_HELP)); - } - - boolean isActive(final ItemStack stack) { - return stack.getTag() != null && stack.getTag().contains(TAG_TYPE); - } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java index 0da16a8f9..3f1e46bcb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java @@ -8,8 +8,10 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + public class ConfigurationCardItemPropertyFunction implements ClampedItemPropertyFunction { - public static final ResourceLocation NAME = new ResourceLocation("active"); + public static final ResourceLocation NAME = createIdentifier("configuration_card_active"); @Override public float unclampedCall(final ItemStack itemStack, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardState.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardState.java new file mode 100644 index 000000000..58fbc7dcc --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardState.java @@ -0,0 +1,37 @@ +package com.refinedmods.refinedstorage2.platform.common.configurationcard; + +import java.util.ArrayList; +import java.util.List; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.entity.BlockEntityType; + +public record ConfigurationCardState(BlockEntityType blockEntityType, + CompoundTag config, + List upgradeItems) { + public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + BuiltInRegistries.BLOCK_ENTITY_TYPE.byNameCodec().fieldOf("blockEntityType") + .forGetter(ConfigurationCardState::blockEntityType), + CompoundTag.CODEC.fieldOf("config") + .forGetter(ConfigurationCardState::config), + Codec.list(BuiltInRegistries.ITEM.byNameCodec()).fieldOf("upgradeItems") + .forGetter(ConfigurationCardState::upgradeItems) + ).apply(instance, ConfigurationCardState::new)); + + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.registry(Registries.BLOCK_ENTITY_TYPE), ConfigurationCardState::blockEntityType, + ByteBufCodecs.COMPOUND_TAG, ConfigurationCardState::config, + ByteBufCodecs.collection(ArrayList::new, ByteBufCodecs.registry(Registries.ITEM)), + ConfigurationCardState::upgradeItems, + ConfigurationCardState::new + ); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java index a6f0c4927..5177cf9d8 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java @@ -12,6 +12,8 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.Enchantment; @@ -19,11 +21,11 @@ public class BlockBreakDestructorStrategyFactory implements DestructorStrategyFactory { private static final ItemStack DEFAULT_TOOL = new ItemStack(net.minecraft.world.item.Items.DIAMOND_PICKAXE); - private static final List TOOLS = List.of( - Tool.of(Items.INSTANCE::getSilkTouchUpgrade, Enchantments.SILK_TOUCH, 1), - Tool.of(Items.INSTANCE::getFortune3Upgrade, Enchantments.BLOCK_FORTUNE, 3), - Tool.of(Items.INSTANCE::getFortune2Upgrade, Enchantments.BLOCK_FORTUNE, 2), - Tool.of(Items.INSTANCE::getFortune1Upgrade, Enchantments.BLOCK_FORTUNE, 1) + private static final List UPGRADE_MAPPINGS = List.of( + new UpgradeMapping(Items.INSTANCE::getSilkTouchUpgrade, Enchantments.SILK_TOUCH, 1), + new UpgradeMapping(Items.INSTANCE::getFortune3Upgrade, Enchantments.FORTUNE, 3), + new UpgradeMapping(Items.INSTANCE::getFortune2Upgrade, Enchantments.FORTUNE, 2), + new UpgradeMapping(Items.INSTANCE::getFortune1Upgrade, Enchantments.FORTUNE, 1) ); @Override @@ -32,24 +34,26 @@ public Optional create(final ServerLevel level, final Direction direction, final UpgradeState upgradeState, final boolean pickupItems) { - final ItemStack tool = createTool(upgradeState); + final ItemStack tool = DEFAULT_TOOL.copy(); + enchantTool(level, upgradeState, tool); return Optional.of(new BlockBreakDestructorStrategy(level, pos, direction, tool)); } - private ItemStack createTool(final UpgradeState state) { - for (final Tool tool : TOOLS) { - if (state.has(tool.itemSupplier.get())) { - return tool.tool; + private static void enchantTool(final ServerLevel level, final UpgradeState upgradeState, final ItemStack tool) { + for (final UpgradeMapping upgradeMapping : UPGRADE_MAPPINGS) { + if (upgradeState.has(upgradeMapping.upgradeItemSupplier.get())) { + level.holderLookup(Registries.ENCHANTMENT).get(upgradeMapping.enchantment).ifPresent( + enchantment -> tool.enchant(enchantment, upgradeMapping.level) + ); + return; } } - return DEFAULT_TOOL; } - private record Tool(Supplier itemSupplier, ItemStack tool) { - private static Tool of(final Supplier item, final Enchantment enchantment, final int level) { - final ItemStack resultingTool = DEFAULT_TOOL.copy(); - resultingTool.enchant(enchantment, level); - return new Tool(item, resultingTool); - } + private record UpgradeMapping( + Supplier upgradeItemSupplier, + ResourceKey enchantment, + int level + ) { } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlockEntity.java index 4c870f75e..27e12c396 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlockEntity.java @@ -24,6 +24,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; @@ -100,14 +101,14 @@ public void postDoWork() { } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); tag.putBoolean(TAG_DROP_ITEMS, dropItems); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); if (tag.contains(TAG_DROP_ITEMS)) { dropItems = tag.getBoolean(TAG_DROP_ITEMS); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorContainerMenu.java index f27575351..8cc5b09da 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorContainerMenu.java @@ -5,10 +5,10 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSchedulingContainerMenu; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -18,12 +18,14 @@ public class ConstructorContainerMenu extends AbstractSchedulingContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "constructor.filter_help"); - public ConstructorContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public ConstructorContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { super( Menus.INSTANCE.getConstructor(), syncId, playerInventory.player, - buf, + resourceContainerData, UpgradeDestinations.CONSTRUCTOR, FILTER_HELP ); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlockEntity.java index 1792aef9f..7a72a8546 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlockEntity.java @@ -14,8 +14,9 @@ import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings; import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; @@ -25,18 +26,19 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.block.state.BlockState; public class DestructorBlockEntity extends AbstractUpgradeableNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider { + implements NetworkNodeExtendedMenuProvider { private static final String TAG_FILTER_MODE = "fim"; private static final String TAG_PICKUP_ITEMS = "pi"; @@ -89,17 +91,17 @@ public void setFilterMode(final FilterMode mode) { } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(filter.getMode())); tag.putBoolean(TAG_PICKUP_ITEMS, pickupItems); - filterWithFuzzyMode.save(tag); + filterWithFuzzyMode.save(tag, provider); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); - filterWithFuzzyMode.load(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); + filterWithFuzzyMode.load(tag, provider); if (tag.contains(TAG_FILTER_MODE)) { filter.setMode(FilterModeSettings.getFilterMode(tag.getInt(TAG_FILTER_MODE))); } @@ -115,8 +117,13 @@ protected void setEnergyUsage(final long upgradeEnergyUsage) { } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - filterWithFuzzyMode.getFilterContainer().writeToUpdatePacket(buf); + public ResourceContainerData getMenuData() { + return ResourceContainerData.of(filterWithFuzzyMode.getFilterContainer()); + } + + @Override + public StreamEncoder getMenuCodec() { + return ResourceContainerData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorContainerMenu.java index ca122493d..b3f5dabf3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorContainerMenu.java @@ -8,10 +8,10 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -21,12 +21,14 @@ public class DestructorContainerMenu extends AbstractSimpleFilterContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "destructor.filter_help"); - public DestructorContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public DestructorContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { super( Menus.INSTANCE.getDestructor(), syncId, playerInventory.player, - buf, + resourceContainerData, UpgradeDestinations.DESTRUCTOR, FILTER_HELP ); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategy.java index f258547be..f3aabbc0c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategy.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategy.java @@ -44,8 +44,8 @@ public boolean apply(final Filter filter, || blockState.getValue(LiquidBlock.LEVEL) != 0) { return false; } - final Fluid fluid = liquidBlock.getFluidState(blockState).getType(); - final FluidResource fluidResource = new FluidResource(fluid, null); + final Fluid fluid = blockState.getFluidState().getType(); + final FluidResource fluidResource = new FluidResource(fluid); if (!filter.isAllowed(fluidResource)) { return false; } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ColorMap.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ColorMap.java index 9534c13f9..484101f96 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ColorMap.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ColorMap.java @@ -35,7 +35,7 @@ protected final ResourceLocation getId(final DyeColor color) { if (color == defaultColor) { return baseId; } - return new ResourceLocation(baseId.getNamespace(), color.getName() + "_" + baseId.getPath()); + return ResourceLocation.fromNamespaceAndPath(baseId.getNamespace(), color.getName() + "_" + baseId.getPath()); } public void forEach(final ColoredConsumer consumer) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java index 811af7e5b..8f9247f13 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java @@ -22,7 +22,7 @@ public final class ContentNames { public static final MutableComponent CREATIVE_CONTROLLER = name("creative_controller"); public static final MutableComponent WIRELESS_GRID = createTranslation("item", "wireless_grid"); public static final MutableComponent WIRELESS_TRANSMITTER = name("wireless_transmitter"); - public static final MutableComponent REGULATOR_UPGRADE = name("regulator_upgrade"); + public static final MutableComponent REGULATOR_UPGRADE = createTranslation("item", "regulator_upgrade"); public static final MutableComponent STORAGE_MONITOR = name("storage_monitor"); public static final MutableComponent INTERFACE = name("interface"); public static final MutableComponent DISK_DRIVE = name("disk_drive"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DataComponents.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DataComponents.java new file mode 100644 index 000000000..e59fa268c --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DataComponents.java @@ -0,0 +1,99 @@ +package com.refinedmods.refinedstorage2.platform.common.content; + +import com.refinedmods.refinedstorage2.platform.common.configurationcard.ConfigurationCardState; +import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardBoundPlayer; +import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardPermissions; +import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeState; + +import java.util.UUID; +import java.util.function.Supplier; +import javax.annotation.Nullable; + +import net.minecraft.core.GlobalPos; +import net.minecraft.core.component.DataComponentType; + +import static java.util.Objects.requireNonNull; + +public final class DataComponents { + public static final DataComponents INSTANCE = new DataComponents(); + + @Nullable + private Supplier> energy; + @Nullable + private Supplier> networkLocation; + @Nullable + private Supplier> storageReference; + @Nullable + private Supplier> regulatorUpgradeState; + @Nullable + private Supplier> securityCardBoundPlayer; + @Nullable + private Supplier> securityCardPermissions; + @Nullable + private Supplier> configurationCardState; + + private DataComponents() { + } + + public DataComponentType getEnergy() { + return requireNonNull(energy).get(); + } + + public void setEnergy(@Nullable final Supplier> supplier) { + this.energy = supplier; + } + + public DataComponentType getNetworkLocation() { + return requireNonNull(networkLocation).get(); + } + + public void setNetworkLocation(@Nullable final Supplier> supplier) { + this.networkLocation = supplier; + } + + public DataComponentType getStorageReference() { + return requireNonNull(storageReference).get(); + } + + public void setStorageReference(@Nullable final Supplier> supplier) { + this.storageReference = supplier; + } + + public DataComponentType getRegulatorUpgradeState() { + return requireNonNull(regulatorUpgradeState).get(); + } + + public void setRegulatorUpgradeState(@Nullable final Supplier> supplier) { + this.regulatorUpgradeState = supplier; + } + + public DataComponentType getSecurityCardBoundPlayer() { + return requireNonNull(securityCardBoundPlayer).get(); + } + + public void setSecurityCardBoundPlayer( + @Nullable final Supplier> supplier + ) { + this.securityCardBoundPlayer = supplier; + } + + public DataComponentType getSecurityCardPermissions() { + return requireNonNull(securityCardPermissions).get(); + } + + public void setSecurityCardPermissions( + @Nullable final Supplier> supplier + ) { + this.securityCardPermissions = supplier; + } + + public DataComponentType getConfigurationCardState() { + return requireNonNull(configurationCardState).get(); + } + + public void setConfigurationCardState( + @Nullable final Supplier> supplier + ) { + this.configurationCardState = supplier; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ExtendedMenuTypeFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ExtendedMenuTypeFactory.java new file mode 100644 index 000000000..16918adeb --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ExtendedMenuTypeFactory.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage2.platform.common.content; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.MenuType; + +@FunctionalInterface +public interface ExtendedMenuTypeFactory { + MenuType create( + MenuSupplier supplier, + StreamCodec streamCodec + ); + + @FunctionalInterface + interface MenuSupplier { + T create(int syncId, Inventory playerInventory, D data); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/LootFunctions.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/LootFunctions.java index a033282ea..b019d788f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/LootFunctions.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/LootFunctions.java @@ -1,5 +1,9 @@ package com.refinedmods.refinedstorage2.platform.common.content; +import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridLootItemFunction; +import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.StorageBlockLootItemFunction; +import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyLootItemFunction; + import java.util.function.Supplier; import javax.annotation.Nullable; @@ -11,36 +15,36 @@ public final class LootFunctions { public static final LootFunctions INSTANCE = new LootFunctions(); @Nullable - private Supplier storageBlock; + private Supplier> storageBlock; @Nullable - private Supplier energy; + private Supplier> energy; @Nullable - private Supplier portableGrid; + private Supplier> portableGrid; private LootFunctions() { } - public LootItemFunctionType getStorageBlock() { + public LootItemFunctionType getStorageBlock() { return requireNonNull(storageBlock).get(); } - public void setStorageBlock(final Supplier supplier) { + public void setStorageBlock(final Supplier> supplier) { this.storageBlock = supplier; } - public LootItemFunctionType getEnergy() { + public LootItemFunctionType getEnergy() { return requireNonNull(energy).get(); } - public void setEnergy(final Supplier supplier) { + public void setEnergy(final Supplier> supplier) { this.energy = supplier; } - public LootItemFunctionType getPortableGrid() { + public LootItemFunctionType getPortableGrid() { return requireNonNull(portableGrid).get(); } - public void setPortableGrid(final Supplier portableGrid) { - this.portableGrid = portableGrid; + public void setPortableGrid(final Supplier> supplier) { + this.portableGrid = supplier; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/MenuTypeFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/MenuTypeFactory.java index 901b772ec..244565804 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/MenuTypeFactory.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/MenuTypeFactory.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage2.platform.common.content; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; @@ -11,6 +10,6 @@ public interface MenuTypeFactory { @FunctionalInterface interface MenuSupplier { - T create(int syncId, Inventory playerInventory, FriendlyByteBuf data); + T create(int syncId, Inventory playerInventory); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Sounds.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Sounds.java index 0ae669184..148896013 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Sounds.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Sounds.java @@ -19,7 +19,7 @@ public SoundEvent getWrench() { return Objects.requireNonNull(wrench).get(); } - public void setWrench(final Supplier wrenchSupplier) { - this.wrench = wrenchSupplier; + public void setWrench(final Supplier supplier) { + this.wrench = supplier; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntity.java index 151bcea6c..7eddb3e08 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntity.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.energy.BlockEntityEnergyStorage; import com.refinedmods.refinedstorage2.platform.common.support.energy.CreativeEnergyStorage; import com.refinedmods.refinedstorage2.platform.common.support.energy.ItemBlockEnergyStorage; @@ -15,10 +15,11 @@ import com.google.common.util.concurrent.RateLimiter; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -29,7 +30,7 @@ import org.slf4j.LoggerFactory; public class ControllerBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider, TransferableBlockEntityEnergy { + implements NetworkNodeExtendedMenuProvider, TransferableBlockEntityEnergy { private static final Logger LOGGER = LoggerFactory.getLogger(ControllerBlockEntity.class); private static final String TAG_CAPACITY = "capacity"; @@ -76,8 +77,8 @@ public void updateEnergyTypeInLevel(final BlockState state) { } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); ItemBlockEnergyStorage.writeToTag(tag, mainNode.getActualStored()); saveRenderingInfo(tag); } @@ -87,8 +88,8 @@ private void saveRenderingInfo(final CompoundTag tag) { } @Override - public void load(final CompoundTag tag) { - super.load(tag); + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.loadAdditional(tag, provider); ItemBlockEnergyStorage.readFromTag(energyStorage, tag); } @@ -103,9 +104,13 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory inv, f } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - buf.writeLong(getActualStored()); - buf.writeLong(getActualCapacity()); + public ControllerData getMenuData() { + return new ControllerData(getActualStored(), getActualCapacity()); + } + + @Override + public StreamEncoder getMenuCodec() { + return ControllerData.STREAM_CODEC; } long getActualStored() { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerContainerMenu.java index 9e2e29515..805b6c98a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerContainerMenu.java @@ -9,17 +9,22 @@ import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyContainerMenu; import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyInfo; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; public class ControllerContainerMenu extends AbstractBaseContainerMenu implements EnergyContainerMenu { private final EnergyInfo energyInfo; - public ControllerContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public ControllerContainerMenu(final int syncId, + final Inventory playerInventory, + final ControllerData controllerData) { super(Menus.INSTANCE.getController(), syncId); addPlayerInventory(playerInventory, 8, 107); - this.energyInfo = EnergyInfo.forClient(playerInventory.player, buf.readLong(), buf.readLong()); + this.energyInfo = EnergyInfo.forClient( + playerInventory.player, + controllerData.stored(), + controllerData.capacity() + ); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerData.java new file mode 100644 index 000000000..91d795d3a --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerData.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage2.platform.common.controller; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record ControllerData(long stored, long capacity) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.VAR_LONG, ControllerData::stored, + ByteBufCodecs.VAR_LONG, ControllerData::capacity, + ControllerData::new + ); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java index bcf8ceaa8..17cf86750 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java @@ -15,9 +15,6 @@ public float unclampedCall(final ItemStack stack, @Nullable final ClientLevel level, @Nullable final LivingEntity entity, final int seed) { - if (stack.getTag() == null) { // for newly created items - return 1; - } return PlatformApi.INSTANCE.getEnergyStorage(stack) .map(energyStorage -> (float) energyStorage.getStored() / (float) energyStorage.getCapacity()) .orElse(1F); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlockEntity.java index 23ffabe08..2f387d376 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlockEntity.java @@ -12,20 +12,23 @@ import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +import java.util.Optional; import javax.annotation.Nullable; import com.google.common.util.concurrent.RateLimiter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -35,7 +38,7 @@ import org.slf4j.LoggerFactory; public class DetectorBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider { + implements NetworkNodeExtendedMenuProvider { private static final Logger LOGGER = LoggerFactory.getLogger(DetectorBlockEntity.class); private static final String TAG_AMOUNT = "amount"; @@ -63,17 +66,17 @@ public DetectorBlockEntity(final BlockPos pos, final BlockState state) { } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); - filter.save(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); + filter.save(tag, provider); tag.putDouble(TAG_AMOUNT, amount); tag.putInt(TAG_MODE, DetectorModeSettings.getDetectorMode(mainNode.getMode())); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); - filter.load(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); + filter.load(tag, provider); if (tag.contains(TAG_AMOUNT)) { this.amount = tag.getDouble(TAG_AMOUNT); } @@ -126,8 +129,17 @@ private void initialize() { } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - AbstractSingleAmountContainerMenu.writeToBuf(buf, amount, filter.getFilterContainer(), null); + public SingleAmountData getMenuData() { + return new SingleAmountData( + Optional.empty(), + amount, + ResourceContainerData.of(filter.getFilterContainer()) + ); + } + + @Override + public StreamEncoder getMenuCodec() { + return SingleAmountData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorContainerMenu.java index b223acf9f..3f81d0291 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorContainerMenu.java @@ -7,10 +7,10 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -23,8 +23,10 @@ public class DetectorContainerMenu extends AbstractSingleAmountContainerMenu { @Nullable private DetectorBlockEntity detector; - public DetectorContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { - super(Menus.INSTANCE.getDetector(), syncId, playerInventory, buf, FILTER_HELP); + public DetectorContainerMenu(final int syncId, + final Inventory playerInventory, + final SingleAmountData singleAmountData) { + super(Menus.INSTANCE.getDetector(), syncId, playerInventory, singleAmountData, FILTER_HELP); registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); registerProperty(new ClientProperty<>(DetectorPropertyTypes.MODE, DetectorMode.EQUAL)); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterContainerMenu.java index 072995098..533dadff9 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterContainerMenu.java @@ -3,10 +3,10 @@ import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage2.platform.common.content.Menus; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSchedulingContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -16,12 +16,14 @@ public class ExporterContainerMenu extends AbstractSchedulingContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "exporter.filter_help"); - public ExporterContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public ExporterContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { super( Menus.INSTANCE.getExporter(), syncId, playerInventory.player, - buf, + resourceContainerData, UpgradeDestinations.EXPORTER, FILTER_HELP ); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java index 525b4dc12..d1f01db0f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java @@ -17,13 +17,14 @@ import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; import java.util.List; import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; @@ -32,7 +33,7 @@ public abstract class AbstractGridBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements Grid, NetworkNodeMenuProvider { + implements Grid, NetworkNodeExtendedMenuProvider { protected AbstractGridBlockEntity(final BlockEntityType type, final BlockPos pos, final BlockState state, @@ -53,8 +54,13 @@ protected InWorldNetworkNodeContainer createMainContainer(final GridNetworkNode } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - PlatformApi.INSTANCE.writeGridScreenOpeningData(this, buf); + public GridData getMenuData() { + return GridData.of(this); + } + + @Override + public StreamEncoder getMenuCodec() { + return GridData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridContainerMenu.java index e3c5d027b..92acdb5d2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridContainerMenu.java @@ -10,9 +10,7 @@ import com.refinedmods.refinedstorage2.api.grid.view.GridViewBuilder; import com.refinedmods.refinedstorage2.api.grid.view.GridViewBuilderImpl; import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.grid.Grid; @@ -33,20 +31,17 @@ import com.refinedmods.refinedstorage2.platform.common.grid.strategy.ClientGridScrollingStrategy; import com.refinedmods.refinedstorage2.platform.common.grid.view.CompositeGridResourceFactory; import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; import com.refinedmods.refinedstorage2.platform.common.support.stretching.ScreenSizeListener; -import com.refinedmods.refinedstorage2.platform.common.util.PacketUtil; import com.refinedmods.refinedstorage2.query.lexer.LexerTokenMappings; import com.refinedmods.refinedstorage2.query.parser.ParserOperatorMappings; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Predicate; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -96,24 +91,21 @@ protected AbstractGridContainerMenu( final MenuType menuType, final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf + final GridData gridData ) { super(menuType, syncId); this.playerInventory = playerInventory; - this.active = buf.readBoolean(); + this.active = gridData.active(); final GridViewBuilder viewBuilder = createViewBuilder(); - final int resources = buf.readInt(); - for (int i = 0; i < resources; ++i) { - final ResourceLocation resourceTypeId = buf.readResourceLocation(); - final ResourceType resourceType = PlatformApi.INSTANCE - .getResourceTypeRegistry() - .get(resourceTypeId) - .orElseThrow(); - readResource(resourceType, buf, viewBuilder); - } + gridData.resources().forEach(gridResource -> viewBuilder.withResource( + gridResource.resourceAmount().getResource(), + gridResource.resourceAmount().getAmount(), + gridResource.trackedResource().orElse(null) + )); + this.view = viewBuilder.build(); this.view.setSortingDirection(Platform.INSTANCE.getConfig().getGrid().getSortingDirection()); this.view.setSortingType(Platform.INSTANCE.getConfig().getGrid().getSortingType()); @@ -249,7 +241,7 @@ public GridView getView() { public void onActiveChanged(final boolean newActive) { this.active = newActive; if (this.playerInventory.player instanceof ServerPlayer serverPlayerEntity) { - Platform.INSTANCE.getServerToClientCommunications().sendGridActiveness(serverPlayerEntity, newActive); + S2CPackets.sendGridActiveness(serverPlayerEntity, newActive); } } @@ -263,7 +255,7 @@ public void onChanged( return; } LOGGER.debug("{} received a change of {} for {}", this, change, resource); - Platform.INSTANCE.getServerToClientCommunications().sendGridUpdate( + S2CPackets.sendGridUpdate( (ServerPlayer) playerInventory.player, platformResource, change, @@ -275,7 +267,7 @@ public void onChanged( public void invalidate() { if (playerInventory.player instanceof ServerPlayer serverPlayer) { initStrategies(serverPlayer); - Platform.INSTANCE.getServerToClientCommunications().sendGridClear(serverPlayer); + S2CPackets.sendGridClear(serverPlayer); } } @@ -427,36 +419,7 @@ protected boolean canTransferSlot(final Slot slot) { return true; } - private static void readResource(final ResourceType type, - final FriendlyByteBuf buf, - final GridViewBuilder viewBuilder) { - final ResourceKey resource = type.fromBuffer(buf); - final long amount = buf.readLong(); - final TrackedResource trackedResource = PacketUtil.readTrackedResource(buf); - viewBuilder.withResource(resource, amount, trackedResource); - } - public void onClear() { view.clear(); } - - public static void writeScreenOpeningData(final Grid grid, final FriendlyByteBuf buf) { - buf.writeBoolean(grid.isGridActive()); - final List resources = grid.getResources(PlayerActor.class); - buf.writeInt(resources.size()); - resources.forEach(resource -> writeGridResource(resource, buf)); - } - - private static void writeGridResource(final TrackedResourceAmount trackedResourceAmount, - final FriendlyByteBuf buf) { - final ResourceAmount resourceAmount = trackedResourceAmount.resourceAmount(); - final PlatformResourceKey resource = (PlatformResourceKey) resourceAmount.getResource(); - final ResourceType resourceType = resource.getResourceType(); - final ResourceLocation resourceTypeId = PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType) - .orElseThrow(); - buf.writeResourceLocation(resourceTypeId); - resource.toBuffer(buf); - buf.writeLong(resourceAmount.getAmount()); - PacketUtil.writeTrackedResource(buf, trackedResourceAmount.trackedResource()); - } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/ClientCraftingGridSource.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/ClientCraftingGridSource.java index 79450c3f0..82963ea0d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/ClientCraftingGridSource.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/ClientCraftingGridSource.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage2.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; import java.util.List; @@ -9,6 +9,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingInput; class ClientCraftingGridSource implements CraftingGridSource { private final CraftingMatrix craftingMatrix; @@ -30,7 +31,7 @@ public ResultContainer getCraftingResult() { } @Override - public NonNullList getRemainingItems(final Player player) { + public NonNullList getRemainingItems(final Player player, final CraftingInput input) { throw new UnsupportedOperationException(); } @@ -46,13 +47,13 @@ public CraftingGridRefillContext openSnapshotRefillContext(final Player player) @Override public boolean clearMatrix(final Player player, final boolean toPlayerInventory) { - Platform.INSTANCE.getClientToServerCommunications().sendCraftingGridClear(toPlayerInventory); + C2SPackets.sendCraftingGridClear(toPlayerInventory); return true; } @Override public void transferRecipe(final Player player, final List> recipe) { - Platform.INSTANCE.getClientToServerCommunications().sendCraftingGridRecipeTransfer(recipe); + C2SPackets.sendCraftingGridRecipeTransfer(recipe); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlockEntity.java index 8b092ef68..25da456ed 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlockEntity.java @@ -8,6 +8,7 @@ import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil; @@ -15,6 +16,7 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -22,13 +24,14 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; -public class CraftingGridBlockEntity extends AbstractGridBlockEntity { +public class CraftingGridBlockEntity extends AbstractGridBlockEntity implements BlockEntityWithDrops { private static final String TAG_CRAFTING_MATRIX = "matrix"; @Nullable @@ -58,13 +61,14 @@ private void setOutputSilently(final Level level) { if (level.isClientSide()) { return; } - if (currentRecipe == null || !currentRecipe.matches(craftingMatrix, level)) { + final CraftingInput input = craftingMatrix.asCraftInput(); + if (currentRecipe == null || !currentRecipe.matches(input, level)) { currentRecipe = loadRecipe(level); } if (currentRecipe == null) { setResult(ItemStack.EMPTY); } else { - setResult(currentRecipe.assemble(craftingMatrix, level.registryAccess())); + setResult(currentRecipe.assemble(input, level.registryAccess())); } } @@ -76,7 +80,7 @@ private void setResult(final ItemStack result) { private CraftingRecipe loadRecipe(final Level level) { return level .getRecipeManager() - .getRecipeFor(RecipeType.CRAFTING, craftingMatrix, level) + .getRecipeFor(RecipeType.CRAFTING, craftingMatrix.asCraftInput(), level) .map(RecipeHolder::value) .orElse(null); } @@ -89,11 +93,11 @@ ResultContainer getCraftingResult() { return craftingResult; } - NonNullList getRemainingItems(final Player player) { + NonNullList getRemainingItems(final Player player, final CraftingInput input) { if (level == null || currentRecipe == null) { return NonNullList.create(); } - return Platform.INSTANCE.getRemainingCraftingItems(player, currentRecipe, craftingMatrix); + return Platform.INSTANCE.getRemainingCraftingItems(player, currentRecipe, input); } @Override @@ -108,16 +112,16 @@ public AbstractGridContainerMenu createMenu(final int syncId, final Inventory in } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - tag.put(TAG_CRAFTING_MATRIX, ContainerUtil.write(craftingMatrix)); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + tag.put(TAG_CRAFTING_MATRIX, ContainerUtil.write(craftingMatrix, provider)); } @Override - public void load(final CompoundTag tag) { - super.load(tag); + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.loadAdditional(tag, provider); if (tag.contains(TAG_CRAFTING_MATRIX)) { - ContainerUtil.read(tag.getCompound(TAG_CRAFTING_MATRIX), craftingMatrix); + ContainerUtil.read(tag.getCompound(TAG_CRAFTING_MATRIX), craftingMatrix, provider); } } @@ -127,6 +131,15 @@ public void setLevel(final Level level) { setOutputSilently(level); } + @Override + public NonNullList getDrops() { + final NonNullList drops = NonNullList.create(); + for (int i = 0; i < craftingMatrix.getContainerSize(); ++i) { + drops.add(craftingMatrix.getItem(i)); + } + return drops; + } + Optional getNetwork() { if (!mainNode.isActive()) { return Optional.empty(); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridContainerMenu.java index 4ce75a353..c413f60df 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridContainerMenu.java @@ -18,7 +18,6 @@ import java.util.function.Predicate; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -37,8 +36,10 @@ public class CraftingGridContainerMenu extends AbstractGridContainerMenu { @Nullable private Predicate filterBeforeFilteringBasedOnCraftingMatrixItems; - public CraftingGridContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { - super(Menus.INSTANCE.getCraftingGrid(), syncId, playerInventory, buf); + public CraftingGridContainerMenu(final int syncId, + final Inventory playerInventory, + final GridData gridData) { + super(Menus.INSTANCE.getCraftingGrid(), syncId, playerInventory, gridData); this.source = new ClientCraftingGridSource(); this.player = playerInventory.player; onScreenReady(0); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridResultSlot.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridResultSlot.java index 70d19a96c..a7b5d4a10 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridResultSlot.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridResultSlot.java @@ -10,6 +10,7 @@ import net.minecraft.world.inventory.RecipeCraftingHolder; import net.minecraft.world.inventory.ResultSlot; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingInput; class CraftingGridResultSlot extends ResultSlot { private final CraftingGridSource source; @@ -30,7 +31,7 @@ public ItemStack onQuickCraft(final Player player) { final int maxCrafted = singleResultStack.getMaxStackSize(); int crafted = 0; try (CraftingGridRefillContext refillContext = source.openSnapshotRefillContext(player)) { - while (ItemStack.isSameItemSameTags(singleResultStack, getItem()) && crafted < maxCrafted) { + while (ItemStack.isSameItemSameComponents(singleResultStack, getItem()) && crafted < maxCrafted) { doTake(player, refillContext); crafted += singleResultStack.getCount(); } @@ -50,14 +51,21 @@ public void onTake(final Player player, final ItemStack stack) { private void doTake(final Player player, final CraftingGridRefillContext refillContext) { fireCraftingEvents(player, getItem().copy()); - final NonNullList remainingItems = source.getRemainingItems(player); - for (int i = 0; i < remainingItems.size(); ++i) { - final ItemStack matrixStack = source.getCraftingMatrix().getItem(i); - final ItemStack remainingItem = remainingItems.get(i); - if (!remainingItem.isEmpty()) { - useIngredientWithRemainingItem(player, i, remainingItem); - } else if (!matrixStack.isEmpty()) { - useIngredient(player, refillContext, i, matrixStack); + final CraftingInput.Positioned positioned = source.getCraftingMatrix().asPositionedCraftInput(); + final CraftingInput input = positioned.input(); + final int left = positioned.left(); + final int top = positioned.top(); + final NonNullList remainingItems = source.getRemainingItems(player, input); + for (int y = 0; y < input.height(); ++y) { + for (int x = 0; x < input.width(); ++x) { + final int index = x + left + (y + top) * source.getCraftingMatrix().getWidth(); + final ItemStack matrixStack = source.getCraftingMatrix().getItem(index); + final ItemStack remainingItem = remainingItems.get(x + y * input.width()); + if (!remainingItem.isEmpty()) { + useIngredientWithRemainingItem(player, index, remainingItem); + } else if (!matrixStack.isEmpty()) { + useIngredient(player, refillContext, index, matrixStack); + } } } source.getCraftingMatrix().changed(); @@ -69,7 +77,7 @@ private void useIngredientWithRemainingItem(final Player player, final ItemStack matrixStack = decrementMatrixSlot(index); if (matrixStack.isEmpty()) { source.getCraftingMatrix().setItem(index, remainingItem); - } else if (ItemStack.isSameItemSameTags(matrixStack, remainingItem)) { + } else if (ItemStack.isSameItemSameComponents(matrixStack, remainingItem)) { remainingItem.grow(matrixStack.getCount()); source.getCraftingMatrix().setItem(index, remainingItem); } else if (!player.getInventory().add(remainingItem)) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSource.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSource.java index 4616d26da..6d4e147be 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSource.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSource.java @@ -8,13 +8,14 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingInput; interface CraftingGridSource { CraftingMatrix getCraftingMatrix(); ResultContainer getCraftingResult(); - NonNullList getRemainingItems(Player player); + NonNullList getRemainingItems(Player player, CraftingInput input); CraftingGridRefillContext openRefillContext(); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSourceImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSourceImpl.java index 7fad1dd98..9a64e5646 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSourceImpl.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSourceImpl.java @@ -13,6 +13,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingInput; class CraftingGridSourceImpl implements CraftingGridSource { private final CraftingGridBlockEntity blockEntity; @@ -32,8 +33,8 @@ public ResultContainer getCraftingResult() { } @Override - public NonNullList getRemainingItems(final Player player) { - return blockEntity.getRemainingItems(player); + public NonNullList getRemainingItems(final Player player, final CraftingInput input) { + return blockEntity.getRemainingItems(player, input); } @Override @@ -117,7 +118,7 @@ private boolean extractFromPlayerInventory(final Player player, final ItemResour final ItemStack possibilityStack = possibility.toItemStack(); for (int i = 0; i < player.getInventory().getContainerSize(); ++i) { final ItemStack playerStack = player.getInventory().getItem(i); - if (ItemStack.isSameItemSameTags(playerStack, possibilityStack)) { + if (ItemStack.isSameItemSameComponents(playerStack, possibilityStack)) { player.getInventory().removeItem(i, 1); return true; } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridContainerMenu.java index 58270e006..407a846e4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridContainerMenu.java @@ -6,12 +6,11 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; public class GridContainerMenu extends AbstractGridContainerMenu { - public GridContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { - super(Menus.INSTANCE.getGrid(), syncId, playerInventory, buf); + public GridContainerMenu(final int syncId, final Inventory playerInventory, final GridData gridData) { + super(Menus.INSTANCE.getGrid(), syncId, playerInventory, gridData); onScreenReady(0); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridData.java new file mode 100644 index 000000000..886921249 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridData.java @@ -0,0 +1,45 @@ +package com.refinedmods.refinedstorage2.platform.common.grid; + +import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; +import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage2.platform.api.grid.Grid; +import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage2.platform.common.storage.StorageCodecs; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record GridData(boolean active, List resources) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.BOOL, GridData::active, + ByteBufCodecs.collection(ArrayList::new, StreamCodec.composite( + ResourceCodecs.AMOUNT_STREAM_CODEC, GridResource::resourceAmount, + StorageCodecs.TRACKED_RESOURCE_OPTIONAL_STREAM_CODEC, GridResource::trackedResource, + GridResource::new + )), GridData::resources, + GridData::new + ); + + public static GridData of(final Grid grid) { + return new GridData( + grid.isGridActive(), + grid.getResources(PlayerActor.class).stream().map(GridResource::of).toList() + ); + } + + public record GridResource(ResourceAmount resourceAmount, Optional trackedResource) { + static GridResource of(final TrackedResourceAmount trackedResourceAmount) { + return new GridResource( + trackedResourceAmount.resourceAmount(), + Optional.ofNullable(trackedResourceAmount.trackedResource()) + ); + } + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/PortableGridData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/PortableGridData.java new file mode 100644 index 000000000..f4e3f8131 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/PortableGridData.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage2.platform.common.grid; + +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; + +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record PortableGridData(GridData gridData, long stored, long capacity, Optional slotReference) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + GridData.STREAM_CODEC, PortableGridData::gridData, + ByteBufCodecs.VAR_LONG, PortableGridData::stored, + ByteBufCodecs.VAR_LONG, PortableGridData::capacity, + ByteBufCodecs.optional(SlotReferenceFactory.STREAM_CODEC), PortableGridData::slotReference, + PortableGridData::new + ); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridContainerMenu.java index 9803393a5..a92fe6bc2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridContainerMenu.java @@ -1,17 +1,17 @@ package com.refinedmods.refinedstorage2.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.grid.Grid; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; public class WirelessGridContainerMenu extends AbstractGridContainerMenu { - public WirelessGridContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { - super(Menus.INSTANCE.getWirelessGrid(), syncId, playerInventory, buf); - this.disabledSlot = PlatformApi.INSTANCE.getSlotReference(buf).orElse(null); + public WirelessGridContainerMenu(final int syncId, + final Inventory playerInventory, + final WirelessGridData wirelessGridData) { + super(Menus.INSTANCE.getWirelessGrid(), syncId, playerInventory, wirelessGridData.gridData()); + this.disabledSlot = wirelessGridData.slotReference(); onScreenReady(0); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridData.java new file mode 100644 index 000000000..91b59f41b --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridData.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage2.platform.common.grid; + +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; + +public record WirelessGridData(GridData gridData, SlotReference slotReference) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + GridData.STREAM_CODEC, WirelessGridData::gridData, + SlotReferenceFactory.STREAM_CODEC, WirelessGridData::slotReference, + WirelessGridData::new + ); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridExtendedMenuProvider.java index f8d5bd446..44e18b89a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridExtendedMenuProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridExtendedMenuProvider.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage2.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.grid.Grid; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; @@ -8,14 +7,14 @@ import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; -class WirelessGridExtendedMenuProvider implements ExtendedMenuProvider { +class WirelessGridExtendedMenuProvider implements ExtendedMenuProvider { private final Grid grid; private final SlotReference slotReference; @@ -25,9 +24,16 @@ class WirelessGridExtendedMenuProvider implements ExtendedMenuProvider { } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - PlatformApi.INSTANCE.writeGridScreenOpeningData(grid, buf); - PlatformApi.INSTANCE.writeSlotReference(slotReference, buf); + public WirelessGridData getMenuData() { + return new WirelessGridData( + GridData.of(grid), + slotReference + ); + } + + @Override + public StreamEncoder getMenuCodec() { + return WirelessGridData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridExtractionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridExtractionStrategy.java index a4f8d6e6f..17fb83fb5 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridExtractionStrategy.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridExtractionStrategy.java @@ -3,14 +3,14 @@ import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; public class ClientGridExtractionStrategy implements GridExtractionStrategy { @Override public boolean onExtract(final PlatformResourceKey resource, final GridExtractMode extractMode, final boolean cursor) { - Platform.INSTANCE.getClientToServerCommunications().sendGridExtract(resource, extractMode, cursor); + C2SPackets.sendGridExtract(resource, extractMode, cursor); return true; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridInsertionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridInsertionStrategy.java index 8a005135c..1dfe32887 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridInsertionStrategy.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridInsertionStrategy.java @@ -2,12 +2,12 @@ import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; public class ClientGridInsertionStrategy implements GridInsertionStrategy { @Override public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { - Platform.INSTANCE.getClientToServerCommunications().sendGridInsert(insertMode, tryAlternatives); + C2SPackets.sendGridInsert(insertMode, tryAlternatives); return true; } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridScrollingStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridScrollingStrategy.java index c3f1dbdda..ceebdbc5c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridScrollingStrategy.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridScrollingStrategy.java @@ -3,12 +3,12 @@ import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; public class ClientGridScrollingStrategy implements GridScrollingStrategy { @Override public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { - Platform.INSTANCE.getClientToServerCommunications().sendGridScroll(resource, scrollMode, slotIndex); + C2SPackets.sendGridScroll(resource, scrollMode, slotIndex); return true; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractItemGridResourceFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractItemGridResourceFactory.java index 19fb2e107..3ea3c8849 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractItemGridResourceFactory.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractItemGridResourceFactory.java @@ -42,7 +42,7 @@ public Optional apply(final ResourceAmount resourceAmount) { private String getTooltip(final ItemStack itemStack) { return itemStack - .getTooltipLines(null, TooltipFlag.ADVANCED) + .getTooltipLines(Item.TooltipContext.EMPTY, null, TooltipFlag.ADVANCED) .stream() .map(Component::getString) .collect(Collectors.joining("\n")); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlockEntity.java index 71a15ddaa..e7923471b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlockEntity.java @@ -12,18 +12,20 @@ import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -33,7 +35,7 @@ public class InterfaceBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider, BlockEntityWithDrops { + implements NetworkNodeExtendedMenuProvider, BlockEntityWithDrops { private static final String TAG_EXPORT_ITEMS = "ei"; private static final int EXPORT_SLOTS = 9; @@ -67,10 +69,33 @@ static ResourceContainer createFilterContainer() { ); } + static ResourceContainer createFilterContainer(final InterfaceData interfaceData) { + final ResourceContainer filterContainer = createFilterContainer(); + final ResourceContainerData resourceContainerData = interfaceData.filterContainerData(); + for (int i = 0; i < resourceContainerData.resources().size(); ++i) { + final int ii = i; + resourceContainerData.resources().get(i).ifPresent(resource -> filterContainer.set(ii, resource)); + } + return filterContainer; + } + static ExportedResourcesContainer createExportedResourcesContainer(final FilterWithFuzzyMode filter) { return new ExportedResourcesContainer(EXPORT_SLOTS, filter); } + static ResourceContainer createExportedResourcesContainer(final InterfaceData interfaceData, + final FilterWithFuzzyMode filter) { + final ExportedResourcesContainer exportedResourcesContainer = createExportedResourcesContainer(filter); + final ResourceContainerData resourceContainerData = interfaceData.exportedResourcesContainerData(); + for (int i = 0; i < resourceContainerData.resources().size(); ++i) { + final int ii = i; + resourceContainerData.resources().get(i).ifPresent( + resource -> exportedResourcesContainer.set(ii, resource) + ); + } + return exportedResourcesContainer; + } + static long getTransferQuota(final ResourceKey resource) { if (resource instanceof PlatformResourceKey platformResource) { return platformResource.getInterfaceExportLimit(); @@ -79,29 +104,29 @@ static long getTransferQuota(final ResourceKey resource) { } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - tag.put(TAG_EXPORT_ITEMS, exportedResources.toTag()); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + tag.put(TAG_EXPORT_ITEMS, exportedResources.toTag(provider)); } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); - filter.save(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); + filter.save(tag, provider); } @Override - public void load(final CompoundTag tag) { + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_EXPORT_ITEMS)) { - exportedResources.fromTag(tag.getCompound(TAG_EXPORT_ITEMS)); + exportedResources.fromTag(tag.getCompound(TAG_EXPORT_ITEMS), provider); } - super.load(tag); + super.loadAdditional(tag, provider); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); - filter.load(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); + filter.load(tag, provider); } boolean isFuzzyMode() { @@ -134,9 +159,16 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - filter.getFilterContainer().writeToUpdatePacket(buf); - exportedResources.writeToUpdatePacket(buf); + public InterfaceData getMenuData() { + return new InterfaceData( + ResourceContainerData.of(filter.getFilterContainer()), + ResourceContainerData.of(exportedResources) + ); + } + + @Override + public StreamEncoder getMenuCodec() { + return InterfaceData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceContainerMenu.java index 0c673c693..745466840 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceContainerMenu.java @@ -11,7 +11,6 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; @@ -45,14 +44,16 @@ public class InterfaceContainerMenu extends AbstractResourceContainerMenu { )); } - public InterfaceContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public InterfaceContainerMenu(final int syncId, + final Inventory playerInventory, + final InterfaceData interfaceData) { super(Menus.INSTANCE.getInterface(), syncId); - final ResourceContainer filterContainer = InterfaceBlockEntity.createFilterContainer(); + final ResourceContainer filterContainer = InterfaceBlockEntity.createFilterContainer(interfaceData); final ResourceContainer exportedResources = InterfaceBlockEntity.createExportedResourcesContainer( + interfaceData, FilterWithFuzzyMode.create(filterContainer, null) ); addSlots(playerInventory.player, filterContainer, exportedResources, exportedResources.toItemContainer()); - initializeResourceSlots(buf); registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceData.java new file mode 100644 index 000000000..a41abb0a4 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceData.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage2.platform.common.iface; + +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; + +public record InterfaceData(ResourceContainerData filterContainerData, + ResourceContainerData exportedResourcesContainerData) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ResourceContainerData.STREAM_CODEC, InterfaceData::filterContainerData, + ResourceContainerData.STREAM_CODEC, InterfaceData::exportedResourcesContainerData, + InterfaceData::new + ); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlockEntity.java index fab93c5e5..98443f735 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlockEntity.java @@ -14,8 +14,9 @@ import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings; import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; @@ -26,11 +27,12 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -40,7 +42,7 @@ public class ImporterBlockEntity extends AbstractUpgradeableNetworkNodeContainerBlockEntity - implements AmountOverride, NetworkNodeMenuProvider { + implements AmountOverride, NetworkNodeExtendedMenuProvider { private static final Logger LOGGER = LoggerFactory.getLogger(ImporterBlockEntity.class); private static final String TAG_FILTER_MODE = "fim"; @@ -82,19 +84,19 @@ private List createStrategies(final ServerLevel server } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(mainNode.getFilterMode())); - filter.save(tag); + filter.save(tag, provider); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); if (tag.contains(TAG_FILTER_MODE)) { mainNode.setFilterMode(FilterModeSettings.getFilterMode(tag.getInt(TAG_FILTER_MODE))); } - filter.load(tag); + filter.load(tag, provider); } void setFilters(final Set filters) { @@ -125,8 +127,13 @@ protected void setEnergyUsage(final long upgradeEnergyUsage) { } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - filter.getFilterContainer().writeToUpdatePacket(buf); + public ResourceContainerData getMenuData() { + return ResourceContainerData.of(filter.getFilterContainer()); + } + + @Override + public StreamEncoder getMenuCodec() { + return ResourceContainerData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterContainerMenu.java index fefe5d2fc..dee71270f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterContainerMenu.java @@ -8,10 +8,10 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -21,12 +21,14 @@ public class ImporterContainerMenu extends AbstractSimpleFilterContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "importer.filter_help"); - public ImporterContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public ImporterContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { super( Menus.INSTANCE.getImporter(), syncId, playerInventory.player, - buf, + resourceContainerData, UpgradeDestinations.IMPORTER, FILTER_HELP ); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/CableBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/CableBlock.java index 7cad3973c..38a566421 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/CableBlock.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/CableBlock.java @@ -20,6 +20,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.context.BlockPlaceContext; @@ -41,10 +42,13 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public class CableBlock extends AbstractColoredBlock implements ColorableBlock, SimpleWaterloggedBlock, EntityBlock { private static final AbstractBlockEntityTicker> TICKER = new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getCable); + private static final Component HELP = createTranslation("item", "cable.help"); public CableBlock(final DyeColor color, final MutableComponent name) { super(BlockConstants.CABLE_PROPERTIES, color, name); @@ -80,11 +84,7 @@ public BlockState updateShape(final BlockState state, } @Override - @SuppressWarnings("deprecation") - public boolean isPathfindable(final BlockState state, - final BlockGetter world, - final BlockPos pos, - final PathComputationType type) { + protected boolean isPathfindable(final BlockState state, final PathComputationType type) { return false; } @@ -134,6 +134,6 @@ public BlockEntityTicker getTicker(final Level level, @Override public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this); + return new NetworkNodeBlockItem(this, HELP); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItem.java index 880c9702f..4adc7cd2d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItem.java @@ -1,20 +1,17 @@ package com.refinedmods.refinedstorage2.platform.common.networking; import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; import java.util.List; import java.util.Optional; -import javax.annotation.Nullable; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.GlobalPos; -import net.minecraft.core.registries.Registries; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResultHolder; @@ -33,13 +30,9 @@ public class NetworkCardItem extends Item { private static final MutableComponent UNBOUND_HELP = createTranslation("item", "network_card.unbound_help"); private static final MutableComponent BOUND_HELP = createTranslation("item", "network_card.bound_help"); - private static final MutableComponent UNBOUND = createTranslation("item", "network_card.unbound") .withStyle(ChatFormatting.RED); - private static final String TAG_POS = "pos"; - private static final String TAG_DIMENSION = "dim"; - public NetworkCardItem() { super(new Item.Properties().stacksTo(1)); } @@ -54,11 +47,9 @@ public InteractionResult useOn(final UseOnContext ctx) { if (!(blockState.getBlock() instanceof NetworkReceiverBlock)) { return InteractionResult.CONSUME; } - final CompoundTag tag = new CompoundTag(); - tag.putLong(TAG_POS, pos.asLong()); final ResourceKey dimension = ctx.getLevel().dimension(); - tag.putString(TAG_DIMENSION, dimension.location().toString()); - ctx.getItemInHand().setTag(tag); + final GlobalPos location = GlobalPos.of(dimension, pos); + ctx.getItemInHand().set(DataComponents.INSTANCE.getNetworkLocation(), location); ctx.getPlayer().sendSystemMessage(createTranslation( "item", "network_card.bound", @@ -83,10 +74,10 @@ public InteractionResultHolder use(final Level level, final Player pl @Override public void appendHoverText(final ItemStack stack, - @Nullable final Level level, + final TooltipContext context, final List lines, final TooltipFlag flag) { - super.appendHoverText(stack, level, lines, flag); + super.appendHoverText(stack, context, lines, flag); getLocation(stack).ifPresentOrElse(location -> lines.add(createTranslation( "item", "network_card.bound", @@ -97,26 +88,8 @@ public void appendHoverText(final ItemStack stack, ).withStyle(ChatFormatting.GRAY)), () -> lines.add(UNBOUND)); } - @Nullable - private ResourceKey getDimension(final String dimensionKey) { - final ResourceLocation name = ResourceLocation.tryParse(dimensionKey); - if (name == null) { - return null; - } - return ResourceKey.create(Registries.DIMENSION, name); - } - Optional getLocation(final ItemStack stack) { - final CompoundTag tag = stack.getTag(); - if (tag == null) { - return Optional.empty(); - } - final ResourceKey dimension = getDimension(tag.getString(TAG_DIMENSION)); - if (dimension == null) { - return Optional.empty(); - } - final BlockPos pos = BlockPos.of(tag.getLong(TAG_POS)); - return Optional.of(GlobalPos.of(dimension, pos)); + return Optional.ofNullable(stack.get(DataComponents.INSTANCE.getNetworkLocation())); } @Override @@ -125,6 +98,6 @@ public Optional getTooltipImage(final ItemStack stack) { } boolean isActive(final ItemStack stack) { - return stack.getTag() != null && stack.getTag().contains(TAG_POS) && stack.getTag().contains(TAG_DIMENSION); + return stack.has(DataComponents.INSTANCE.getNetworkLocation()); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItemPropertyFunction.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItemPropertyFunction.java index f807af445..54b3f4338 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItemPropertyFunction.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItemPropertyFunction.java @@ -8,8 +8,10 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + public class NetworkCardItemPropertyFunction implements ClampedItemPropertyFunction { - public static final ResourceLocation NAME = new ResourceLocation("active"); + public static final ResourceLocation NAME = createIdentifier("network_card_active"); @Override public float unclampedCall(final ItemStack itemStack, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlock.java index 3629e9cd1..9268ab892 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlock.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlock.java @@ -13,6 +13,7 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.Level; @@ -25,11 +26,14 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public class NetworkReceiverBlock extends AbstractColoredBlock implements EntityBlock { public static final BooleanProperty ACTIVE = BooleanProperty.create("active"); private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getNetworkReceiver, ACTIVE); + private static final Component HELP = createTranslation("item", "network_receiver.help"); public NetworkReceiverBlock(final DyeColor color, final MutableComponent name) { super(BlockConstants.PROPERTIES, color, name); @@ -67,7 +71,7 @@ public BlockEntityTicker getTicker(final Level level, @Override public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this); + return new NetworkNodeBlockItem(this, HELP); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlock.java index 7c43ccb02..98f8471b3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlock.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlock.java @@ -11,6 +11,7 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.Level; @@ -23,12 +24,16 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.EnumProperty; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public class NetworkTransmitterBlock extends AbstractColoredBlock implements EntityBlock { public static final EnumProperty STATE = EnumProperty.create( "state", NetworkTransmitterState.class ); + private static final Component HELP = createTranslation("item", "network_transmitter.help"); + private static final AbstractBlockEntityTicker TICKER = new NetworkTransmitterBlockEntityTicker(); @@ -68,7 +73,7 @@ public BlockEntityTicker getTicker(final Level level, @Override public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this); + return new NetworkNodeBlockItem(this, HELP); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntity.java index 004f4c99d..83c66c6ea 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntity.java @@ -8,7 +8,7 @@ import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; import javax.annotation.Nullable; @@ -16,13 +16,14 @@ import com.google.common.util.concurrent.RateLimiter; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -36,16 +37,16 @@ public class NetworkTransmitterBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider, BlockEntityWithDrops { + implements NetworkNodeExtendedMenuProvider, BlockEntityWithDrops { private static final Logger LOGGER = LoggerFactory.getLogger(NetworkTransmitterBlockEntity.class); - private static final NetworkTransmitterStatus INACTIVE = NetworkTransmitterStatus.message( + private static final NetworkTransmitterData INACTIVE = NetworkTransmitterData.message( createTranslation("gui", "network_transmitter.status.inactive") ); - private static final NetworkTransmitterStatus MISSING_NETWORK_CARD = NetworkTransmitterStatus.error( + private static final NetworkTransmitterData MISSING_NETWORK_CARD = NetworkTransmitterData.error( createTranslation("gui", "network_transmitter.status.missing_network_card").withStyle(ChatFormatting.DARK_RED) ); - private static final NetworkTransmitterStatus RECEIVER_UNREACHABLE = NetworkTransmitterStatus.error( + private static final NetworkTransmitterData RECEIVER_UNREACHABLE = NetworkTransmitterData.error( createTranslation("gui", "network_transmitter.status.receiver_unreachable").withStyle(ChatFormatting.DARK_RED) ); @@ -102,7 +103,7 @@ private NetworkTransmitterState calculateState() { return receiverFound ? NetworkTransmitterState.ACTIVE : NetworkTransmitterState.ERROR; } - NetworkTransmitterStatus getStatus() { + NetworkTransmitterData getStatus() { final Network network = mainNode.getNetwork(); if (!mainNode.isActive() || network == null || level == null) { return INACTIVE; @@ -119,7 +120,7 @@ NetworkTransmitterStatus getStatus() { "gui", "network_transmitter.status.transmitting", receiverKey.getDistance(worldPosition)) : receiverKey.getDimensionName(); - return NetworkTransmitterStatus.message(message); + return NetworkTransmitterData.message(message); } @Override @@ -152,16 +153,19 @@ Container getNetworkCardInventory() { } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - tag.put(TAG_NETWORK_CARD_INVENTORY, networkCardInventory.createTag()); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + tag.put(TAG_NETWORK_CARD_INVENTORY, networkCardInventory.createTag(provider)); } @Override - public void load(final CompoundTag tag) { - super.load(tag); + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.loadAdditional(tag, provider); if (tag.contains(TAG_NETWORK_CARD_INVENTORY)) { - networkCardInventory.fromTag(tag.getList(TAG_NETWORK_CARD_INVENTORY, Tag.TAG_COMPOUND)); + networkCardInventory.fromTag( + tag.getList(TAG_NETWORK_CARD_INVENTORY, Tag.TAG_COMPOUND), + provider + ); } updateReceiverLocation(); } @@ -177,10 +181,13 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - final NetworkTransmitterStatus status = getStatus(); - buf.writeBoolean(status.error()); - buf.writeComponent(status.message()); + public NetworkTransmitterData getMenuData() { + return getStatus(); + } + + @Override + public StreamEncoder getMenuCodec() { + return NetworkTransmitterData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterContainerMenu.java index 83acf1856..b5c8d47d2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterContainerMenu.java @@ -1,6 +1,5 @@ package com.refinedmods.refinedstorage2.platform.common.networking; -import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.content.Menus; import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; @@ -8,11 +7,11 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; import javax.annotation.Nullable; import com.google.common.util.concurrent.RateLimiter; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; @@ -23,7 +22,7 @@ public class NetworkTransmitterContainerMenu extends AbstractBaseContainerMenu { private final NetworkTransmitterBlockEntity blockEntity; private final Player player; private final RateLimiter statusUpdateRateLimiter = RateLimiter.create(2); - private NetworkTransmitterStatus status; + private NetworkTransmitterData status; NetworkTransmitterContainerMenu(final int syncId, final Inventory playerInventory, @@ -42,12 +41,12 @@ public class NetworkTransmitterContainerMenu extends AbstractBaseContainerMenu { public NetworkTransmitterContainerMenu(final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf) { + final NetworkTransmitterData status) { super(Menus.INSTANCE.getNetworkTransmitter(), syncId); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); this.blockEntity = null; this.player = playerInventory.player; - this.status = new NetworkTransmitterStatus(buf.readBoolean(), buf.readComponent()); + this.status = status; addSlots(playerInventory, new NetworkCardInventory()); } @@ -60,19 +59,16 @@ public void broadcastChanges() { if (!statusUpdateRateLimiter.tryAcquire()) { return; } - final NetworkTransmitterStatus newStatus = blockEntity.getStatus(); + final NetworkTransmitterData newStatus = blockEntity.getStatus(); if (newStatus.message().equals(status.message())) { return; } updateStatus(serverPlayer, newStatus); } - private void updateStatus(final ServerPlayer serverPlayer, final NetworkTransmitterStatus newStatus) { + private void updateStatus(final ServerPlayer serverPlayer, final NetworkTransmitterData newStatus) { this.status = newStatus; - Platform.INSTANCE.getServerToClientCommunications().sendNetworkTransmitterStatus( - serverPlayer, - newStatus - ); + S2CPackets.sendNetworkTransmitterStatus(serverPlayer, newStatus); } private void addSlots(final Inventory playerInventory, final Container networkCardInventory) { @@ -87,11 +83,11 @@ private void addSlots(final Inventory playerInventory, final Container networkCa transferManager.addBiTransfer(playerInventory, networkCardInventory); } - NetworkTransmitterStatus getStatus() { + NetworkTransmitterData getStatus() { return status; } - public void setStatus(final NetworkTransmitterStatus status) { + public void setStatus(final NetworkTransmitterData status) { this.status = status; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterData.java new file mode 100644 index 000000000..a5bd82539 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterData.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage2.platform.common.networking; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentSerialization; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record NetworkTransmitterData(boolean error, Component message) { + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.BOOL, NetworkTransmitterData::error, + ComponentSerialization.STREAM_CODEC, NetworkTransmitterData::message, + NetworkTransmitterData::new + ); + + static NetworkTransmitterData error(final Component message) { + return new NetworkTransmitterData(true, message); + } + + static NetworkTransmitterData message(final Component message) { + return new NetworkTransmitterData(false, message); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterScreen.java index 56b42cc98..b9033acce 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterScreen.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterScreen.java @@ -33,7 +33,7 @@ protected void init() { @Override protected void renderLabels(final GuiGraphics graphics, final int mouseX, final int mouseY) { super.renderLabels(graphics, mouseX, mouseY); - final NetworkTransmitterStatus status = getMenu().getStatus(); + final NetworkTransmitterData status = getMenu().getStatus(); final int displayTextX = 51; if (status.error()) { graphics.blit(TextureIds.ICONS, displayTextX, 23, 246, 148, 10, 10); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterStatus.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterStatus.java deleted file mode 100644 index 4fc4aa4ed..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterStatus.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import net.minecraft.network.chat.Component; - -public record NetworkTransmitterStatus(boolean error, Component message) { - static NetworkTransmitterStatus error(final Component message) { - return new NetworkTransmitterStatus(true, message); - } - - static NetworkTransmitterStatus message(final Component message) { - return new NetworkTransmitterStatus(false, message); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlockEntity.java index b2b093bf6..41c0d4397 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlockEntity.java @@ -14,8 +14,9 @@ import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings; import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import java.util.HashSet; @@ -24,10 +25,11 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -36,7 +38,7 @@ import static java.util.Objects.requireNonNull; public class RelayBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider { + implements NetworkNodeExtendedMenuProvider { private static final String TAG_PASS_THROUGH = "passthrough"; private static final String TAG_PASS_ENERGY = "passenergy"; private static final String TAG_PASS_SECURITY = "passsecurity"; @@ -180,8 +182,13 @@ protected InWorldNetworkNodeContainer createMainContainer(final RelayInputNetwor } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - filter.getFilterContainer().writeToUpdatePacket(buf); + public ResourceContainerData getMenuData() { + return ResourceContainerData.of(filter.getFilterContainer()); + } + + @Override + public StreamEncoder getMenuCodec() { + return ResourceContainerData.STREAM_CODEC; } @Override @@ -196,9 +203,9 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); - filter.save(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); + filter.save(tag, provider); tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(filterMode)); tag.putBoolean(TAG_PASS_THROUGH, passThrough); tag.putBoolean(TAG_PASS_ENERGY, mainNode.hasComponentType(RelayComponentType.ENERGY)); @@ -209,9 +216,9 @@ public void writeConfiguration(final CompoundTag tag) { } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); - filter.load(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); + filter.load(tag, provider); if (tag.contains(TAG_FILTER_MODE)) { filterMode = FilterModeSettings.getFilterMode(tag.getInt(TAG_FILTER_MODE)); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayContainerMenu.java index 86a6494e7..bfa0d1017 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayContainerMenu.java @@ -10,10 +10,10 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -26,12 +26,14 @@ public class RelayContainerMenu extends AbstractSimpleFilterContainerMenu permissions = new ArrayList<>(); + private final List permissions; protected AbstractSecurityCardContainerMenu(final MenuType menuType, final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf) { + final SecurityCardData securityCardData) { super(menuType, syncId); this.playerInventory = playerInventory; - this.disabledSlot = PlatformApi.INSTANCE.getSlotReference(buf).orElse(null); - final int amountOfPermissions = buf.readInt(); - for (int i = 0; i < amountOfPermissions; ++i) { - final ResourceLocation id = buf.readResourceLocation(); - final boolean allowed = buf.readBoolean(); - final boolean dirty = buf.readBoolean(); - PlatformApi.INSTANCE.getPermissionRegistry().get(id).ifPresent(permission -> permissions.add(new Permission( - permission, - allowed, - dirty - ))); - } + this.disabledSlot = securityCardData.slotReference(); + this.permissions = securityCardData.permissions(); } protected AbstractSecurityCardContainerMenu(final MenuType menuType, @@ -48,10 +35,11 @@ protected AbstractSecurityCardContainerMenu(final MenuType menuType, super(menuType, syncId); this.playerInventory = playerInventory; this.disabledSlot = disabledSlot; + this.permissions = new ArrayList<>(); onScreenReady(0); } - List getPermissions() { + List getPermissions() { return permissions; } @@ -61,59 +49,57 @@ public void onScreenReady(final int playerInventoryY) { addPlayerInventory(playerInventory, 8, playerInventoryY); } - public void setPermission(final ResourceLocation permissionId, final boolean allowed) { + public void setPermission(final PlatformPermission permission, final boolean allowed) { if (disabledSlot == null) { return; } - disabledSlot.resolve(playerInventory.player).ifPresent(stack -> setPermission(stack, permissionId, allowed)); + disabledSlot.resolve(playerInventory.player).ifPresent(stack -> setPermission(stack, permission, allowed)); } - private void setPermission(final ItemStack stack, final ResourceLocation permissionId, final boolean allowed) { - if (stack.getItem() instanceof AbstractSecurityCardItem securityCardItem) { - securityCardItem.setPermission(stack, permissionId, allowed); + private void setPermission(final ItemStack stack, final PlatformPermission permission, final boolean allowed) { + if (stack.getItem() instanceof AbstractSecurityCardItem securityCardItem) { + securityCardItem.setPermission(stack, permission, allowed); } } - public void resetPermission(final ResourceLocation permissionId) { + public void resetPermissionServer(final PlatformPermission permission) { if (disabledSlot == null) { return; } - disabledSlot.resolve(playerInventory.player).ifPresent(stack -> resetPermission(stack, permissionId)); + disabledSlot.resolve(playerInventory.player).ifPresent(stack -> resetPermissionServer(stack, permission)); } - private void resetPermission(final ItemStack stack, final ResourceLocation permissionId) { - if (stack.getItem() instanceof AbstractSecurityCardItem securityCardItem) { - securityCardItem.resetPermission(stack, permissionId); + private void resetPermissionServer(final ItemStack stack, final PlatformPermission permission) { + if (stack.getItem() instanceof AbstractSecurityCardItem securityCardItem) { + securityCardItem.resetPermission(stack, permission); } } - Permission resetPermission(final PlatformPermission permission) { + SecurityCardData.Permission resetPermission(final PlatformPermission permission) { final boolean allowed = permission.isAllowedByDefault(); - Platform.INSTANCE.getClientToServerCommunications().sendSecurityCardResetPermission(permission); + C2SPackets.sendSecurityCardResetPermission(permission); return updatePermissionLocally(permission, allowed, false); } - Permission changePermission(final PlatformPermission permission, final boolean selected) { - Platform.INSTANCE.getClientToServerCommunications().sendSecurityCardPermission(permission, selected); + SecurityCardData.Permission changePermission(final PlatformPermission permission, final boolean selected) { + C2SPackets.sendSecurityCardPermission(permission, selected); return updatePermissionLocally(permission, selected, true); } - private Permission updatePermissionLocally(final PlatformPermission permission, - final boolean allowed, - final boolean dirty) { - final Permission localPermission = permissions.stream().filter(p -> p.platformPermission == permission) + private SecurityCardData.Permission updatePermissionLocally(final PlatformPermission permission, + final boolean allowed, + final boolean dirty) { + final SecurityCardData.Permission + localPermission = permissions.stream().filter(p -> p.permission() == permission) .findFirst() .orElseThrow(); final int index = permissions.indexOf(localPermission); - final Permission updatedLocalPermission = new Permission( - localPermission.platformPermission, + final SecurityCardData.Permission updatedLocalPermission = new SecurityCardData.Permission( + localPermission.permission(), allowed, dirty ); permissions.set(index, updatedLocalPermission); return updatedLocalPermission; } - - record Permission(PlatformPermission platformPermission, boolean allowed, boolean dirty) { - } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java index 92247cfc1..bafbdfe33 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java @@ -3,40 +3,30 @@ import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; import java.util.List; import java.util.Set; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; - -abstract class AbstractSecurityCardExtendedMenuProvider implements ExtendedMenuProvider { - private final SlotReference slotReference; +abstract class AbstractSecurityCardExtendedMenuProvider implements ExtendedMenuProvider { private final SecurityPolicy securityPolicy; private final Set dirtyPermissions; - AbstractSecurityCardExtendedMenuProvider(final SlotReference slotReference, - final SecurityPolicy securityPolicy, + AbstractSecurityCardExtendedMenuProvider(final SecurityPolicy securityPolicy, final Set dirtyPermissions) { - this.slotReference = slotReference; this.securityPolicy = securityPolicy; this.dirtyPermissions = dirtyPermissions; } - @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - PlatformApi.INSTANCE.writeSlotReference(slotReference, buf); - - final List permissions = PlatformApi.INSTANCE.getPermissionRegistry().getAll(); - buf.writeInt(permissions.size()); - for (final PlatformPermission permission : permissions) { - final ResourceLocation id = PlatformApi.INSTANCE.getPermissionRegistry().getId(permission).orElseThrow(); - buf.writeResourceLocation(id); - buf.writeBoolean(securityPolicy.isAllowed(permission)); - buf.writeBoolean(dirtyPermissions.contains(permission)); - } + protected final List getDataPermissions() { + return PlatformApi.INSTANCE.getPermissionRegistry().getAll().stream().map(this::toDataPermission).toList(); + } + + private SecurityCardData.Permission toDataPermission(final PlatformPermission permission) { + return new SecurityCardData.Permission( + permission, + securityPolicy.isAllowed(permission), + dirtyPermissions.contains(permission) + ); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardItem.java index beef7bf88..201734078 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardItem.java @@ -7,20 +7,17 @@ import com.refinedmods.refinedstorage2.platform.api.security.SecurityPolicyContainerItem; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; -import javax.annotation.Nullable; import net.minecraft.ChatFormatting; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -32,19 +29,17 @@ import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; -abstract class AbstractSecurityCardItem extends Item implements SecurityPolicyContainerItem { - private static final String TAG_PERMISSIONS = "permissions"; - +abstract class AbstractSecurityCardItem extends Item implements SecurityPolicyContainerItem { protected AbstractSecurityCardItem(final Properties properties) { super(properties); } @Override public void appendHoverText(final ItemStack stack, - @Nullable final Level level, + final TooltipContext context, final List lines, final TooltipFlag flag) { - super.appendHoverText(stack, level, lines, flag); + super.appendHoverText(stack, context, lines, flag); getPolicy(stack).ifPresent(policy -> appendHoverText(lines, policy, getDirtyPermissions(stack))); } @@ -83,6 +78,7 @@ private void doUse(final InteractionHand hand, final ServerPlayer player, final getPolicy(stack).ifPresent(policy -> { final Set dirtyPermissions = getDirtyPermissions(stack); Platform.INSTANCE.getMenuOpener().openMenu(player, createMenuProvider( + player.server, PlatformApi.INSTANCE.createInventorySlotReference(player, hand), policy, dirtyPermissions, @@ -92,35 +88,35 @@ private void doUse(final InteractionHand hand, final ServerPlayer player, final } private void clearConfiguration(final ServerPlayer player, final ItemStack stack) { - stack.setTag(null); + stack.remove(DataComponents.INSTANCE.getSecurityCardPermissions()); player.sendSystemMessage(createTranslation("item", "security_card.cleared_configuration")); } - abstract AbstractSecurityCardExtendedMenuProvider createMenuProvider(SlotReference slotReference, - SecurityPolicy policy, - Set dirtyPermissions, - ItemStack stack); + abstract AbstractSecurityCardExtendedMenuProvider createMenuProvider( + MinecraftServer server, + SlotReference slotReference, + SecurityPolicy policy, + Set dirtyPermissions, + ItemStack stack + ); @Override public Optional getPolicy(final ItemStack stack) { if (!isValid(stack)) { return Optional.empty(); } - if (stack.getTag() == null || !stack.getTag().contains(TAG_PERMISSIONS)) { + final SecurityCardPermissions permissions = stack.get(DataComponents.INSTANCE.getSecurityCardPermissions()); + if (permissions == null) { return Optional.of(PlatformApi.INSTANCE.createDefaultSecurityPolicy()); } - final CompoundTag permissionsTag = stack.getTag().getCompound(TAG_PERMISSIONS); - return Optional.of(createPolicy(permissionsTag)); + return Optional.of(createPolicy(permissions)); } - private SecurityPolicy createPolicy(final CompoundTag permissionsTag) { + private SecurityPolicy createPolicy(final SecurityCardPermissions permissions) { final Set allowedPermissions = new HashSet<>(); for (final PlatformPermission permission : PlatformApi.INSTANCE.getPermissionRegistry().getAll()) { - final ResourceLocation permissionId = PlatformApi.INSTANCE.getPermissionRegistry() - .getId(permission) - .orElseThrow(); - final boolean dirty = permissionsTag.contains(permissionId.toString()); - final boolean didExplicitlyAllow = dirty && permissionsTag.getBoolean(permissionId.toString()); + final boolean dirty = permissions.isDirty(permission); + final boolean didExplicitlyAllow = dirty && permissions.isAllowed(permission); final boolean isAllowedByDefault = !dirty && permission.isAllowedByDefault(); if (didExplicitlyAllow || isAllowedByDefault) { allowedPermissions.add(permission); @@ -135,24 +131,27 @@ public boolean isValid(final ItemStack stack) { } Set getDirtyPermissions(final ItemStack stack) { - if (stack.getTag() == null || !stack.getTag().contains(TAG_PERMISSIONS)) { - return Collections.emptySet(); - } - final CompoundTag permissionsTag = stack.getTag().getCompound(TAG_PERMISSIONS); - return permissionsTag.getAllKeys() - .stream() - .map(ResourceLocation::new) - .flatMap(id -> PlatformApi.INSTANCE.getPermissionRegistry().get(id).stream()) - .collect(Collectors.toSet()); + return stack.getOrDefault(DataComponents.INSTANCE.getSecurityCardPermissions(), SecurityCardPermissions.EMPTY) + .permissions() + .keySet(); } - void setPermission(final ItemStack stack, final ResourceLocation permissionId, final boolean allowed) { - final CompoundTag permissionsTag = stack.getOrCreateTagElement(TAG_PERMISSIONS); - permissionsTag.putBoolean(permissionId.toString(), allowed); + void setPermission(final ItemStack stack, final PlatformPermission permission, final boolean allowed) { + final SecurityCardPermissions permissions = stack.getOrDefault( + DataComponents.INSTANCE.getSecurityCardPermissions(), + SecurityCardPermissions.EMPTY + ); + stack.set( + DataComponents.INSTANCE.getSecurityCardPermissions(), + permissions.withPermission(permission, allowed) + ); } - void resetPermission(final ItemStack stack, final ResourceLocation permissionId) { - final CompoundTag permissionsTag = stack.getOrCreateTagElement(TAG_PERMISSIONS); - permissionsTag.remove(permissionId.toString()); + void resetPermission(final ItemStack stack, final PlatformPermission permission) { + final SecurityCardPermissions permissions = stack.getOrDefault( + DataComponents.INSTANCE.getSecurityCardPermissions(), + SecurityCardPermissions.EMPTY + ); + stack.set(DataComponents.INSTANCE.getSecurityCardPermissions(), permissions.forgetPermission(permission)); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardScreen.java index 84d8e2b78..308bb2118 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardScreen.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardScreen.java @@ -42,7 +42,7 @@ protected AbstractSecurityCardScreen(final T menu, final Inventory playerInvento @Override protected void init(final int rows) { permissions.clear(); - final List menuPermissions = getMenu().getPermissions(); + final List menuPermissions = getMenu().getPermissions(); for (int i = 0; i < menuPermissions.size(); ++i) { final Permission permission = createPermission(menuPermissions.get(i), i, rows); addWidget(permission.checkbox); @@ -53,7 +53,7 @@ protected void init(final int rows) { } private Permission createPermission( - final AbstractSecurityCardContainerMenu.Permission menuPermission, + final SecurityCardData.Permission menuPermission, final int index, final int rows ) { @@ -66,7 +66,7 @@ private Permission createPermission( } private CustomCheckboxWidget createPermissionCheckbox( - final AbstractSecurityCardContainerMenu.Permission menuPermission, + final SecurityCardData.Permission menuPermission, final int y, final boolean visible ) { @@ -82,18 +82,18 @@ private CustomCheckboxWidget createPermissionCheckbox( return checkbox; } - private void updatePermission(final AbstractSecurityCardContainerMenu.Permission menuPermission, + private void updatePermission(final SecurityCardData.Permission menuPermission, final Button resetButton, final CustomCheckboxWidget checkbox, final boolean allowed) { updateCheckboxAndResetButton(checkbox, resetButton, menu.changePermission( - menuPermission.platformPermission(), + menuPermission.permission(), allowed )); } - private Tooltip getPermissionTooltip(final AbstractSecurityCardContainerMenu.Permission menuPermission) { - final PlatformPermission permission = menuPermission.platformPermission(); + private Tooltip getPermissionTooltip(final SecurityCardData.Permission menuPermission) { + final PlatformPermission permission = menuPermission.permission(); final MutableComponent ownerName = permission.getOwnerName().copy().withStyle( Style.EMPTY.withItalic(true).withColor(ChatFormatting.GRAY) ); @@ -101,7 +101,7 @@ private Tooltip getPermissionTooltip(final AbstractSecurityCardContainerMenu.Per return Tooltip.create(menuPermission.dirty() ? tooltip.append("\n").append(MODIFIED_TITLE) : tooltip); } - private Button createPermissionResetButton(final AbstractSecurityCardContainerMenu.Permission menuPermission, + private Button createPermissionResetButton(final SecurityCardData.Permission menuPermission, final CustomCheckboxWidget checkbox, final int y, final boolean visible) { @@ -114,23 +114,23 @@ private Button createPermissionResetButton(final AbstractSecurityCardContainerMe return resetButton; } - private void resetPermission(final AbstractSecurityCardContainerMenu.Permission menuPermission, + private void resetPermission(final SecurityCardData.Permission menuPermission, final CustomCheckboxWidget checkbox, final Button resetButton) { - updateCheckboxAndResetButton(checkbox, resetButton, menu.resetPermission(menuPermission.platformPermission())); + updateCheckboxAndResetButton(checkbox, resetButton, menu.resetPermission(menuPermission.permission())); } private void updateCheckboxAndResetButton(final CustomCheckboxWidget checkbox, final Button resetButton, - final AbstractSecurityCardContainerMenu.Permission menuPermission) { + final SecurityCardData.Permission menuPermission) { checkbox.setMessage(getPermissionName(menuPermission)); checkbox.setTooltip(getPermissionTooltip(menuPermission)); checkbox.setSelected(menuPermission.allowed()); resetButton.active = menuPermission.dirty(); } - private Component getPermissionName(final AbstractSecurityCardContainerMenu.Permission menuPermission) { - final Component name = menuPermission.platformPermission().getName(); + private Component getPermissionName(final SecurityCardData.Permission menuPermission) { + final Component name = menuPermission.permission().getName(); if (!menuPermission.dirty()) { return name; } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardContainerMenu.java index 67eb37da1..0db10591a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardContainerMenu.java @@ -3,14 +3,13 @@ import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; public class FallbackSecurityCardContainerMenu extends AbstractSecurityCardContainerMenu { public FallbackSecurityCardContainerMenu(final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf) { - super(Menus.INSTANCE.getFallbackSecurityCard(), syncId, playerInventory, buf); + final SecurityCardData securityCardData) { + super(Menus.INSTANCE.getFallbackSecurityCard(), syncId, playerInventory, securityCardData); } FallbackSecurityCardContainerMenu(final int syncId, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java index 4d7914689..0947fc515 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java @@ -8,20 +8,31 @@ import java.util.Set; import javax.annotation.Nullable; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; -class FallbackSecurityCardExtendedMenuProvider extends AbstractSecurityCardExtendedMenuProvider { +class FallbackSecurityCardExtendedMenuProvider extends AbstractSecurityCardExtendedMenuProvider { private final SlotReference slotReference; FallbackSecurityCardExtendedMenuProvider(final SlotReference slotReference, final SecurityPolicy securityPolicy, - final Set dirtyPermissions, - final SlotReference slotReference1) { - super(slotReference, securityPolicy, dirtyPermissions); - this.slotReference = slotReference1; + final Set dirtyPermissions) { + super(securityPolicy, dirtyPermissions); + this.slotReference = slotReference; + } + + @Override + public SecurityCardData getMenuData() { + return new SecurityCardData(slotReference, getDataPermissions()); + } + + @Override + public StreamEncoder getMenuCodec() { + return SecurityCardData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardItem.java index 85e94b6d0..2752565bf 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardItem.java @@ -11,13 +11,14 @@ import java.util.Set; import net.minecraft.network.chat.Component; +import net.minecraft.server.MinecraftServer; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; -public class FallbackSecurityCardItem extends AbstractSecurityCardItem { +public class FallbackSecurityCardItem extends AbstractSecurityCardItem { private static final Component HELP = createTranslation("item", "fallback_security_card.help"); public FallbackSecurityCardItem() { @@ -25,11 +26,14 @@ public FallbackSecurityCardItem() { } @Override - AbstractSecurityCardExtendedMenuProvider createMenuProvider(final SlotReference slotReference, - final SecurityPolicy policy, - final Set dirtyPermissions, - final ItemStack stack) { - return new FallbackSecurityCardExtendedMenuProvider(slotReference, policy, dirtyPermissions, slotReference); + AbstractSecurityCardExtendedMenuProvider createMenuProvider( + final MinecraftServer server, + final SlotReference slotReference, + final SecurityPolicy policy, + final Set dirtyPermissions, + final ItemStack stack + ) { + return new FallbackSecurityCardExtendedMenuProvider(slotReference, policy, dirtyPermissions); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerBoundSecurityCardData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerBoundSecurityCardData.java new file mode 100644 index 000000000..a18f25f47 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerBoundSecurityCardData.java @@ -0,0 +1,38 @@ +package com.refinedmods.refinedstorage2.platform.common.security; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import net.minecraft.core.UUIDUtil; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record PlayerBoundSecurityCardData(SecurityCardData securityCardData, + Player boundTo, + List players) { + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + SecurityCardData.STREAM_CODEC, PlayerBoundSecurityCardData::securityCardData, + Player.STREAM_CODEC, PlayerBoundSecurityCardData::boundTo, + ByteBufCodecs.collection(ArrayList::new, Player.STREAM_CODEC), PlayerBoundSecurityCardData::players, + PlayerBoundSecurityCardData::new + ); + + record Player(UUID id, String name) { + private static final StreamCodec STREAM_CODEC = StreamCodec.composite( + UUIDUtil.STREAM_CODEC, Player::id, + ByteBufCodecs.STRING_UTF8, Player::name, + Player::new + ); + + static Player of(final SecurityCardBoundPlayer securityCardBoundPlayer) { + return new Player(securityCardBoundPlayer.playerId(), securityCardBoundPlayer.playerName()); + } + + static Player of(final net.minecraft.world.entity.player.Player player) { + return new Player(player.getUUID(), player.getGameProfile().getName()); + } + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardBoundPlayer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardBoundPlayer.java new file mode 100644 index 000000000..dce3c4918 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardBoundPlayer.java @@ -0,0 +1,35 @@ +package com.refinedmods.refinedstorage2.platform.common.security; + +import java.util.UUID; + +import com.mojang.authlib.GameProfile; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.core.UUIDUtil; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.server.level.ServerPlayer; + +public record SecurityCardBoundPlayer(UUID playerId, String playerName) { + public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + UUIDUtil.CODEC.fieldOf("playerId").forGetter(SecurityCardBoundPlayer::playerId), + Codec.STRING.fieldOf("playerName").forGetter(SecurityCardBoundPlayer::playerName) + ).apply(instance, SecurityCardBoundPlayer::new)); + + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + UUIDUtil.STREAM_CODEC, SecurityCardBoundPlayer::playerId, + ByteBufCodecs.STRING_UTF8, SecurityCardBoundPlayer::playerName, + SecurityCardBoundPlayer::new + ); + + static SecurityCardBoundPlayer of(final ServerPlayer player) { + final GameProfile profile = player.getGameProfile(); + return new SecurityCardBoundPlayer(profile.getId(), profile.getName()); + } + + PlayerSecurityActor toSecurityActor() { + return new PlayerSecurityActor(playerId); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardContainerMenu.java index 6118bc260..32d6ada0e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardContainerMenu.java @@ -1,47 +1,47 @@ package com.refinedmods.refinedstorage2.platform.common.security; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.content.Menus; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; import com.refinedmods.refinedstorage2.platform.common.support.stretching.ScreenSizeListener; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; public class SecurityCardContainerMenu extends AbstractSecurityCardContainerMenu implements ScreenSizeListener { - private final List players = new ArrayList<>(); - private Player boundTo; + private final List players; + private PlayerBoundSecurityCardData.Player boundTo; public SecurityCardContainerMenu(final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf) { - super(Menus.INSTANCE.getSecurityCard(), syncId, playerInventory, buf); - this.boundTo = new Player(buf.readUUID(), buf.readUtf()); - final int amountOfPlayers = buf.readInt(); - for (int i = 0; i < amountOfPlayers; ++i) { - final UUID id = buf.readUUID(); - final String name = buf.readUtf(); - players.add(new Player(id, name)); - } + final PlayerBoundSecurityCardData playerBoundSecurityCardData) { + super( + Menus.INSTANCE.getSecurityCard(), + syncId, + playerInventory, + playerBoundSecurityCardData.securityCardData() + ); + this.boundTo = playerBoundSecurityCardData.boundTo(); + this.players = playerBoundSecurityCardData.players(); } SecurityCardContainerMenu(final int syncId, final Inventory playerInventory, final SlotReference disabledSlot) { super(Menus.INSTANCE.getSecurityCard(), syncId, playerInventory, disabledSlot); - this.boundTo = new Player(UUID.randomUUID(), ""); + this.boundTo = new PlayerBoundSecurityCardData.Player(UUID.randomUUID(), ""); + this.players = new ArrayList<>(); } - List getPlayers() { + List getPlayers() { return players; } - Player getBoundTo() { + PlayerBoundSecurityCardData.Player getBoundTo() { return boundTo; } @@ -62,11 +62,8 @@ private void setBoundPlayer(final MinecraftServer server, final UUID playerId, f } } - void changeBoundPlayer(final Player player) { - Platform.INSTANCE.getClientToServerCommunications().sendSecurityCardBoundPlayer(player.id()); + void changeBoundPlayer(final PlayerBoundSecurityCardData.Player player) { + C2SPackets.sendSecurityCardBoundPlayer(player.id()); this.boundTo = player; } - - record Player(UUID id, String name) { - } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardData.java new file mode 100644 index 000000000..bddbc98f7 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardData.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage2.platform.common.security; + +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record SecurityCardData(SlotReference slotReference, List permissions) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + SlotReferenceFactory.STREAM_CODEC, SecurityCardData::slotReference, + ByteBufCodecs.collection( + ArrayList::new, + StreamCodec.composite( + PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), Permission::permission, + ByteBufCodecs.BOOL, Permission::allowed, + ByteBufCodecs.BOOL, Permission::dirty, + Permission::new + ) + ), SecurityCardData::permissions, + SecurityCardData::new + ); + + record Permission(PlatformPermission permission, boolean allowed, boolean dirty) { + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardExtendedMenuProvider.java index 4f5cbc6c2..e0ca32bc0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardExtendedMenuProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardExtendedMenuProvider.java @@ -5,50 +5,45 @@ import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import java.util.Collections; -import java.util.List; import java.util.Set; -import java.util.UUID; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.codec.StreamEncoder; +import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; -class SecurityCardExtendedMenuProvider extends AbstractSecurityCardExtendedMenuProvider { +class SecurityCardExtendedMenuProvider extends AbstractSecurityCardExtendedMenuProvider { + private final MinecraftServer server; private final SlotReference slotReference; - private final UUID boundPlayerId; - private final String boundPlayerName; + private final SecurityCardBoundPlayer boundPlayer; - SecurityCardExtendedMenuProvider(final SlotReference slotReference, + SecurityCardExtendedMenuProvider(final MinecraftServer server, + final SlotReference slotReference, final SecurityPolicy securityPolicy, final Set dirtyPermissions, - final UUID boundPlayerId, - final String boundPlayerName) { - super(slotReference, securityPolicy, dirtyPermissions); + final SecurityCardBoundPlayer boundPlayer) { + super(securityPolicy, dirtyPermissions); + this.server = server; this.slotReference = slotReference; - this.boundPlayerId = boundPlayerId; - this.boundPlayerName = boundPlayerName; + this.boundPlayer = boundPlayer; } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - super.writeScreenOpeningData(player, buf); - - buf.writeUUID(boundPlayerId); - buf.writeUtf(boundPlayerName); + public PlayerBoundSecurityCardData getMenuData() { + return new PlayerBoundSecurityCardData( + new SecurityCardData(slotReference, getDataPermissions()), + PlayerBoundSecurityCardData.Player.of(boundPlayer), + server.getPlayerList().getPlayers().stream().map(PlayerBoundSecurityCardData.Player::of).toList() + ); + } - final List players = player.getServer() == null - ? Collections.emptyList() - : player.getServer().getPlayerList().getPlayers(); - buf.writeInt(players.size()); - for (final ServerPlayer otherPlayer : players) { - buf.writeUUID(otherPlayer.getUUID()); - buf.writeUtf(otherPlayer.getGameProfile().getName()); - } + @Override + public StreamEncoder getMenuCodec() { + return PlayerBoundSecurityCardData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItem.java index b3040bb60..d0daa0d97 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItem.java @@ -6,16 +6,15 @@ import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.UUID; -import javax.annotation.Nullable; import net.minecraft.ChatFormatting; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -29,10 +28,7 @@ import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; import static java.util.Objects.requireNonNull; -public class SecurityCardItem extends AbstractSecurityCardItem { - private static final String TAG_BOUND_PLAYER_ID = "bid"; - private static final String TAG_BOUND_PLAYER_NAME = "bname"; - +public class SecurityCardItem extends AbstractSecurityCardItem { private static final Component UNBOUND_HELP = createTranslation("item", "security_card.unbound.help"); private static final Component BOUND_HELP = createTranslation("item", "security_card.bound.help"); @@ -42,26 +38,27 @@ public SecurityCardItem() { @Override public void appendHoverText(final ItemStack stack, - @Nullable final Level level, + final TooltipContext context, final List lines, final TooltipFlag flag) { - final String boundPlayerName = getBoundPlayerName(stack); - if (boundPlayerName == null) { + final SecurityCardBoundPlayer boundPlayer = stack.get(DataComponents.INSTANCE.getSecurityCardBoundPlayer()); + if (boundPlayer == null) { lines.add(createTranslation("item", "security_card.unbound").withStyle(ChatFormatting.GRAY)); } else { lines.add(createTranslation( "item", "security_card.bound", - Component.literal(boundPlayerName).withStyle(ChatFormatting.YELLOW) + Component.literal(boundPlayer.playerName()).withStyle(ChatFormatting.YELLOW) ).withStyle(ChatFormatting.GRAY)); } - super.appendHoverText(stack, level, lines, flag); + super.appendHoverText(stack, context, lines, flag); } @Override public InteractionResultHolder use(final Level level, final Player player, final InteractionHand hand) { final ItemStack stack = player.getItemInHand(hand); - if (player instanceof ServerPlayer serverPlayer && !stack.hasTag()) { + if (player instanceof ServerPlayer serverPlayer + && !stack.has(DataComponents.INSTANCE.getSecurityCardBoundPlayer())) { setBoundPlayer(serverPlayer, stack); } return super.use(level, player, hand); @@ -73,33 +70,31 @@ public Optional getTooltipImage(final ItemStack stack) { } @Override - AbstractSecurityCardExtendedMenuProvider createMenuProvider(final SlotReference slotReference, - final SecurityPolicy policy, - final Set dirtyPermissions, - final ItemStack stack) { + AbstractSecurityCardExtendedMenuProvider createMenuProvider( + final MinecraftServer server, + final SlotReference slotReference, + final SecurityPolicy policy, + final Set dirtyPermissions, + final ItemStack stack + ) { return new SecurityCardExtendedMenuProvider( + server, slotReference, policy, dirtyPermissions, - requireNonNull(getBoundPlayerId(stack)), - requireNonNull(getBoundPlayerName(stack)) + requireNonNull(stack.get(DataComponents.INSTANCE.getSecurityCardBoundPlayer())) ); } @Override public boolean isValid(final ItemStack stack) { - return stack.getTag() != null - && stack.getTag().contains(TAG_BOUND_PLAYER_ID) - && stack.getTag().contains(TAG_BOUND_PLAYER_NAME); + return stack.has(DataComponents.INSTANCE.getSecurityCardBoundPlayer()); } @Override public Optional getActor(final ItemStack stack) { - final UUID playerId = getBoundPlayerId(stack); - if (playerId == null) { - return Optional.empty(); - } - return Optional.of(new PlayerSecurityActor(playerId)); + return Optional.ofNullable(stack.get(DataComponents.INSTANCE.getSecurityCardBoundPlayer())) + .map(SecurityCardBoundPlayer::toSecurityActor); } @Override @@ -107,23 +102,8 @@ public long getEnergyUsage() { return Platform.INSTANCE.getConfig().getSecurityCard().getEnergyUsage(); } - @Nullable - UUID getBoundPlayerId(final ItemStack stack) { - return (stack.getTag() == null || !stack.getTag().contains(TAG_BOUND_PLAYER_ID)) - ? null - : stack.getTag().getUUID(TAG_BOUND_PLAYER_ID); - } - - @Nullable - String getBoundPlayerName(final ItemStack stack) { - return (stack.getTag() == null || !stack.getTag().contains(TAG_BOUND_PLAYER_NAME)) - ? null - : stack.getTag().getString(TAG_BOUND_PLAYER_NAME); - } - void setBoundPlayer(final ServerPlayer player, final ItemStack stack) { - final CompoundTag tag = stack.getOrCreateTag(); - tag.putUUID(TAG_BOUND_PLAYER_ID, player.getGameProfile().getId()); - tag.putString(TAG_BOUND_PLAYER_NAME, player.getGameProfile().getName()); + final SecurityCardBoundPlayer boundPlayer = SecurityCardBoundPlayer.of(player); + stack.set(DataComponents.INSTANCE.getSecurityCardBoundPlayer(), boundPlayer); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItemPropertyFunction.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItemPropertyFunction.java index 1583c2f80..8b228cf6b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItemPropertyFunction.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItemPropertyFunction.java @@ -8,8 +8,10 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + public class SecurityCardItemPropertyFunction implements ClampedItemPropertyFunction { - public static final ResourceLocation NAME = new ResourceLocation("active"); + public static final ResourceLocation NAME = createIdentifier("security_card_active"); @Override public float unclampedCall(final ItemStack itemStack, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardPermissions.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardPermissions.java new file mode 100644 index 000000000..5d214cc49 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardPermissions.java @@ -0,0 +1,52 @@ +package com.refinedmods.refinedstorage2.platform.common.security; + +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import com.mojang.serialization.Codec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record SecurityCardPermissions(Map permissions) { + public static final SecurityCardPermissions EMPTY = new SecurityCardPermissions(Collections.emptyMap()); + + public static final Codec CODEC = Codec.unboundedMap( + PlatformApi.INSTANCE.getPermissionRegistry().codec(), + Codec.BOOL + ).xmap(SecurityCardPermissions::new, SecurityCardPermissions::permissions); + + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + ByteBufCodecs.map( + HashMap::new, + PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), + ByteBufCodecs.BOOL + ), SecurityCardPermissions::permissions, + SecurityCardPermissions::new + ); + + boolean isDirty(final PlatformPermission permission) { + return permissions.containsKey(permission); + } + + boolean isAllowed(final PlatformPermission permission) { + return permissions.getOrDefault(permission, false); + } + + SecurityCardPermissions withPermission(final PlatformPermission permission, final boolean allowed) { + final Map newPermissions = new HashMap<>(permissions); + newPermissions.put(permission, allowed); + return new SecurityCardPermissions(newPermissions); + } + + SecurityCardPermissions forgetPermission(final PlatformPermission permission) { + final Map newPermissions = new HashMap<>(permissions); + newPermissions.remove(permission); + return new SecurityCardPermissions(newPermissions); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardScreen.java index c44596498..42cb63e5c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardScreen.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardScreen.java @@ -29,10 +29,10 @@ private void toggleBoundPlayer(final Button button) { if (menu.getPlayers().isEmpty()) { return; } - final SecurityCardContainerMenu.Player currentPlayer = menu.getBoundTo(); + final PlayerBoundSecurityCardData.Player currentPlayer = menu.getBoundTo(); final int index = menu.getPlayers().indexOf(currentPlayer); final int nextIndex = (index + 1) % menu.getPlayers().size(); - final SecurityCardContainerMenu.Player nextPlayer = menu.getPlayers().get(nextIndex); + final PlayerBoundSecurityCardData.Player nextPlayer = menu.getPlayers().get(nextIndex); menu.changeBoundPlayer(nextPlayer); button.setMessage(Component.literal(nextPlayer.name())); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java index a4c9b5a1e..f9ad7c507 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java @@ -18,9 +18,9 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; @@ -96,21 +96,21 @@ private long updateDefaultPolicyAndGetEnergyUsage() { } @Override - public void load(final CompoundTag tag) { + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_SECURITY_CARDS)) { - ContainerUtil.read(tag.getCompound(TAG_SECURITY_CARDS), securityCards); + ContainerUtil.read(tag.getCompound(TAG_SECURITY_CARDS), securityCards, provider); } if (tag.contains(TAG_FALLBACK_SECURITY_CARD)) { - ContainerUtil.read(tag.getCompound(TAG_FALLBACK_SECURITY_CARD), fallbackSecurityCard); + ContainerUtil.read(tag.getCompound(TAG_FALLBACK_SECURITY_CARD), fallbackSecurityCard, provider); } - super.load(tag); + super.loadAdditional(tag, provider); } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - tag.put(TAG_SECURITY_CARDS, ContainerUtil.write(securityCards)); - tag.put(TAG_FALLBACK_SECURITY_CARD, ContainerUtil.write(fallbackSecurityCard)); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + tag.put(TAG_SECURITY_CARDS, ContainerUtil.write(securityCards, provider)); + tag.put(TAG_FALLBACK_SECURITY_CARD, ContainerUtil.write(fallbackSecurityCard, provider)); } @Override @@ -141,11 +141,6 @@ static boolean isValidFallbackSecurityCard(final ItemStack stack) { return stack.getItem() instanceof FallbackSecurityCardItem; } - @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - // no op - } - @Override public Component getDisplayName() { return ContentNames.SECURITY_MANAGER; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java index 5f39ab293..6aa783e6b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java @@ -7,8 +7,9 @@ import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil; @@ -17,14 +18,15 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -33,7 +35,7 @@ public abstract class AbstractDiskContainerBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements BlockEntityWithDrops, NetworkNodeMenuProvider { + implements BlockEntityWithDrops, NetworkNodeExtendedMenuProvider { private static final String TAG_DISK_INVENTORY = "inv"; private static final String TAG_DISKS = "disks"; @@ -67,7 +69,7 @@ protected AbstractDiskContainerBlockEntity(final BlockEntityType type, protected abstract void setNormalizer(UnaryOperator normalizer); @Nullable - public static Item getDisk(final CompoundTag tag, final int slot) { + public static Item getDisk(final CompoundTag tag, final int slot, final HolderLookup.Provider provider) { if (!tag.contains(TAG_DISK_INVENTORY)) { return null; } @@ -75,7 +77,7 @@ public static Item getDisk(final CompoundTag tag, final int slot) { if (!ContainerUtil.hasItemInSlot(diskInventoryTag, slot)) { return null; } - final ItemStack diskStack = ContainerUtil.getItemInSlot(diskInventoryTag, slot); + final ItemStack diskStack = ContainerUtil.getItemInSlot(diskInventoryTag, slot, provider); return diskStack.isEmpty() ? null : diskStack.getItem(); } @@ -98,7 +100,7 @@ public void setLevel(final Level level) { * However, when we place a block entity with nbt, the flow is different: * #setLevel(Level) -> #load(CompoundTag) -> #setChanged(). * #setLevel(Level) is called first (before #load(CompoundTag)) and initialization will happen BEFORE - * we load the tag! + * we load the components! * That's why we need to override #setChanged() here, to ensure that the network and disks are still initialized * correctly in that case. */ @@ -122,30 +124,30 @@ public void activenessChanged(final boolean newActive) { } @Override - public void load(final CompoundTag tag) { + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { fromClientTag(tag); if (tag.contains(TAG_DISK_INVENTORY)) { - ContainerUtil.read(tag.getCompound(TAG_DISK_INVENTORY), diskInventory); + ContainerUtil.read(tag.getCompound(TAG_DISK_INVENTORY), diskInventory, provider); } - super.load(tag); + super.loadAdditional(tag, provider); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); - filter.load(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); + filter.load(tag, provider); } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - tag.put(TAG_DISK_INVENTORY, ContainerUtil.write(diskInventory)); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + tag.put(TAG_DISK_INVENTORY, ContainerUtil.write(diskInventory, provider)); } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); - filter.save(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); + filter.save(tag, provider); } public FilteredContainer getDiskInventory() { @@ -183,7 +185,7 @@ public Packet getUpdatePacket() { } @Override - public CompoundTag getUpdateTag() { + public CompoundTag getUpdateTag(final HolderLookup.Provider provider) { final CompoundTag tag = new CompoundTag(); // This null check is important. #getUpdateTag() can be called before the node's network is initialized! if (mainNode.getNetwork() == null) { @@ -203,8 +205,13 @@ public NonNullList getDrops() { } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - filter.getFilterContainer().writeToUpdatePacket(buf); + public ResourceContainerData getMenuData() { + return ResourceContainerData.of(filter.getFilterContainer()); + } + + @Override + public StreamEncoder getMenuCodec() { + return ResourceContainerData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepository.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepository.java index 899217fcc..a59b104e4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepository.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepository.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage2.platform.common.storage; import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; @@ -30,17 +30,17 @@ public ClientStorageRepository(final Consumer storageInfoRequestAcceptor) } @Override - public Optional get(final UUID id) { + public Optional get(final UUID id) { throw new UnsupportedOperationException(); } @Override - public void set(final UUID id, final Storage storage) { + public void set(final UUID id, final SerializableStorage storage) { throw new UnsupportedOperationException(); } @Override - public Optional removeIfEmpty(final UUID id) { + public Optional removeIfEmpty(final UUID id) { throw new UnsupportedOperationException(); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java index ad384439b..d9aba1525 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java @@ -1,115 +1,42 @@ package com.refinedmods.refinedstorage2.platform.common.storage; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; import javax.annotation.Nullable; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.Tag; +import com.mojang.serialization.MapCodec; public class FluidStorageType implements StorageType { - private static final String TAG_CAPACITY = "cap"; - private static final String TAG_STACKS = "stacks"; - private static final String TAG_AMOUNT = "amount"; - private static final String TAG_CHANGED_BY = "cb"; - private static final String TAG_CHANGED_AT = "ca"; - FluidStorageType() { } @Override - public Storage create(@Nullable final Long capacity, final Runnable listener) { - return innerCreate(capacity, listener); - } - - @Override - public Storage fromTag(final CompoundTag tag, final Runnable listener) { - final PlatformStorage storage = innerCreate( - tag.contains(TAG_CAPACITY) ? tag.getLong(TAG_CAPACITY) : null, - listener - ); - final ListTag stacks = tag.getList(TAG_STACKS, Tag.TAG_COMPOUND); - for (final Tag stackTag : stacks) { - ResourceTypes.FLUID.fromTag((CompoundTag) stackTag).ifPresent(resource -> storage.load( - resource, - ((CompoundTag) stackTag).getLong(TAG_AMOUNT), - ((CompoundTag) stackTag).getString(TAG_CHANGED_BY), - ((CompoundTag) stackTag).getLong(TAG_CHANGED_AT) - )); - } - return storage; - } - - private PlatformStorage innerCreate(@Nullable final Long capacity, final Runnable listener) { - final TrackedStorageRepository trackingRepository = new InMemoryTrackedStorageRepository(); - if (capacity != null) { - final LimitedStorageImpl delegate = new LimitedStorageImpl( - new TrackedStorageImpl( - new InMemoryStorageImpl(), - trackingRepository, - System::currentTimeMillis - ), - capacity - ); - return new LimitedPlatformStorage( - delegate, - StorageTypes.FLUID, - trackingRepository, - listener - ); - } - return new PlatformStorage( - new TrackedStorageImpl(new InMemoryStorageImpl(), trackingRepository, System::currentTimeMillis), + public SerializableStorage create(@Nullable final Long capacity, final Runnable listener) { + return StorageTypes.createHomogeneousStorage( StorageTypes.FLUID, - trackingRepository, + StorageCodecs.StorageData.empty(capacity), listener ); } @Override - public CompoundTag toTag(final Storage storage) { - final CompoundTag tag = new CompoundTag(); - if (storage instanceof LimitedStorage limitedStorage) { - tag.putLong(TAG_CAPACITY, limitedStorage.getCapacity()); - } - final ListTag stacks = new ListTag(); - for (final ResourceAmount resourceAmount : storage.getAll()) { - stacks.add(toTag(storage, resourceAmount)); - } - tag.put(TAG_STACKS, stacks); - return tag; - } - - private CompoundTag toTag(final Storage storage, final ResourceAmount resourceAmount) { - if (!(resourceAmount.getResource() instanceof FluidResource fluidResource)) { - throw new UnsupportedOperationException(); - } - final CompoundTag tag = fluidResource.toTag(); - tag.putLong(TAG_AMOUNT, resourceAmount.getAmount()); - if (storage instanceof TrackedStorage trackedStorage) { - trackedStorage - .findTrackedResourceByActorType(resourceAmount.getResource(), PlayerActor.class) - .ifPresent(trackedResource -> { - tag.putString(TAG_CHANGED_BY, trackedResource.getSourceName()); - tag.putLong(TAG_CHANGED_AT, trackedResource.getTime()); - }); - } - return tag; + public MapCodec getMapCodec(final Runnable listener) { + return StorageCodecs.homogeneousStorageData( + ResourceCodecs.FLUID_CODEC + ).xmap(storageData -> StorageTypes.createHomogeneousStorage( + StorageTypes.FLUID, + storageData, + listener + ), storage -> StorageCodecs.StorageData.ofHomogeneousStorage( + storage, + FluidStorageType.this::isAllowed, + FluidResource.class::cast + )); } @Override @@ -142,6 +69,11 @@ public String getName() { return name; } + @Nullable + public Long getCapacityInBuckets() { + return capacityInBuckets; + } + @Nullable public Long getCapacity() { if (capacityInBuckets == null) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java index 7f8893887..9a5e8705c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java @@ -1,114 +1,41 @@ package com.refinedmods.refinedstorage2.platform.common.storage; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; import javax.annotation.Nullable; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.Tag; +import com.mojang.serialization.MapCodec; public class ItemStorageType implements StorageType { - private static final String TAG_CAPACITY = "cap"; - private static final String TAG_STACKS = "stacks"; - private static final String TAG_AMOUNT = "amount"; - private static final String TAG_CHANGED_BY = "cb"; - private static final String TAG_CHANGED_AT = "ca"; - ItemStorageType() { } @Override - public Storage create(@Nullable final Long capacity, final Runnable listener) { - return innerCreate(capacity, listener); - } - - @Override - public Storage fromTag(final CompoundTag tag, final Runnable listener) { - final PlatformStorage storage = innerCreate( - tag.contains(TAG_CAPACITY) ? tag.getLong(TAG_CAPACITY) : null, - listener - ); - final ListTag stacks = tag.getList(TAG_STACKS, Tag.TAG_COMPOUND); - for (final Tag stackTag : stacks) { - ResourceTypes.ITEM.fromTag((CompoundTag) stackTag).ifPresent(resource -> storage.load( - resource, - ((CompoundTag) stackTag).getLong(TAG_AMOUNT), - ((CompoundTag) stackTag).getString(TAG_CHANGED_BY), - ((CompoundTag) stackTag).getLong(TAG_CHANGED_AT) - )); - } - return storage; - } - - private PlatformStorage innerCreate(@Nullable final Long capacity, final Runnable listener) { - final TrackedStorageRepository trackingRepository = new InMemoryTrackedStorageRepository(); - if (capacity != null) { - final LimitedStorageImpl delegate = new LimitedStorageImpl( - new TrackedStorageImpl( - new InMemoryStorageImpl(), - trackingRepository, - System::currentTimeMillis - ), - capacity - ); - return new LimitedPlatformStorage( - delegate, - StorageTypes.ITEM, - trackingRepository, - listener - ); - } - return new PlatformStorage( - new TrackedStorageImpl(new InMemoryStorageImpl(), trackingRepository, System::currentTimeMillis), + public SerializableStorage create(@Nullable final Long capacity, final Runnable listener) { + return StorageTypes.createHomogeneousStorage( StorageTypes.ITEM, - trackingRepository, + StorageCodecs.StorageData.empty(capacity), listener ); } @Override - public CompoundTag toTag(final Storage storage) { - final CompoundTag tag = new CompoundTag(); - if (storage instanceof LimitedStorage limitedStorage) { - tag.putLong(TAG_CAPACITY, limitedStorage.getCapacity()); - } - final ListTag stacks = new ListTag(); - for (final ResourceAmount resourceAmount : storage.getAll()) { - stacks.add(toTag(storage, resourceAmount)); - } - tag.put(TAG_STACKS, stacks); - return tag; - } - - private CompoundTag toTag(final Storage storage, final ResourceAmount resourceAmount) { - if (!(resourceAmount.getResource() instanceof ItemResource itemResource)) { - throw new UnsupportedOperationException(); - } - final CompoundTag tag = itemResource.toTag(); - tag.putLong(TAG_AMOUNT, resourceAmount.getAmount()); - if (storage instanceof TrackedStorage trackedStorage) { - trackedStorage - .findTrackedResourceByActorType(resourceAmount.getResource(), PlayerActor.class) - .ifPresent(trackedResource -> { - tag.putString(TAG_CHANGED_BY, trackedResource.getSourceName()); - tag.putLong(TAG_CHANGED_AT, trackedResource.getTime()); - }); - } - return tag; + public MapCodec getMapCodec(final Runnable listener) { + return StorageCodecs.homogeneousStorageData( + ResourceCodecs.ITEM_CODEC + ).xmap(storageData -> StorageTypes.createHomogeneousStorage( + StorageTypes.ITEM, + storageData, + listener + ), storage -> StorageCodecs.StorageData.ofHomogeneousStorage( + storage, + ItemStorageType.this::isAllowed, + ItemResource.class::cast + )); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorage.java index 1ac6a7184..e0496c73e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorage.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorage.java @@ -14,7 +14,6 @@ import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; import java.util.Optional; -import javax.annotation.Nullable; class PlatformStorage extends AbstractProxyStorage implements SerializableStorage, TrackedStorage { private final StorageType type; @@ -31,14 +30,15 @@ class PlatformStorage extends AbstractProxyStorage implements SerializableStorag this.listener = listener; } - void load(final ResourceKey resource, final long amount, @Nullable final String changedBy, final long changedAt) { + void load(final StorageCodecs.StorageResource storageResource) { + final ResourceKey resource = storageResource.resource(); if (!type.isAllowed(resource)) { return; } - super.insert(resource, amount, Action.EXECUTE, EmptyActor.INSTANCE); - if (changedBy != null && !changedBy.isBlank()) { - trackingRepository.update(resource, new PlayerActor(changedBy), changedAt); - } + super.insert(resource, storageResource.amount(), Action.EXECUTE, EmptyActor.INSTANCE); + storageResource.changed().ifPresent( + changed -> trackingRepository.update(resource, new PlayerActor(changed.changedBy()), changed.changedAt()) + ); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageCodecs.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageCodecs.java new file mode 100644 index 000000000..d7151cfb9 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageCodecs.java @@ -0,0 +1,106 @@ +package com.refinedmods.refinedstorage2.platform.common.storage; + +import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; +import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; +import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; + +import java.util.List; +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Predicate; +import javax.annotation.Nullable; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public final class StorageCodecs { + private static final StreamCodec TRACKED_RESOURCE_STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.STRING_UTF8, TrackedResource::getSourceName, + ByteBufCodecs.VAR_LONG, TrackedResource::getTime, + TrackedResource::new + ); + private static final Codec CHANGED_BY_AT_CODEC = + RecordCodecBuilder.create(instance -> instance.group( + Codec.STRING.fieldOf("changedBy").forGetter(StorageChangedByAt::changedBy), + Codec.LONG.fieldOf("changedAt").forGetter(StorageChangedByAt::changedAt) + ).apply(instance, StorageChangedByAt::new)); + + public static final StreamCodec> + TRACKED_RESOURCE_OPTIONAL_STREAM_CODEC = ByteBufCodecs.optional(TRACKED_RESOURCE_STREAM_CODEC); + + private StorageCodecs() { + } + + static MapCodec> homogeneousStorageData(final Codec resourceCodec) { + final Codec> storageResourceCodec = RecordCodecBuilder.create(instance -> instance.group( + resourceCodec.fieldOf("resource").forGetter(StorageResource::resource), + Codec.LONG.fieldOf("amount").forGetter(StorageResource::amount), + Codec.optionalField("changed", CHANGED_BY_AT_CODEC, false).forGetter(StorageResource::changed) + ).apply(instance, StorageResource::new)); + + return RecordCodecBuilder.mapCodec(instance -> instance.group( + Codec.optionalField("capacity", Codec.LONG, false).forGetter(StorageData::capacity), + Codec.list(storageResourceCodec).fieldOf("resources").forGetter(StorageData::resources) + ).apply(instance, StorageData::new)); + } + + record StorageData(Optional capacity, List> resources) { + static StorageData empty(@Nullable final Long capacity) { + return new StorageData<>(Optional.ofNullable(capacity), List.of()); + } + + static StorageData ofHomogeneousStorage( + final Storage storage, + final Predicate valid, + final Function caster + ) { + final Optional capacity = storage instanceof LimitedStorage limitedStorage + ? Optional.of(limitedStorage.getCapacity()) + : Optional.empty(); + final List> resources = storage.getAll().stream() + .filter(resourceAmount -> valid.test(resourceAmount.getResource())) + .map(resourceAmount -> getResource(storage, caster, resourceAmount)) + .toList(); + return new StorageData<>(capacity, resources); + } + + private static StorageResource getResource( + final Storage storage, + final Function caster, + final ResourceAmount resourceAmount + ) { + return new StorageResource<>( + caster.apply(resourceAmount.getResource()), + resourceAmount.getAmount(), + getChanged(storage, resourceAmount) + ); + } + + private static Optional getChanged(final Storage storage, + final ResourceAmount resourceAmount) { + if (!(storage instanceof TrackedStorage trackedStorage)) { + return Optional.empty(); + } + return trackedStorage.findTrackedResourceByActorType(resourceAmount.getResource(), PlayerActor.class) + .map(StorageChangedByAt::ofTrackedResource); + } + } + + record StorageResource(T resource, long amount, Optional changed) { + } + + record StorageChangedByAt(String changedBy, long changedAt) { + private static StorageChangedByAt ofTrackedResource(final TrackedResource trackedResource) { + return new StorageChangedByAt(trackedResource.getSourceName(), trackedResource.getTime()); + } + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageContainerItemHelperImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageContainerItemHelperImpl.java index ee061f0e6..3eb060112 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageContainerItemHelperImpl.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageContainerItemHelperImpl.java @@ -1,11 +1,12 @@ package com.refinedmods.refinedstorage2.platform.common.storage; -import com.refinedmods.refinedstorage2.api.storage.Storage; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.api.storage.StorageBlockEntity; import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItemHelper; import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; import java.util.Collections; import java.util.HashMap; @@ -19,7 +20,6 @@ import javax.annotation.Nullable; import net.minecraft.ChatFormatting; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; @@ -36,23 +36,30 @@ public class StorageContainerItemHelperImpl implements StorageContainerItemHelper { private static final Logger LOGGER = LoggerFactory.getLogger(StorageContainerItemHelperImpl.class); - private static final String TAG_ID = "id"; private final Map diskModelsByItem = new HashMap<>(); private final Set diskModels = new HashSet<>(); @Override - public Optional resolve(final StorageRepository storageRepository, final ItemStack stack) { + public Optional resolveStorage(final StorageRepository storageRepository, + final ItemStack stack) { return getId(stack).flatMap(storageRepository::get); } @Override - public void set(final StorageRepository storageRepository, final ItemStack stack, final Storage storage) { + public void setStorage(final StorageRepository storageRepository, + final ItemStack stack, + final SerializableStorage storage) { final UUID id = UUID.randomUUID(); setId(stack, id); storageRepository.set(id, storage); } + @Override + public boolean hasStorage(final ItemStack stack) { + return stack.has(DataComponents.INSTANCE.getStorageReference()); + } + @Override public Optional getInfo(final StorageRepository storageRepository, final ItemStack stack) { return getId(stack).map(storageRepository::getInfo); @@ -162,15 +169,10 @@ public Map getDiskModelsByItem() { } private Optional getId(final ItemStack stack) { - if (stack.hasTag() && stack.getTag() != null && stack.getTag().hasUUID(TAG_ID)) { - return Optional.of(stack.getTag().getUUID(TAG_ID)); - } - return Optional.empty(); + return Optional.ofNullable(stack.get(DataComponents.INSTANCE.getStorageReference())); } private void setId(final ItemStack stack, final UUID id) { - final CompoundTag tag = stack.hasTag() && stack.getTag() != null ? stack.getTag() : new CompoundTag(); - tag.putUUID(TAG_ID, id); - stack.setTag(tag); + stack.set(DataComponents.INSTANCE.getStorageReference(), id); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImpl.java index adaad7a86..510385255 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImpl.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImpl.java @@ -1,12 +1,9 @@ package com.refinedmods.refinedstorage2.platform.common.storage; import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.storage.Storage; import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; import com.refinedmods.refinedstorage2.platform.common.support.AbstractSafeSavedData; import java.util.HashMap; @@ -14,55 +11,50 @@ import java.util.Optional; import java.util.UUID; +import com.mojang.serialization.Codec; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.UUIDUtil; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.Tag; -import net.minecraft.resources.ResourceLocation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import net.minecraft.nbt.NbtOps; public class StorageRepositoryImpl extends AbstractSafeSavedData implements StorageRepository { public static final String NAME = "refinedstorage2_storages"; - private static final Logger LOGGER = LoggerFactory.getLogger(StorageRepositoryImpl.class); - - private static final String TAG_STORAGES = "storages"; - private static final String TAG_STORAGE_ID = "id"; - private static final String TAG_STORAGE_TYPE = "type"; - private static final String TAG_STORAGE_DATA = "data"; - - private final Map entries = new HashMap<>(); - private final PlatformRegistry storageTypeRegistry; + private final Codec> codec = Codec.unboundedMap( + UUIDUtil.STRING_CODEC, + SerializableStorage.getCodec(this::markAsChanged) + ); + private final Map entries; + + public StorageRepositoryImpl(final CompoundTag tag, final HolderLookup.Provider provider) { + this.entries = new HashMap<>(codec.decode( + provider.createSerializationContext(NbtOps.INSTANCE), + tag + ).getOrThrow().getFirst()); + } - public StorageRepositoryImpl(final PlatformRegistry storageTypeRegistry) { - this.storageTypeRegistry = storageTypeRegistry; + public StorageRepositoryImpl() { + this.entries = new HashMap<>(); } @Override - public Optional get(final UUID id) { + public Optional get(final UUID id) { return Optional.ofNullable(entries.get(id)); } @Override - public void set(final UUID id, final Storage storage) { - setSilently(id, storage); - setDirty(); - } - - private void setSilently(final UUID id, final Storage storage) { + public void set(final UUID id, final SerializableStorage storage) { CoreValidations.validateNotNull(storage, "Storage must not be null"); - if (!(storage instanceof SerializableStorage)) { - throw new IllegalArgumentException("Storage is not serializable"); - } CoreValidations.validateNotNull(id, "ID must not be null"); if (entries.containsKey(id)) { throw new IllegalArgumentException(id + " already exists"); } entries.put(id, storage); + setDirty(); } @Override - public Optional removeIfEmpty(final UUID id) { + public Optional removeIfEmpty(final UUID id) { return get(id).map(storage -> { if (storage.getStored() == 0) { entries.remove(id); @@ -83,47 +75,9 @@ public void markAsChanged() { setDirty(); } - public void read(final CompoundTag tag) { - final ListTag storages = tag.getList(TAG_STORAGES, Tag.TAG_COMPOUND); - for (final Tag storageTag : storages) { - final UUID id = ((CompoundTag) storageTag).getUUID(TAG_STORAGE_ID); - final ResourceLocation typeId = new ResourceLocation( - ((CompoundTag) storageTag).getString(TAG_STORAGE_TYPE) - ); - final CompoundTag data = ((CompoundTag) storageTag).getCompound(TAG_STORAGE_DATA); - - storageTypeRegistry.get(typeId).ifPresentOrElse( - type -> setSilently(id, type.fromTag(data, this::markAsChanged)), - () -> LOGGER.warn("Cannot find storage type {} for storage {}", typeId, id) - ); - } - } - @Override - public CompoundTag save(final CompoundTag tag) { - final ListTag storageList = new ListTag(); - for (final Map.Entry entry : entries.entrySet()) { - if (entry.getValue() instanceof SerializableStorage serializableStorage) { - storageList.add(convertStorageToTag(entry.getKey(), entry.getValue(), serializableStorage)); - } else { - LOGGER.warn("Tried to persist non-serializable storage {}", entry.getKey()); - } - } - tag.put(TAG_STORAGES, storageList); - return tag; - } - - private Tag convertStorageToTag(final UUID id, - final Storage storage, - final SerializableStorage serializableStorage) { - final ResourceLocation typeIdentifier = storageTypeRegistry - .getId(serializableStorage.getType()) - .orElseThrow(() -> new RuntimeException("Storage type is not registered")); - - final CompoundTag tag = new CompoundTag(); - tag.putUUID(TAG_STORAGE_ID, id); - tag.put(TAG_STORAGE_DATA, serializableStorage.getType().toTag(storage)); - tag.putString(TAG_STORAGE_TYPE, typeIdentifier.toString()); - return tag; + public CompoundTag save(final CompoundTag tag, final HolderLookup.Provider provider) { + return (CompoundTag) codec.encode(entries, provider.createSerializationContext(NbtOps.INSTANCE), tag) + .getOrThrow(); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTypes.java index 3bbc695ff..74cf21480 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTypes.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTypes.java @@ -1,5 +1,11 @@ package com.refinedmods.refinedstorage2.platform.common.storage; +import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; +import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; +import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageRepository; import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; public final class StorageTypes { @@ -8,4 +14,21 @@ public final class StorageTypes { private StorageTypes() { } + + static PlatformStorage createHomogeneousStorage(final StorageType type, + final StorageCodecs.StorageData data, + final Runnable listener) { + final TrackedStorageRepository trackingRepository = new InMemoryTrackedStorageRepository(); + final TrackedStorageImpl tracked = new TrackedStorageImpl( + new InMemoryStorageImpl(), + trackingRepository, + System::currentTimeMillis + ); + final PlatformStorage storage = data.capacity().map(capacity -> { + final LimitedStorageImpl limited = new LimitedStorageImpl(tracked, capacity); + return (PlatformStorage) new LimitedPlatformStorage(limited, type, trackingRepository, listener); + }).orElseGet(() -> new PlatformStorage(tracked, type, trackingRepository, listener)); + data.resources().forEach(storage::load); + return storage; + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java index d46b02d2d..4d11acc6b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java @@ -12,6 +12,7 @@ import java.util.function.UnaryOperator; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; @@ -50,14 +51,14 @@ protected void setNormalizer(final UnaryOperator normalizer) { } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); configContainer.load(tag); } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); configContainer.save(tag); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java index de2ae7155..bb9c59a6c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java @@ -12,6 +12,7 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import java.util.ArrayList; @@ -19,7 +20,6 @@ import java.util.Optional; import java.util.stream.Stream; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; @@ -38,20 +38,19 @@ public class DiskDriveContainerMenu extends AbstractStorageContainerMenu impleme private final List diskSlots = new ArrayList<>(); - public DiskDriveContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public DiskDriveContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { super(Menus.INSTANCE.getDiskDrive(), syncId); - this.storageInfoAccessor = new StorageDiskInfoAccessorImpl(PlatformApi.INSTANCE.getStorageRepository( - playerInventory.player.level() - )); + this.storageInfoAccessor = new StorageDiskInfoAccessorImpl(PlatformApi.INSTANCE.getClientStorageRepository()); addSlots( playerInventory.player, new FilteredContainer( AbstractDiskDriveBlockEntity.AMOUNT_OF_DISKS, StorageContainerItem.stackValidator() ), - ResourceContainerImpl.createForFilter() + ResourceContainerImpl.createForFilter(resourceContainerData) ); - initializeResourceSlots(buf); } DiskDriveContainerMenu(final int syncId, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java index f95788cd5..1361cb1df 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java @@ -22,6 +22,7 @@ import java.util.function.UnaryOperator; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; @@ -99,24 +100,24 @@ protected void setNormalizer(final UnaryOperator normalizer) { } @Override - public void load(final CompoundTag tag) { + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_UPGRADES)) { - upgradeContainer.fromTag(tag.getList(TAG_UPGRADES, Tag.TAG_COMPOUND)); + upgradeContainer.fromTag(tag.getList(TAG_UPGRADES, Tag.TAG_COMPOUND), provider); } configureAccordingToUpgrades(); - super.load(tag); + super.loadAdditional(tag, provider); } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - tag.put(TAG_UPGRADES, upgradeContainer.createTag()); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + tag.put(TAG_UPGRADES, upgradeContainer.createTag(provider)); tag.putInt(TAG_FILTER_MODE, FilterModeSettings.getFilterMode(mainNode.getFilterMode())); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); if (tag.contains(TAG_TRANSFER_MODE)) { mainNode.setMode(TransferModeSettings.getTransferMode(tag.getInt(TAG_TRANSFER_MODE))); } @@ -126,8 +127,8 @@ public void readConfiguration(final CompoundTag tag) { } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); tag.putInt(TAG_TRANSFER_MODE, TransferModeSettings.getTransferMode(mainNode.getMode())); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java index 6ebe012eb..99237eda6 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java @@ -16,12 +16,12 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeSlot; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; @@ -66,7 +66,9 @@ public class DiskInterfaceContainerMenu extends AbstractResourceContainerMenu { )); } - public DiskInterfaceContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public DiskInterfaceContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { super(Menus.INSTANCE.getDiskInterface(), syncId); addSlots( playerInventory.player, @@ -74,10 +76,9 @@ public DiskInterfaceContainerMenu(final int syncId, final Inventory playerInvent AbstractDiskInterfaceBlockEntity.AMOUNT_OF_DISKS, StorageContainerItem.stackValidator() ), - ResourceContainerImpl.createForFilter(), + ResourceContainerImpl.createForFilter(resourceContainerData), new UpgradeContainer(UpgradeDestinations.DISK_INTERFACE, PlatformApi.INSTANCE.getUpgradeRegistry()) ); - initializeResourceSlots(buf); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); registerProperty(new ClientProperty<>(PropertyTypes.FILTER_MODE, FilterMode.BLOCK)); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java index af9c4f13d..18e5864dc 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java @@ -8,20 +8,21 @@ import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainerImpl; import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -29,9 +30,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static java.util.Objects.requireNonNull; + public class ExternalStorageBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider { + implements NetworkNodeExtendedMenuProvider { private static final Logger LOGGER = LoggerFactory.getLogger(ExternalStorageBlockEntity.class); private static final String TAG_TRACKED_RESOURCES = "tr"; @@ -115,34 +118,41 @@ public void doWork() { } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - tag.put(TAG_TRACKED_RESOURCES, trackedStorageRepository.toTag()); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + tag.put(TAG_TRACKED_RESOURCES, trackedStorageRepository.toTag(provider)); } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); - filter.save(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); + filter.save(tag, provider); configContainer.save(tag); } @Override - public void load(final CompoundTag tag) { - super.load(tag); - trackedStorageRepository.fromTag(tag.getList(TAG_TRACKED_RESOURCES, Tag.TAG_COMPOUND)); + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.loadAdditional(tag, provider); + if (tag.contains(TAG_TRACKED_RESOURCES)) { + trackedStorageRepository.fromTag(requireNonNull(tag.get(TAG_TRACKED_RESOURCES)), provider); + } } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); - filter.load(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); + filter.load(tag, provider); configContainer.load(tag); } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - filter.getFilterContainer().writeToUpdatePacket(buf); + public ResourceContainerData getMenuData() { + return ResourceContainerData.of(filter.getFilterContainer()); + } + + @Override + public StreamEncoder getMenuCodec() { + return ResourceContainerData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java index 37aacfa0d..3caa108c0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java @@ -6,9 +6,9 @@ import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainer; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; @@ -19,10 +19,11 @@ public class ExternalStorageContainerMenu extends AbstractStorageContainerMenu { private static final int FILTER_SLOT_X = 8; private static final int FILTER_SLOT_Y = 20; - public ExternalStorageContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public ExternalStorageContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { super(Menus.INSTANCE.getExternalStorage(), syncId); - addSlots(playerInventory.player, ResourceContainerImpl.createForFilter()); - initializeResourceSlots(buf); + addSlots(playerInventory.player, ResourceContainerImpl.createForFilter(resourceContainerData)); } ExternalStorageContainerMenu(final int syncId, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java index 9661cc923..83f0dcfd6 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java @@ -3,23 +3,27 @@ import com.refinedmods.refinedstorage2.api.resource.ResourceKey; import com.refinedmods.refinedstorage2.api.storage.Actor; import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; import java.util.Collections; -import java.util.Map; +import java.util.List; -import net.minecraft.nbt.CompoundTag; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.ListTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.nbt.NbtOps; +import net.minecraft.nbt.Tag; class ExternalStorageTrackedStorageRepository extends InMemoryTrackedStorageRepository { - private static final String TAG_MODIFIED_BY = "mb"; - private static final String TAG_MODIFIED_AT = "ma"; - private static final String TAG_RESOURCE_TYPE = "rt"; + private static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + ResourceCodecs.CODEC.fieldOf("resource").forGetter(ChangedByAt::resource), + Codec.STRING.fieldOf("changedBy").forGetter(ChangedByAt::changedBy), + Codec.LONG.fieldOf("changedAt").forGetter(ChangedByAt::changedAt) + ).apply(instance, ChangedByAt::new)); + private static final Codec> LIST_CODEC = Codec.list(CODEC); private final Runnable listener; @@ -33,49 +37,38 @@ public void update(final ResourceKey resource, final Actor actor, final long tim listener.run(); } - ListTag toTag() { - final ListTag items = new ListTag(); - getPersistentTrackedResources().forEach((resource, trackedResource) -> { - if (!(resource instanceof PlatformResourceKey platformResource)) { - return; - } - final ResourceType resourceType = platformResource.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresent(id -> { - final CompoundTag tag = platformResource.toTag(); - tag.putString(TAG_MODIFIED_BY, trackedResource.getSourceName()); - tag.putLong(TAG_MODIFIED_AT, trackedResource.getTime()); - tag.putString(TAG_RESOURCE_TYPE, id.toString()); - items.add(tag); - }); - }); - return items; + Tag toTag(final HolderLookup.Provider provider) { + return LIST_CODEC.encode( + getTrackedResources(), + provider.createSerializationContext(NbtOps.INSTANCE), + new ListTag() + ).getOrThrow(); } - void fromTag(final ListTag items) { - items.forEach(tag -> { - final ResourceLocation resourceTypeId = new ResourceLocation( - ((CompoundTag) tag).getString(TAG_RESOURCE_TYPE) - ); - fromTag((CompoundTag) tag, resourceTypeId); - }); + private List getTrackedResources() { + return trackedResourcesByActorType.getOrDefault(PlayerActor.class, Collections.emptyMap()) + .entrySet() + .stream() + .filter(entry -> entry.getKey() instanceof PlatformResourceKey) + .map(entry -> new ChangedByAt( + (PlatformResourceKey) entry.getKey(), + entry.getValue().getSourceName(), + entry.getValue().getTime() + )) + .toList(); } - private void fromTag(final CompoundTag tag, final ResourceLocation resourceTypeId) { - PlatformApi.INSTANCE.getResourceTypeRegistry() - .get(resourceTypeId) - .flatMap(resourceType -> resourceType.fromTag(tag)) - .ifPresent(resource -> { - final String modifiedBy = tag.getString(TAG_MODIFIED_BY); - final long modifiedAt = tag.getLong(TAG_MODIFIED_AT); - // Call super here to avoid marking dirty. - super.update(resource, new PlayerActor(modifiedBy), modifiedAt); - }); + void fromTag(final Tag tag, final HolderLookup.Provider provider) { + LIST_CODEC.decode(provider.createSerializationContext(NbtOps.INSTANCE), tag).ifSuccess( + result -> result.getFirst().forEach( + // call super to avoid marking dirty + changedByAt -> super.update( + changedByAt.resource(), + new PlayerActor(changedByAt.changedBy()), + changedByAt.changedAt() + ))); } - private Map getPersistentTrackedResources() { - return trackedResourcesByActorType.getOrDefault( - PlayerActor.class, - Collections.emptyMap() - ); + private record ChangedByAt(PlatformResourceKey resource, String changedBy, long changedAt) { } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java index f69d122c3..220e5e1ed 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java @@ -10,6 +10,8 @@ import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.grid.GridData; +import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; import com.refinedmods.refinedstorage2.platform.common.storage.Disk; import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; import com.refinedmods.refinedstorage2.platform.common.storage.DiskStateChangeListener; @@ -21,21 +23,24 @@ import com.refinedmods.refinedstorage2.platform.common.support.energy.ItemBlockEnergyStorage; import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil; +import java.util.Optional; import javax.annotation.Nullable; import com.google.common.util.concurrent.RateLimiter; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -43,8 +48,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class AbstractPortableGridBlockEntity extends BlockEntity implements ExtendedMenuProvider, - ConfigurationCardTarget, TransferableBlockEntityEnergy { +public abstract class AbstractPortableGridBlockEntity extends BlockEntity + implements ExtendedMenuProvider, ConfigurationCardTarget, TransferableBlockEntityEnergy { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPortableGridBlockEntity.class); private static final String TAG_DISK_INVENTORY = "inv"; @@ -69,21 +74,26 @@ protected AbstractPortableGridBlockEntity(final PortableGridType type, final Blo this.grid = new InWorldPortableGrid(energyStorage, diskInventory, diskStateListener, this); } - static void readDiskInventory(final CompoundTag tag, final DiskInventory diskInventory) { + static void readDiskInventory(final CompoundTag tag, + final DiskInventory diskInventory, + final HolderLookup.Provider provider) { if (tag.contains(TAG_DISK_INVENTORY)) { - ContainerUtil.read(tag.getCompound(TAG_DISK_INVENTORY), diskInventory); + ContainerUtil.read(tag.getCompound(TAG_DISK_INVENTORY), diskInventory, provider); } } - static void writeDiskInventory(final CompoundTag tag, final DiskInventory diskInventory) { - tag.put(TAG_DISK_INVENTORY, ContainerUtil.write(diskInventory)); + static void writeDiskInventory(final CompoundTag tag, + final DiskInventory diskInventory, + final HolderLookup.Provider provider) { + tag.put(TAG_DISK_INVENTORY, ContainerUtil.write(diskInventory, provider)); } - static ItemStack getDisk(final CompoundTag tag) { + static ItemStack getDisk(final CustomData customData, final HolderLookup.Provider provider) { + final CompoundTag tag = customData.copyTag(); if (!tag.contains(TAG_DISK_INVENTORY)) { return ItemStack.EMPTY; } - return ContainerUtil.getItemInSlot(tag.getCompound(TAG_DISK_INVENTORY), 0); + return ContainerUtil.getItemInSlot(tag.getCompound(TAG_DISK_INVENTORY), 0, provider); } private static EnergyStorage createEnergyStorage(final PortableGridType type, final BlockEntity blockEntity) { @@ -146,16 +156,16 @@ private void initialize(final Level level) { } @Override - public void load(final CompoundTag tag) { + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { fromClientTag(tag); - readDiskInventory(tag, diskInventory); + readDiskInventory(tag, diskInventory, provider); ItemBlockEnergyStorage.readFromTag(energyStorage, tag); - readConfiguration(tag); - super.load(tag); + readConfiguration(tag, provider); + super.loadAdditional(tag, provider); } @Override - public void readConfiguration(final CompoundTag tag) { + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_REDSTONE_MODE)) { redstoneMode = RedstoneModeSettings.getRedstoneMode(tag.getInt(TAG_REDSTONE_MODE)); } @@ -174,15 +184,15 @@ protected void onClientDriveStateUpdated() { } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - writeDiskInventory(tag, diskInventory); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + writeDiskInventory(tag, diskInventory, provider); ItemBlockEnergyStorage.writeToTag(tag, energyStorage.getStored()); - writeConfiguration(tag); + writeConfiguration(tag, provider); } @Override - public void writeConfiguration(final CompoundTag tag) { + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { tag.putInt(TAG_REDSTONE_MODE, RedstoneModeSettings.getRedstoneMode(redstoneMode)); } @@ -192,7 +202,7 @@ public Packet getUpdatePacket() { } @Override - public CompoundTag getUpdateTag() { + public CompoundTag getUpdateTag(final HolderLookup.Provider provider) { final CompoundTag tag = new CompoundTag(); tag.put(TAG_DISKS, diskInventory.toSyncTag(idx -> grid.getStorageState())); return tag; @@ -219,10 +229,18 @@ public AbstractGridContainerMenu createMenu(final int syncId, final Inventory in } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - PlatformApi.INSTANCE.writeGridScreenOpeningData(grid, buf); - buf.writeLong(energyStorage.getStored()); - buf.writeLong(energyStorage.getCapacity()); + public PortableGridData getMenuData() { + return new PortableGridData( + GridData.of(grid), + energyStorage.getStored(), + energyStorage.getCapacity(), + Optional.empty() + ); + } + + @Override + public StreamEncoder getMenuCodec() { + return PortableGridData.STREAM_CODEC; } DiskInventory getDiskInventory() { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java index 9229f1a42..0674b691a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java @@ -4,6 +4,7 @@ import com.refinedmods.refinedstorage2.platform.api.grid.Grid; import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem; import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot; @@ -12,7 +13,6 @@ import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; @@ -29,11 +29,15 @@ public abstract class AbstractPortableGridContainerMenu extends AbstractGridCont final MenuType menuType, final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf + final PortableGridData portableGridData ) { - super(menuType, syncId, playerInventory, buf); + super(menuType, syncId, playerInventory, portableGridData.gridData()); this.diskInventory = new FilteredContainer(1, StorageContainerItem.stackValidator()); - this.energyInfo = EnergyInfo.forClient(playerInventory.player, buf.readLong(), buf.readLong()); + this.energyInfo = EnergyInfo.forClient( + playerInventory.player, + portableGridData.stored(), + portableGridData.capacity() + ); } AbstractPortableGridContainerMenu( diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java index 047058204..a8ded69f4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java @@ -1,19 +1,19 @@ package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; import com.refinedmods.refinedstorage2.platform.common.content.Menus; +import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; public class PortableGridBlockContainerMenu extends AbstractPortableGridContainerMenu { public PortableGridBlockContainerMenu(final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf) { - super(Menus.INSTANCE.getPortableGridBlock(), syncId, playerInventory, buf); + final PortableGridData portableGridData) { + super(Menus.INSTANCE.getPortableGridBlock(), syncId, playerInventory, portableGridData); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); this.onScreenReady(0); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItem.java index 8090bf465..0a9bb2ba4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItem.java @@ -9,6 +9,7 @@ import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem; import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage2.platform.api.support.energy.AbstractEnergyBlockItem; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.Platform; @@ -17,19 +18,29 @@ import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; import com.refinedmods.refinedstorage2.platform.common.support.energy.CreativeEnergyStorage; +import java.util.Optional; import javax.annotation.Nullable; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public class PortableGridBlockItem extends AbstractEnergyBlockItem { + private static final Component HELP = createTranslation("item", "portable_grid.help"); + private final PortableGridType type; public PortableGridBlockItem(final Block block, final PortableGridType type) { @@ -37,15 +48,14 @@ public PortableGridBlockItem(final Block block, final PortableGridType type) { this.type = type; } - public static PortableGridBlockItemRenderInfo getRenderInfo(final ItemStack stack, - @Nullable final Level level) { + public static PortableGridBlockItemRenderInfo getRenderInfo(final ItemStack stack, final Level level) { final boolean creative = isCreative(stack); final boolean hasEnergy = creative || createEnergyStorage(stack).getStored() > 0; - final ItemStack diskStack = getDisk(stack); + final ItemStack diskStack = getDisk(stack, level.registryAccess()); final boolean active = hasEnergy && !diskStack.isEmpty(); final Disk disk = new Disk( diskStack.isEmpty() ? null : diskStack.getItem(), - getState(diskStack, active, level) + getState(diskStack, active) ); return new PortableGridBlockItemRenderInfo(active, disk); } @@ -55,32 +65,32 @@ private static boolean isCreative(final ItemStack stack) { && portableGridBlockItem.type == PortableGridType.CREATIVE; } - private static StorageState getState(final ItemStack diskStack, - final boolean active, - @Nullable final Level level) { + private static StorageState getState(final ItemStack diskStack, final boolean active) { if (diskStack.isEmpty() || !(diskStack.getItem() instanceof StorageContainerItem storageContainerItem)) { return StorageState.NONE; } - if (!active || level == null) { + if (!active) { return StorageState.INACTIVE; } - final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); + final StorageRepository storageRepository = PlatformApi.INSTANCE.getClientStorageRepository(); return storageContainerItem.getInfo(storageRepository, diskStack) .map(storageInfo -> StateTrackedStorage.computeState(storageInfo.capacity(), storageInfo.stored())) .orElse(StorageState.INACTIVE); } - private static ItemStack getDisk(final ItemStack stack) { - final CompoundTag tag = getBlockEntityData(stack); - if (tag == null) { + private static ItemStack getDisk(final ItemStack stack, final HolderLookup.Provider provider) { + final CustomData blockEntityData = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (blockEntityData == null) { return ItemStack.EMPTY; } - return AbstractPortableGridBlockEntity.getDisk(tag); + return AbstractPortableGridBlockEntity.getDisk(blockEntityData, provider); } - static void setDiskInventory(final ItemStack stack, final DiskInventory diskInventory) { + static void setDiskInventory(final ItemStack stack, + final DiskInventory diskInventory, + final HolderLookup.Provider provider) { final CompoundTag tag = new CompoundTag(); - AbstractPortableGridBlockEntity.writeDiskInventory(tag, diskInventory); + AbstractPortableGridBlockEntity.writeDiskInventory(tag, diskInventory, provider); setBlockEntityData( stack, isCreative(stack) @@ -107,8 +117,8 @@ public InteractionResultHolder use(final Level level, final Player pl if (player instanceof ServerPlayer serverPlayer && level.getServer() != null) { final SlotReference slotReference = PlatformApi.INSTANCE.createInventorySlotReference(player, hand); final PortableGridEnergyStorage energyStorage = createEnergyStorageInternal(stack); - final DiskInventoryListenerImpl listener = new DiskInventoryListenerImpl(stack); - final DiskInventory diskInventory = createDiskInventory(stack, listener); + final DiskInventoryListenerImpl listener = new DiskInventoryListenerImpl(stack, level.registryAccess()); + final DiskInventory diskInventory = createDiskInventory(stack, listener, level.registryAccess()); diskInventory.setStorageRepository(PlatformApi.INSTANCE.getStorageRepository(level)); final PortableGrid portableGrid = new PortableGrid( energyStorage, @@ -136,22 +146,31 @@ private PortableGridEnergyStorage createEnergyStorageInternal(final ItemStack st return new PortableGridEnergyStorage(createEnergyStorage(stack)); } - private DiskInventory createDiskInventory(final ItemStack stack, final DiskInventoryListenerImpl listener) { + private DiskInventory createDiskInventory(final ItemStack stack, + final DiskInventoryListenerImpl listener, + final HolderLookup.Provider provider) { final DiskInventory diskInventory = new DiskInventory(listener, 1); - final CompoundTag tag = getBlockEntityData(stack); - if (tag != null) { - AbstractPortableGridBlockEntity.readDiskInventory(tag, diskInventory); + final CustomData customData = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (customData != null) { + AbstractPortableGridBlockEntity.readDiskInventory(customData.copyTag(), diskInventory, provider); } return diskInventory; } + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(HELP)); + } + private static class DiskInventoryListenerImpl implements DiskInventory.DiskListener { private final ItemStack portableGridStack; + private final HolderLookup.Provider provider; @Nullable private PortableGrid portableGrid; - private DiskInventoryListenerImpl(final ItemStack portableGridStack) { + private DiskInventoryListenerImpl(final ItemStack portableGridStack, final HolderLookup.Provider provider) { this.portableGridStack = portableGridStack; + this.provider = provider; } @Override @@ -160,7 +179,7 @@ public void onDiskChanged(final DiskInventory inventory, final int slot) { if (stillLoading) { return; } - setDiskInventory(portableGridStack, inventory); + setDiskInventory(portableGridStack, inventory, provider); final boolean wasActive = portableGrid.isGridActive(); portableGrid.updateStorage(); final boolean isActive = portableGrid.isGridActive(); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java index 32388cb79..254bfd8e7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java @@ -1,21 +1,20 @@ package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.grid.Grid; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.content.Menus; +import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; public class PortableGridItemContainerMenu extends AbstractPortableGridContainerMenu { public PortableGridItemContainerMenu(final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf) { - super(Menus.INSTANCE.getPortableGridItem(), syncId, playerInventory, buf); - this.disabledSlot = PlatformApi.INSTANCE.getSlotReference(buf).orElse(null); + final PortableGridData portableGridData) { + super(Menus.INSTANCE.getPortableGridItem(), syncId, playerInventory, portableGridData); + this.disabledSlot = portableGridData.slotReference().orElse(null); this.onScreenReady(0); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java index 2f3f300b3..d7f034ce4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java @@ -1,23 +1,25 @@ package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.grid.Grid; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage2.platform.common.grid.GridData; +import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; +import java.util.Optional; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; -class PortableGridItemExtendedMenuProvider implements ExtendedMenuProvider { +class PortableGridItemExtendedMenuProvider implements ExtendedMenuProvider { private final Grid grid; private final EnergyStorage energyStorage; private final DiskInventory diskInventory; @@ -34,11 +36,18 @@ class PortableGridItemExtendedMenuProvider implements ExtendedMenuProvider { } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - PlatformApi.INSTANCE.writeGridScreenOpeningData(grid, buf); - buf.writeLong(energyStorage.getStored()); - buf.writeLong(energyStorage.getCapacity()); - PlatformApi.INSTANCE.writeSlotReference(slotReference, buf); + public PortableGridData getMenuData() { + return new PortableGridData( + GridData.of(grid), + energyStorage.getStored(), + energyStorage.getCapacity(), + Optional.of(slotReference) + ); + } + + @Override + public StreamEncoder getMenuCodec() { + return PortableGridData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridLootItemFunction.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridLootItemFunction.java index 941eef37d..809654db5 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridLootItemFunction.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridLootItemFunction.java @@ -11,7 +11,7 @@ public class PortableGridLootItemFunction extends EnergyLootItemFunction { @Override - public LootItemFunctionType getType() { + public LootItemFunctionType getType() { return LootFunctions.INSTANCE.getPortableGrid(); } @@ -19,7 +19,11 @@ public LootItemFunctionType getType() { public ItemStack apply(final ItemStack itemStack, final LootContext lootContext) { final BlockEntity blockEntity = lootContext.getParam(LootContextParams.BLOCK_ENTITY); if (blockEntity instanceof AbstractPortableGridBlockEntity portableGrid) { - PortableGridBlockItem.setDiskInventory(itemStack, portableGrid.getDiskInventory()); + PortableGridBlockItem.setDiskInventory( + itemStack, + portableGrid.getDiskInventory(), + lootContext.getLevel().registryAccess() + ); } return super.apply(itemStack, lootContext); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java index 3570421c0..85ee8c8ef 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java @@ -4,14 +4,16 @@ import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; import com.refinedmods.refinedstorage2.api.storage.Storage; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.api.storage.StorageBlockEntity; import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainerImpl; import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import java.util.Optional; @@ -19,9 +21,10 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; @@ -30,7 +33,8 @@ abstract class AbstractStorageBlockBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider, StorageBlockEntity, AbstractStorageContainerNetworkNode.Provider { + implements NetworkNodeExtendedMenuProvider, StorageBlockEntity, + AbstractStorageContainerNetworkNode.Provider { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStorageBlockBlockEntity.class); private static final String TAG_STORAGE_ID = "sid"; @@ -62,7 +66,7 @@ protected AbstractStorageBlockBlockEntity(final BlockEntityType type, mainNode.getStorageConfiguration().setNormalizer(filter.createNormalizer()); } - protected abstract Storage createStorage(Runnable listener); + protected abstract SerializableStorage createStorage(Runnable listener); @Override public void setLevel(final Level level) { @@ -79,40 +83,40 @@ public void setLevel(final Level level) { // In both cases listed above we need to clean up the storage we create here. storageId = UUID.randomUUID(); final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); - final Storage storage = createStorage(storageRepository::markAsChanged); + final SerializableStorage storage = createStorage(storageRepository::markAsChanged); storageRepository.set(storageId, storage); } mainNode.setProvider(this); } @Override - public void load(final CompoundTag tag) { + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_STORAGE_ID)) { setStorageId(tag.getUUID(TAG_STORAGE_ID)); } - super.load(tag); + super.loadAdditional(tag, provider); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); configContainer.load(tag); - filter.load(tag); + filter.load(tag, provider); } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); if (storageId != null) { tag.putUUID(TAG_STORAGE_ID, storageId); } } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); configContainer.save(tag); - filter.save(tag); + filter.save(tag, provider); } @Override @@ -148,10 +152,17 @@ protected final ResourceContainer getFilterContainer() { } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - buf.writeLong(mainNode.getStored()); - buf.writeLong(mainNode.getCapacity()); - filter.getFilterContainer().writeToUpdatePacket(buf); + public StorageBlockData getMenuData() { + return new StorageBlockData( + mainNode.getStored(), + mainNode.getCapacity(), + ResourceContainerData.of(filter.getFilterContainer()) + ); + } + + @Override + public StreamEncoder getMenuCodec() { + return StorageBlockData.STREAM_CODEC; } @Override @@ -160,6 +171,6 @@ public Optional resolve(final int index) { return Optional.empty(); } final StorageRepository storageRepository = PlatformApi.INSTANCE.getStorageRepository(level); - return storageRepository.get(storageId); + return storageRepository.get(storageId).map(Storage.class::cast); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java index 0b541f166..b09397b91 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java @@ -9,7 +9,6 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; @@ -27,13 +26,15 @@ public abstract class AbstractStorageBlockContainerMenu extends AbstractStorageC protected AbstractStorageBlockContainerMenu(final MenuType type, final int syncId, final Player player, - final FriendlyByteBuf buf, + final StorageBlockData storageBlockData, final ResourceFactory resourceFactory) { super(type, syncId); - this.stored = buf.readLong(); - this.capacity = buf.readLong(); - addSlots(player, ResourceContainerImpl.createForFilter(resourceFactory)); - initializeResourceSlots(buf); + this.stored = storageBlockData.stored(); + this.capacity = storageBlockData.capacity(); + addSlots( + player, + ResourceContainerImpl.createForFilter(resourceFactory, storageBlockData.resourceContainerData()) + ); } protected AbstractStorageBlockContainerMenu(final MenuType type, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java index 6b34e6fa1..ac00f09c3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.api.storage.Storage; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; @@ -50,7 +50,7 @@ private static long getEnergyUsage(final FluidStorageType.Variant variant) { } @Override - protected Storage createStorage(final Runnable listener) { + protected SerializableStorage createStorage(final Runnable listener) { return StorageTypes.FLUID.create(variant.getCapacity(), listener); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java index d43dc07d5..eb6055a3e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java @@ -2,22 +2,32 @@ import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.storage.AbstractStorageContainerBlockItem; +import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage2.platform.common.content.Blocks; import com.refinedmods.refinedstorage2.platform.common.content.Items; import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceRendering; +import java.util.Optional; import javax.annotation.Nullable; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public class FluidStorageBlockBlockItem extends AbstractStorageContainerBlockItem { + private static final Component CREATIVE_HELP = createTranslation("item", "creative_fluid_storage_block.help"); + private final FluidStorageType.Variant variant; + private final Component helpText; public FluidStorageBlockBlockItem(final Block block, final FluidStorageType.Variant variant) { super( @@ -26,6 +36,18 @@ public FluidStorageBlockBlockItem(final Block block, final FluidStorageType.Vari PlatformApi.INSTANCE.getStorageContainerItemHelper() ); this.variant = variant; + this.helpText = getHelpText(variant); + } + + private static Component getHelpText(final FluidStorageType.Variant variant) { + if (variant.getCapacityInBuckets() == null) { + return CREATIVE_HELP; + } + return createTranslation( + "item", + "fluid_storage_block.help", + AmountFormatting.format(variant.getCapacityInBuckets()) + ); } @Override @@ -60,4 +82,9 @@ protected boolean placeBlock(final BlockPlaceContext ctx, final BlockState state } return super.placeBlock(ctx, state); } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(helpText)); + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java index 038e67fe0..3eb701054 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java @@ -5,19 +5,18 @@ import com.refinedmods.refinedstorage2.platform.common.content.Menus; import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainer; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; public class FluidStorageBlockContainerMenu extends AbstractStorageBlockContainerMenu { public FluidStorageBlockContainerMenu(final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf) { + final StorageBlockData storageBlockData) { super( Menus.INSTANCE.getFluidStorage(), syncId, playerInventory.player, - buf, + storageBlockData, PlatformApi.INSTANCE.getFluidResourceFactory() ); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java index 0efc11d89..2561211da 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java @@ -1,8 +1,8 @@ package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.api.storage.Storage; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; @@ -46,7 +46,7 @@ private static long getEnergyUsage(final ItemStorageType.Variant variant) { } @Override - protected Storage createStorage(final Runnable listener) { + protected SerializableStorage createStorage(final Runnable listener) { return StorageTypes.ITEM.create(variant.getCapacity(), listener); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java index 3e6bb5634..f77bb8a28 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java @@ -3,21 +3,30 @@ import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.storage.AbstractStorageContainerBlockItem; import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage2.platform.common.content.Blocks; import com.refinedmods.refinedstorage2.platform.common.content.Items; import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; +import java.util.Optional; import javax.annotation.Nullable; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public class ItemStorageBlockBlockItem extends AbstractStorageContainerBlockItem { + private static final Component CREATIVE_HELP = createTranslation("item", "creative_storage_block.help"); + private final ItemStorageType.Variant variant; + private final Component helpText; public ItemStorageBlockBlockItem(final Block block, final ItemStorageType.Variant variant) { super( @@ -26,6 +35,9 @@ public ItemStorageBlockBlockItem(final Block block, final ItemStorageType.Varian PlatformApi.INSTANCE.getStorageContainerItemHelper() ); this.variant = variant; + this.helpText = variant.getCapacity() == null + ? CREATIVE_HELP + : createTranslation("item", "storage_block.help", AmountFormatting.format(variant.getCapacity())); } @Override @@ -60,4 +72,9 @@ protected boolean placeBlock(final BlockPlaceContext ctx, final BlockState state } return super.placeBlock(ctx, state); } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(helpText)); + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java index 47f29c553..33993082e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java @@ -5,17 +5,18 @@ import com.refinedmods.refinedstorage2.platform.common.content.Menus; import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainer; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; public class ItemStorageBlockContainerMenu extends AbstractStorageBlockContainerMenu { - public ItemStorageBlockContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public ItemStorageBlockContainerMenu(final int syncId, + final Inventory playerInventory, + final StorageBlockData storageBlockData) { super( Menus.INSTANCE.getItemStorage(), syncId, playerInventory.player, - buf, + storageBlockData, PlatformApi.INSTANCE.getItemResourceFactory() ); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockData.java new file mode 100644 index 000000000..a8ae6950a --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockData.java @@ -0,0 +1,16 @@ +package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; + +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record StorageBlockData(long stored, long capacity, ResourceContainerData resourceContainerData) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.VAR_LONG, StorageBlockData::stored, + ByteBufCodecs.VAR_LONG, StorageBlockData::capacity, + ResourceContainerData.STREAM_CODEC, StorageBlockData::resourceContainerData, + StorageBlockData::new + ); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockLootItemFunction.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockLootItemFunction.java index 6f064375d..c4c23903a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockLootItemFunction.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockLootItemFunction.java @@ -13,7 +13,7 @@ public class StorageBlockLootItemFunction implements LootItemFunction { @Override - public LootItemFunctionType getType() { + public LootItemFunctionType getType() { return LootFunctions.INSTANCE.getStorageBlock(); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/FluidStorageDiskItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/FluidStorageDiskItem.java index ebc6260a9..2663d7ee0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/FluidStorageDiskItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/FluidStorageDiskItem.java @@ -1,21 +1,31 @@ package com.refinedmods.refinedstorage2.platform.common.storage.storagedisk; -import com.refinedmods.refinedstorage2.api.storage.Storage; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.storage.AbstractStorageContainerItem; +import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage2.platform.common.content.Items; import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes; import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceRendering; +import java.util.Optional; import javax.annotation.Nullable; +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public class FluidStorageDiskItem extends AbstractStorageContainerItem { + private static final Component CREATIVE_HELP = createTranslation("item", "creative_fluid_storage_disk.help"); + private final FluidStorageType.Variant variant; + private final Component helpText; public FluidStorageDiskItem(final FluidStorageType.Variant variant) { super( @@ -23,6 +33,18 @@ public FluidStorageDiskItem(final FluidStorageType.Variant variant) { PlatformApi.INSTANCE.getStorageContainerItemHelper() ); this.variant = variant; + this.helpText = getHelpText(variant); + } + + private static Component getHelpText(final FluidStorageType.Variant variant) { + if (variant.getCapacityInBuckets() == null) { + return CREATIVE_HELP; + } + return createTranslation( + "item", + "fluid_storage_disk.help", + AmountFormatting.format(variant.getCapacityInBuckets()) + ); } @Override @@ -36,7 +58,7 @@ protected String formatAmount(final long amount) { } @Override - protected Storage createStorage(final StorageRepository storageRepository) { + protected SerializableStorage createStorage(final StorageRepository storageRepository) { return StorageTypes.FLUID.create(variant.getCapacity(), storageRepository::markAsChanged); } @@ -53,4 +75,9 @@ protected ItemStack createSecondaryDisassemblyByproduct(final int count) { } return new ItemStack(Items.INSTANCE.getFluidStoragePart(variant), count); } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(helpText)); + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/ItemStorageDiskItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/ItemStorageDiskItem.java index d2aec853b..2b6fde9e7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/ItemStorageDiskItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/ItemStorageDiskItem.java @@ -1,21 +1,30 @@ package com.refinedmods.refinedstorage2.platform.common.storage.storagedisk; -import com.refinedmods.refinedstorage2.api.storage.Storage; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.storage.AbstractStorageContainerItem; +import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage2.platform.common.content.Items; import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes; +import java.util.Optional; import javax.annotation.Nullable; +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public class ItemStorageDiskItem extends AbstractStorageContainerItem { + private static final Component CREATIVE_HELP = createTranslation("item", "creative_storage_disk.help"); + private final ItemStorageType.Variant variant; + private final Component helpText; public ItemStorageDiskItem(final ItemStorageType.Variant variant) { super( @@ -23,6 +32,9 @@ public ItemStorageDiskItem(final ItemStorageType.Variant variant) { PlatformApi.INSTANCE.getStorageContainerItemHelper() ); this.variant = variant; + this.helpText = variant.getCapacity() == null + ? CREATIVE_HELP + : createTranslation("item", "storage_disk.help", AmountFormatting.format(variant.getCapacity())); } @Override @@ -36,7 +48,7 @@ protected String formatAmount(final long amount) { } @Override - protected Storage createStorage(final StorageRepository storageRepository) { + protected SerializableStorage createStorage(final StorageRepository storageRepository) { return StorageTypes.ITEM.create(variant.getCapacity(), storageRepository::markAsChanged); } @@ -53,4 +65,9 @@ protected ItemStack createSecondaryDisassemblyByproduct(final int count) { } return new ItemStack(Items.INSTANCE.getItemStoragePart(variant), count); } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(helpText)); + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java index 5a91d2740..6bca4e51f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java @@ -24,7 +24,7 @@ public boolean extract(final ResourceKey resource, } final long extracted = network.getComponent(StorageNetworkComponent.class).extract( itemResource, - fullStack ? itemResource.item().getMaxStackSize() : 1, + fullStack ? itemResource.item().getDefaultMaxStackSize() : 1, Action.EXECUTE, actor ); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java index 0dbe62d15..90e48831a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java @@ -4,6 +4,7 @@ import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType; import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; @@ -13,9 +14,12 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; +import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.EntityBlock; @@ -26,7 +30,10 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public class StorageMonitorBlock extends AbstractDirectionalBlock implements EntityBlock { + private static final Component HELP = createTranslation("item", "storage_monitor.help"); private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getStorageMonitor); @@ -53,19 +60,15 @@ public BlockEntityTicker getTicker(final Level level, } @Override - @SuppressWarnings("deprecation") - public InteractionResult use(final BlockState state, - final Level level, - final BlockPos pos, - final Player player, - final InteractionHand hand, - final BlockHitResult hit) { + protected ItemInteractionResult useItemOn(final ItemStack stack, + final BlockState state, + final Level level, + final BlockPos pos, + final Player player, + final InteractionHand hand, + final BlockHitResult hitResult) { if (player.isCrouching()) { - return super.use(state, level, pos, player, hand, hit); - } - final BiDirection direction = getDirection(state); - if (direction == null || hit.getDirection() != direction.asDirection()) { - return InteractionResult.FAIL; + return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } if (!level.isClientSide()) { final BlockEntity blockEntity = level.getBlockEntity(pos); @@ -73,7 +76,7 @@ public InteractionResult use(final BlockState state, storageMonitor.insert(player, hand); } } - return InteractionResult.SUCCESS; + return ItemInteractionResult.SUCCESS; } @Override @@ -109,4 +112,8 @@ private Direction getHitDirection(final Level level, final Player player) { player )).getDirection(); } + + public BlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntity.java index 1043d23cb..6b752af4c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntity.java @@ -15,20 +15,22 @@ import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; import com.google.common.util.concurrent.RateLimiter; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; @@ -43,7 +45,7 @@ import org.slf4j.LoggerFactory; public class StorageMonitorBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider { + implements NetworkNodeExtendedMenuProvider { private static final Logger LOGGER = LoggerFactory.getLogger(StorageMonitorBlockEntity.class); private static final String TAG_CLIENT_FILTER = "cf"; @@ -258,30 +260,35 @@ public boolean isCurrentlyActive() { } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); - filter.save(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); + filter.save(tag, provider); } @Override - public void load(final CompoundTag tag) { + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_CLIENT_FILTER) && tag.contains(TAG_CLIENT_AMOUNT) && tag.contains(TAG_CLIENT_ACTIVE)) { - filter.getFilterContainer().fromTag(tag.getCompound(TAG_CLIENT_FILTER)); + filter.getFilterContainer().fromTag(tag.getCompound(TAG_CLIENT_FILTER), provider); currentAmount = tag.getLong(TAG_CLIENT_AMOUNT); currentlyActive = tag.getBoolean(TAG_CLIENT_ACTIVE); } - super.load(tag); + super.loadAdditional(tag, provider); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); - filter.load(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); + filter.load(tag, provider); } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - filter.getFilterContainer().writeToUpdatePacket(buf); + public ResourceContainerData getMenuData() { + return ResourceContainerData.of(filter.getFilterContainer()); + } + + @Override + public StreamEncoder getMenuCodec() { + return ResourceContainerData.STREAM_CODEC; } @Override @@ -301,9 +308,9 @@ public ClientboundBlockEntityDataPacket getUpdatePacket() { } @Override - public CompoundTag getUpdateTag() { + public CompoundTag getUpdateTag(final HolderLookup.Provider provider) { final CompoundTag tag = new CompoundTag(); - tag.put(TAG_CLIENT_FILTER, filter.getFilterContainer().toTag()); + tag.put(TAG_CLIENT_FILTER, filter.getFilterContainer().toTag(provider)); tag.putLong(TAG_CLIENT_AMOUNT, currentAmount); tag.putBoolean(TAG_CLIENT_ACTIVE, currentlyActive); return tag; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorContainerMenu.java index 6d52fd1aa..58f1defc2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorContainerMenu.java @@ -9,9 +9,9 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -21,12 +21,13 @@ public class StorageMonitorContainerMenu extends AbstractResourceContainerMenu { private static final Component FILTER_HELP = createTranslation("gui", "storage_monitor.filter_help"); - public StorageMonitorContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { + public StorageMonitorContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { super(Menus.INSTANCE.getStorageMonitor(), syncId); registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - addSlots(playerInventory, ResourceContainerImpl.createForFilter(1)); - initializeResourceSlots(buf); + addSlots(playerInventory, ResourceContainerImpl.createForFilter(resourceContainerData)); } StorageMonitorContainerMenu(final int syncId, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java index 220180bcf..fc99345dc 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java @@ -11,8 +11,11 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundSource; +import net.minecraft.tags.TagKey; import net.minecraft.world.Containers; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -20,6 +23,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; @@ -35,6 +39,11 @@ import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; public abstract class AbstractBaseBlock extends Block { + private static final TagKey WRENCH_TAG = TagKey.create( + Registries.ITEM, + ResourceLocation.fromNamespaceAndPath("c", "tools/wrench") + ); + protected AbstractBaseBlock(final Properties properties) { super(properties); registerDefaultState(getDefaultState()); @@ -45,15 +54,13 @@ protected BlockState getDefaultState() { } @Override - @SuppressWarnings("deprecation") - public InteractionResult use(final BlockState state, - final Level level, - final BlockPos pos, - final Player player, - final InteractionHand hand, - final BlockHitResult hit) { - return tryOpenScreen(state, level, pos, player, hit.getLocation()) - .orElseGet(() -> super.use(state, level, pos, player, hand, hit)); + public InteractionResult useWithoutItem(final BlockState state, + final Level level, + final BlockPos pos, + final Player player, + final BlockHitResult hitResult) { + return tryOpenScreen(state, level, pos, player, hitResult.getLocation()) + .orElseGet(() -> super.useWithoutItem(state, level, pos, player, hitResult)); } @Nullable @@ -100,7 +107,7 @@ private void tryOpenScreen(final ServerPlayer player, final MenuProvider menuPro @SuppressWarnings("deprecation") public MenuProvider getMenuProvider(final BlockState state, final Level level, final BlockPos pos) { final BlockEntity blockEntity = level.getBlockEntity(pos); - return blockEntity instanceof MenuProvider factory ? factory : null; + return blockEntity instanceof MenuProvider provider ? provider : null; } @Override @@ -202,7 +209,7 @@ protected BlockState getRotatedBlockState(final BlockState state, final Level le } private boolean isWrench(final ItemStack item) { - return item.is(Platform.INSTANCE.getWrenchTag()); + return item.is(WRENCH_TAG); } private boolean dismantle(final BlockState state, @@ -220,7 +227,7 @@ private boolean dismantle(final BlockState state, } final ItemStack stack = Platform.INSTANCE.getCloneItemStack(state, level, hitResult, player); if (blockEntity != null) { - blockEntity.saveToItem(stack); + blockEntity.saveToItem(stack, level.registryAccess()); // Ensure that we don't drop items level.removeBlockEntity(hitResult.getBlockPos()); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalCableBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalCableBlock.java index f7651d654..4df5bd2bc 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalCableBlock.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalCableBlock.java @@ -77,11 +77,7 @@ protected BlockState getRotatedBlockState(final BlockState state, final Level le } @Override - @SuppressWarnings("deprecation") - public boolean isPathfindable(final BlockState state, - final BlockGetter world, - final BlockPos pos, - final PathComputationType type) { + protected boolean isPathfindable(final BlockState state, final PathComputationType type) { return false; } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java index 82308ca32..0e3a6b211 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java @@ -8,6 +8,7 @@ import java.nio.file.StandardCopyOption; import com.mojang.logging.LogUtils; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.nbt.NbtUtils; @@ -18,14 +19,14 @@ public abstract class AbstractSafeSavedData extends SavedData { private static final Logger LOGGER = LogUtils.getLogger(); @Override - public void save(final File file) { + public void save(final File file, final HolderLookup.Provider provider) { if (!isDirty()) { return; } final var targetPath = file.toPath().toAbsolutePath(); final var tempFile = targetPath.getParent().resolve(file.getName() + ".temp"); final CompoundTag compoundTag = new CompoundTag(); - compoundTag.put("data", this.save(new CompoundTag())); + compoundTag.put("data", this.save(new CompoundTag(), provider)); NbtUtils.addCurrentDataVersion(compoundTag); try { doSave(compoundTag, tempFile, targetPath); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockEntityWithDrops.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockEntityWithDrops.java index e8a676aad..21367032b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockEntityWithDrops.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockEntityWithDrops.java @@ -3,6 +3,7 @@ import net.minecraft.core.NonNullList; import net.minecraft.world.item.ItemStack; +@FunctionalInterface public interface BlockEntityWithDrops { NonNullList getDrops(); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterWithFuzzyMode.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterWithFuzzyMode.java index 8008773f9..88453f9bc 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterWithFuzzyMode.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterWithFuzzyMode.java @@ -10,6 +10,7 @@ import java.util.function.UnaryOperator; import javax.annotation.Nullable; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; public final class FilterWithFuzzyMode { @@ -61,9 +62,9 @@ public void setFuzzyMode(final boolean fuzzyMode) { } } - public void load(final CompoundTag tag) { + public void load(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_RESOURCE_FILTER)) { - filterContainer.fromTag(tag.getCompound(TAG_RESOURCE_FILTER)); + filterContainer.fromTag(tag.getCompound(TAG_RESOURCE_FILTER), provider); } if (tag.contains(TAG_FUZZY_MODE)) { fuzzyMode = tag.getBoolean(TAG_FUZZY_MODE); @@ -80,9 +81,9 @@ private void notifyListeners() { } } - public void save(final CompoundTag tag) { + public void save(final CompoundTag tag, final HolderLookup.Provider provider) { tag.putBoolean(TAG_FUZZY_MODE, fuzzyMode); - tag.put(TAG_RESOURCE_FILTER, filterContainer.toTag()); + tag.put(TAG_RESOURCE_FILTER, filterContainer.toTag(provider)); } public UnaryOperator createNormalizer() { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/NetworkNodeBlockItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/NetworkNodeBlockItem.java index ef29acba8..82e9d94de 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/NetworkNodeBlockItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/NetworkNodeBlockItem.java @@ -11,10 +11,6 @@ import net.minecraft.world.level.block.state.BlockState; public class NetworkNodeBlockItem extends BaseBlockItem { - public NetworkNodeBlockItem(final Block block) { - super(block); - } - public NetworkNodeBlockItem(final Block block, final Component helpText) { super(block, helpText); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ServerToClientCommunications.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ServerToClientCommunications.java deleted file mode 100644 index 6ed54994f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ServerToClientCommunications.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterStatus; - -import java.util.UUID; -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; - -public interface ServerToClientCommunications { - void sendEnergyInfo(ServerPlayer player, long stored, long capacity); - - void sendWirelessTransmitterRange(ServerPlayer player, int range); - - void sendGridActiveness(ServerPlayer player, boolean active); - - void sendGridUpdate(ServerPlayer player, - PlatformResourceKey resource, - long change, - @Nullable TrackedResource trackedResource); - - void sendGridClear(ServerPlayer player); - - void sendResourceSlotUpdate(ServerPlayer player, - @Nullable ResourceAmount resourceAmount, - int slotIndex); - - void sendStorageInfoResponse(ServerPlayer player, UUID id, StorageInfo storageInfo); - - void sendNetworkTransmitterStatus(ServerPlayer player, NetworkTransmitterStatus status); - - void sendNoPermission(ServerPlayer player, Component message); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractAmountScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractAmountScreen.java index 6656ef050..51dcf7d9c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractAmountScreen.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractAmountScreen.java @@ -166,7 +166,9 @@ private void changeAmount(final int delta) { } private int correctDelta(final N oldAmount, final int delta) { - if (oldAmount.intValue() == 1 && delta > 0) { + // if we do +10, and the current value is 1, we want to end up with 10, not 11 + // if we do +1, and the current value is 1, we want to end up with 2 + if (oldAmount.intValue() == 1 && delta > 1) { return delta - 1; } return delta; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractResourceContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractResourceContainerMenu.java index d5ce5eef0..4c1030f16 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractResourceContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractResourceContainerMenu.java @@ -2,15 +2,14 @@ import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; import java.util.ArrayList; import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; @@ -31,12 +30,6 @@ protected AbstractResourceContainerMenu(@Nullable final MenuType type, final this.player = null; } - protected void initializeResourceSlots(final FriendlyByteBuf buf) { - for (final ResourceSlot resourceSlot : resourceSlots) { - resourceSlot.readFromUpdatePacket(buf); - } - } - private Optional getResourceSlot(final int slotIndex) { if (slotIndex < 0 || slotIndex >= slots.size()) { return Optional.empty(); @@ -60,7 +53,7 @@ public void handleResourceSlotChange(final int slotIndex, final boolean tryAlter } public void sendResourceSlotChange(final int slotIndex, final boolean tryAlternatives) { - Platform.INSTANCE.getClientToServerCommunications().sendResourceSlotChange(slotIndex, tryAlternatives); + C2SPackets.sendResourceSlotChange(slotIndex, tryAlternatives); } public void handleResourceSlotAmountChange(final int slotIndex, final long amount) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java index fc8b301a9..5ccbd32ae 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java @@ -4,10 +4,10 @@ import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; import com.refinedmods.refinedstorage2.platform.common.support.SchedulingModeType; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; @@ -27,10 +27,10 @@ protected AbstractSchedulingContainerMenu(final MenuType type, protected AbstractSchedulingContainerMenu(final MenuType type, final int syncId, final Player player, - final FriendlyByteBuf buf, + final ResourceContainerData resourceContainerData, final UpgradeDestinations upgradeDestination, final Component filterHelp) { - super(type, syncId, player, buf, upgradeDestination, filterHelp); + super(type, syncId, player, resourceContainerData, upgradeDestination, filterHelp); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java index 385536763..bfef87943 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java @@ -2,6 +2,7 @@ import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; @@ -9,7 +10,6 @@ import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; @@ -39,7 +39,7 @@ protected AbstractSimpleFilterContainerMenu(final MenuType type, protected AbstractSimpleFilterContainerMenu(final MenuType type, final int syncId, final Player player, - final FriendlyByteBuf buf, + final ResourceContainerData resourceContainerData, @Nullable final UpgradeDestinations upgradeDestination, final Component filterHelp) { super(type, syncId); @@ -47,12 +47,11 @@ protected AbstractSimpleFilterContainerMenu(final MenuType type, registerClientProperties(); addSlots( player, - ResourceContainerImpl.createForFilter(), + ResourceContainerImpl.createForFilter(resourceContainerData), upgradeDestination == null ? null : new UpgradeContainer(upgradeDestination, PlatformApi.INSTANCE.getUpgradeRegistry()) ); - initializeResourceSlots(buf); } protected abstract void registerClientProperties(); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java index 43ebc8c3f..36be68320 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java @@ -1,14 +1,12 @@ package com.refinedmods.refinedstorage2.platform.common.support.containermenu; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -22,16 +20,16 @@ public abstract class AbstractSingleAmountContainerMenu extends AbstractResource protected AbstractSingleAmountContainerMenu(final MenuType type, final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf, + final SingleAmountData singleAmountData, final Component filterHelpText) { super(type, syncId); - if (buf.readBoolean()) { - disabledSlot = PlatformApi.INSTANCE.getSlotReference(buf).orElse(null); - } - this.clientAmount = buf.readDouble(); + this.disabledSlot = singleAmountData.slotReference().orElse(null); + this.clientAmount = singleAmountData.amount(); this.filterHelpText = filterHelpText; - addSlots(playerInventory.player, ResourceContainerImpl.createForFilter(1)); - initializeResourceSlots(buf); + addSlots( + playerInventory.player, + ResourceContainerImpl.createForFilter(singleAmountData.resourceContainerData()) + ); } protected AbstractSingleAmountContainerMenu(final MenuType type, @@ -46,7 +44,8 @@ protected AbstractSingleAmountContainerMenu(final MenuType type, addSlots(player, resourceContainer); } - private void addSlots(final Player player, final ResourceContainer resourceContainer) { + private void addSlots(final Player player, + final ResourceContainer resourceContainer) { addSlot(new ResourceSlot(resourceContainer, 0, filterHelpText, 116, 47, ResourceSlotType.FILTER)); addPlayerInventory(player.getInventory(), 8, 106); transferManager.addFilterTransfer(player.getInventory()); @@ -57,23 +56,9 @@ public double getAmount() { } public void changeAmountOnClient(final double newAmount) { - Platform.INSTANCE.getClientToServerCommunications().sendSingleAmountChange(newAmount); + C2SPackets.sendSingleAmountChange(newAmount); this.clientAmount = newAmount; } public abstract void changeAmountOnServer(double newAmount); - - public static void writeToBuf(final FriendlyByteBuf buf, - final double amount, - final ResourceContainer container, - @Nullable final SlotReference disabledSlotReference) { - if (disabledSlotReference != null) { - buf.writeBoolean(true); - PlatformApi.INSTANCE.writeSlotReference(disabledSlotReference, buf); - } else { - buf.writeBoolean(false); - } - buf.writeDouble(amount); - container.writeToUpdatePacket(buf); - } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ClientProperty.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ClientProperty.java index d78d56b35..9fd18d0e9 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ClientProperty.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ClientProperty.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage2.platform.common.support.containermenu; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; import net.minecraft.world.inventory.DataSlot; @@ -26,7 +26,7 @@ public T getValue() { } public void setValue(final T newValue) { - Platform.INSTANCE.getClientToServerCommunications().sendPropertyChange(type, newValue); + C2SPackets.sendPropertyChange(type, newValue); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ExtendedMenuProvider.java index 95e91f4aa..e95dcba18 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ExtendedMenuProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ExtendedMenuProvider.java @@ -1,9 +1,11 @@ package com.refinedmods.refinedstorage2.platform.common.support.containermenu; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.MenuProvider; -public interface ExtendedMenuProvider extends MenuProvider { - void writeScreenOpeningData(ServerPlayer player, FriendlyByteBuf buf); +public interface ExtendedMenuProvider extends MenuProvider { + T getMenuData(); + + StreamEncoder getMenuCodec(); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java new file mode 100644 index 000000000..38d6bf9f8 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java @@ -0,0 +1,4 @@ +package com.refinedmods.refinedstorage2.platform.common.support.containermenu; + +public interface NetworkNodeExtendedMenuProvider extends ExtendedMenuProvider, NetworkNodeMenuProvider { +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeMenuProvider.java index f8b3338d3..e0f1fa2b1 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeMenuProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeMenuProvider.java @@ -7,8 +7,9 @@ import java.util.Set; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.MenuProvider; -public interface NetworkNodeMenuProvider extends ExtendedMenuProvider { +public interface NetworkNodeMenuProvider extends MenuProvider { Set getContainers(); default boolean canOpen(final ServerPlayer player) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlot.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlot.java index f46202352..7ead68ef6 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlot.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlot.java @@ -5,13 +5,13 @@ import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; @@ -159,7 +159,7 @@ public void changeAmountOnClient(final double amount) { return; } final long normalizedAmount = resource.getResourceType().normalizeAmount(amount); - Platform.INSTANCE.getClientToServerCommunications().sendResourceSlotAmountChange(index, normalizedAmount); + C2SPackets.sendResourceSlotAmountChange(index, normalizedAmount); } public boolean contains(final ItemStack stack) { @@ -176,11 +176,7 @@ public void broadcastChanges(final Player player) { } private void broadcastChange(final ServerPlayer player, @Nullable final ResourceAmount contents) { - Platform.INSTANCE.getServerToClientCommunications().sendResourceSlotUpdate(player, contents, index); - } - - public void readFromUpdatePacket(final FriendlyByteBuf buf) { - resourceContainer.readFromUpdatePacket(getContainerSlot(), buf); + S2CPackets.sendResourceSlotUpdate(player, contents, index); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/SingleAmountData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/SingleAmountData.java new file mode 100644 index 000000000..1d2a9389f --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/SingleAmountData.java @@ -0,0 +1,22 @@ +package com.refinedmods.refinedstorage2.platform.common.support.containermenu; + +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; + +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record SingleAmountData(Optional slotReference, + double amount, + ResourceContainerData resourceContainerData) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.optional(SlotReferenceFactory.STREAM_CODEC), SingleAmountData::slotReference, + ByteBufCodecs.DOUBLE, SingleAmountData::amount, + ResourceContainerData.STREAM_CODEC, SingleAmountData::resourceContainerData, + SingleAmountData::new + ); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyInfo.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyInfo.java index df26a4ee0..944dcfaff 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyInfo.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyInfo.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage2.platform.common.support.energy; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; import java.util.Collections; import java.util.List; @@ -46,11 +46,7 @@ public void detectChanges() { final boolean changed = stored != newStored || capacity != newCapacity; if (changed && rateLimiter.tryAcquire()) { setEnergy(newStored, newCapacity); - Platform.INSTANCE.getServerToClientCommunications().sendEnergyInfo( - (ServerPlayer) player, - newStored, - newCapacity - ); + S2CPackets.sendEnergyInfo((ServerPlayer) player, newStored, newCapacity); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyLootItemFunction.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyLootItemFunction.java index 59c6157ea..7aae06d83 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyLootItemFunction.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyLootItemFunction.java @@ -14,7 +14,7 @@ public class EnergyLootItemFunction implements LootItemFunction { @Override - public LootItemFunctionType getType() { + public LootItemFunctionType getType() { return LootFunctions.INSTANCE.getEnergy(); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemBlockEnergyStorage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemBlockEnergyStorage.java index 6a516e92b..eed24b2cd 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemBlockEnergyStorage.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemBlockEnergyStorage.java @@ -4,9 +4,11 @@ import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage2.api.network.impl.energy.AbstractListeningEnergyStorage; +import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; import net.minecraft.world.level.block.entity.BlockEntityType; public class ItemBlockEnergyStorage extends AbstractListeningEnergyStorage { @@ -21,18 +23,16 @@ public ItemBlockEnergyStorage(final EnergyStorage energyStorage, super(energyStorage); this.stack = stack; this.blockEntityType = blockEntityType; - final CompoundTag tag = BlockItem.getBlockEntityData(stack); - if (tag != null) { - readFromTag(energyStorage, tag); + final CustomData customData = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (customData != null) { + readFromTag(energyStorage, customData.copyTag()); } } @Override protected void onStoredChanged(final long stored) { - CompoundTag tag = BlockItem.getBlockEntityData(stack); - if (tag == null) { - tag = new CompoundTag(); - } + final CustomData customData = stack.get(DataComponents.BLOCK_ENTITY_DATA); + final CompoundTag tag = customData == null ? new CompoundTag() : customData.copyTag(); writeToTag(tag, stored); BlockItem.setBlockEntityData(stack, blockEntityType, tag); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemEnergyStorage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemEnergyStorage.java index f9b714cb0..d095707b3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemEnergyStorage.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemEnergyStorage.java @@ -3,25 +3,24 @@ import com.refinedmods.refinedstorage2.api.core.Action; import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage2.api.network.impl.energy.AbstractListeningEnergyStorage; +import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; import net.minecraft.world.item.ItemStack; public class ItemEnergyStorage extends AbstractListeningEnergyStorage { - private static final String TAG_STORED = "stored"; - private final ItemStack stack; public ItemEnergyStorage(final ItemStack stack, final EnergyStorage delegate) { super(delegate); this.stack = stack; - final long stored = stack.getTag() != null ? stack.getTag().getLong(TAG_STORED) : 0; - if (stored > 0) { + final Long stored = stack.get(DataComponents.INSTANCE.getEnergy()); + if (stored != null && stored > 0) { delegate.receive(stored, Action.EXECUTE); } } @Override protected void onStoredChanged(final long stored) { - stack.getOrCreateTag().putLong(TAG_STORED, stored); + stack.set(DataComponents.INSTANCE.getEnergy(), stored); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java index e54dbc67a..3666e983d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java @@ -12,6 +12,7 @@ import javax.annotation.Nullable; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Player; @@ -42,30 +43,30 @@ protected boolean calculateActive() { } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - writeConfiguration(tag); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + writeConfiguration(tag, provider); if (placedByPlayerId != null) { tag.putUUID(TAG_PLACED_BY_PLAYER_ID, placedByPlayerId); } } @Override - public void writeConfiguration(final CompoundTag tag) { + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { tag.putInt(TAG_REDSTONE_MODE, RedstoneModeSettings.getRedstoneMode(getRedstoneMode())); } @Override - public void load(final CompoundTag tag) { - super.load(tag); - readConfiguration(tag); + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.loadAdditional(tag, provider); + readConfiguration(tag, provider); if (tag.hasUUID(TAG_PLACED_BY_PLAYER_ID)) { placedByPlayerId = tag.getUUID(TAG_PLACED_BY_PLAYER_ID); } } @Override - public void readConfiguration(final CompoundTag tag) { + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_REDSTONE_MODE)) { redstoneMode = RedstoneModeSettings.getRedstoneMode(tag.getInt(TAG_REDSTONE_MODE)); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java index df09b565f..de140b737 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java @@ -6,23 +6,25 @@ import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; import com.refinedmods.refinedstorage2.platform.common.support.SchedulingMode; import com.refinedmods.refinedstorage2.platform.common.support.SchedulingModeType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; import java.util.List; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; public abstract class AbstractSchedulingNetworkNodeContainerBlockEntity extends AbstractUpgradeableNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider { + implements NetworkNodeExtendedMenuProvider { protected final FilterWithFuzzyMode filter; private final SchedulingMode schedulingMode; @@ -43,17 +45,17 @@ protected AbstractSchedulingNetworkNodeContainerBlockEntity( } @Override - public void writeConfiguration(final CompoundTag tag) { - super.writeConfiguration(tag); + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); schedulingMode.writeToTag(tag); - filter.save(tag); + filter.save(tag, provider); } @Override - public void readConfiguration(final CompoundTag tag) { - super.readConfiguration(tag); + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); schedulingMode.load(tag); - filter.load(tag); + filter.load(tag, provider); } public void setSchedulingModeType(final SchedulingModeType type) { @@ -76,8 +78,13 @@ public void setFuzzyMode(final boolean fuzzyMode) { } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - filter.getFilterContainer().writeToUpdatePacket(buf); + public ResourceContainerData getMenuData() { + return ResourceContainerData.of(filter.getFilterContainer()); + } + + @Override + public StreamEncoder getMenuCodec() { + return ResourceContainerData.STREAM_CODEC; } protected abstract void setTaskExecutor(TaskExecutor taskExecutor); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java index e98174976..1b6c5ff59 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java @@ -11,6 +11,7 @@ import java.util.List; import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; @@ -88,18 +89,18 @@ public boolean addUpgradeItem(final Item upgradeItem) { } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - tag.put(TAG_UPGRADES, upgradeContainer.createTag()); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + tag.put(TAG_UPGRADES, upgradeContainer.createTag(provider)); } @Override - public void load(final CompoundTag tag) { + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_UPGRADES)) { - upgradeContainer.fromTag(tag.getList(TAG_UPGRADES, Tag.TAG_COMPOUND)); + upgradeContainer.fromTag(tag.getList(TAG_UPGRADES, Tag.TAG_COMPOUND), provider); } configureAccordingToUpgrades(); - super.load(tag); + super.loadAdditional(tag, provider); } private void configureAccordingToUpgrades() { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReference.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReference.java index dfa9b0a6e..18496014e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReference.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReference.java @@ -5,14 +5,13 @@ import java.util.Optional; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; public final class InventorySlotReference implements SlotReference { - private final int slotIndex; + final int slotIndex; InventorySlotReference(final int slotIndex) { this.slotIndex = slotIndex; @@ -37,11 +36,6 @@ public boolean isDisabledSlot(final int playerSlotIndex) { return playerSlotIndex == slotIndex; } - @Override - public void writeToBuffer(final FriendlyByteBuf buf) { - buf.writeInt(slotIndex); - } - public static SlotReference of(final Player player, final InteractionHand hand) { return new InventorySlotReference(hand == InteractionHand.MAIN_HAND ? player.getInventory().selected diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java index 98c1b76c8..2173165b9 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java @@ -3,16 +3,25 @@ import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; public class InventorySlotReferenceFactory implements SlotReferenceFactory { public static final SlotReferenceFactory INSTANCE = new InventorySlotReferenceFactory(); + private static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.INT, slotReference -> slotReference.slotIndex, + InventorySlotReference::new + ); + private InventorySlotReferenceFactory() { } @Override - public SlotReference create(final FriendlyByteBuf buf) { - return new InventorySlotReference(buf.readInt()); + @SuppressWarnings({"rawtypes", "unchecked"}) + public StreamCodec getStreamCodec() { + return (StreamCodec) STREAM_CODEC; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java index 2e67583a4..94b3d3f28 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java @@ -5,19 +5,15 @@ import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; import java.util.List; -import java.util.Objects; import java.util.Optional; import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.Registries; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.core.GlobalPos; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResult; import net.minecraft.world.inventory.tooltip.TooltipComponent; @@ -32,23 +28,14 @@ public class NetworkBoundItemHelperImpl implements NetworkBoundItemHelper { .withStyle(ChatFormatting.RED); private static final Component UNBOUND_HELP = createTranslation("item", "network_item.unbound.help"); - private static final String TAG_X = "x"; - private static final String TAG_Y = "y"; - private static final String TAG_Z = "z"; - private static final String TAG_DIMENSION = "dim"; - @Override public boolean isBound(final ItemStack stack) { - final CompoundTag tag = stack.getTag(); - if (tag == null) { - return false; - } - return tag.contains(TAG_X) && tag.contains(TAG_Y) && tag.contains(TAG_Z) && tag.contains(TAG_DIMENSION); + return stack.has(DataComponents.INSTANCE.getNetworkLocation()); } @Override public void addTooltip(final ItemStack stack, final List lines) { - getNetworkReference(stack).ifPresentOrElse( + getNetworkLocation(stack).ifPresentOrElse( network -> lines.add(createTranslation( "item", "network_item.bound_to", @@ -70,11 +57,8 @@ public InteractionResult bind(final UseOnContext ctx) { if (!(blockEntity instanceof NetworkBoundItemTargetBlockEntity)) { return InteractionResult.PASS; } - final CompoundTag tag = stack.getOrCreateTag(); - tag.putInt(TAG_X, blockEntity.getBlockPos().getX()); - tag.putInt(TAG_Y, blockEntity.getBlockPos().getY()); - tag.putInt(TAG_Z, blockEntity.getBlockPos().getZ()); - tag.putString(TAG_DIMENSION, ctx.getLevel().dimension().location().toString()); + final GlobalPos pos = GlobalPos.of(ctx.getLevel().dimension(), blockEntity.getBlockPos()); + stack.set(DataComponents.INSTANCE.getNetworkLocation(), pos); return InteractionResult.SUCCESS; } @@ -90,26 +74,15 @@ public Optional getTooltipImage(final ItemStack stack) { public NetworkBoundItemSession openSession(final ItemStack stack, final ServerPlayer player, final SlotReference slotReference) { - final Optional networkReference = getNetworkReference(stack); + final Optional location = getNetworkLocation(stack); return new NetworkBoundItemSessionImpl( player, slotReference, - networkReference.orElse(null) + location.orElse(null) ); } - private Optional getNetworkReference(final ItemStack stack) { - if (!isBound(stack)) { - return Optional.empty(); - } - final CompoundTag tag = Objects.requireNonNull(stack.getTag()); - final int x = tag.getInt(TAG_X); - final int y = tag.getInt(TAG_Y); - final int z = tag.getInt(TAG_Z); - final ResourceLocation dimension = new ResourceLocation(tag.getString(TAG_DIMENSION)); - return Optional.of(new NetworkBoundItemSessionImpl.NetworkReference( - ResourceKey.create(Registries.DIMENSION, dimension), - new BlockPos(x, y, z) - )); + private Optional getNetworkLocation(final ItemStack stack) { + return Optional.ofNullable(stack.get(DataComponents.INSTANCE.getNetworkLocation())); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java index 5261c73ab..311c67550 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java @@ -10,8 +10,10 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + public class NetworkBoundItemItemPropertyFunction implements ClampedItemPropertyFunction { - public static final ResourceLocation NAME = new ResourceLocation("active"); + public static final ResourceLocation NAME = createIdentifier("network_bound_active"); @Override public float unclampedCall(final ItemStack itemStack, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java index dccc47afd..d124dbcc2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java @@ -12,10 +12,8 @@ import java.util.Optional; import javax.annotation.Nullable; -import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceKey; +import net.minecraft.core.GlobalPos; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; class NetworkBoundItemSessionImpl implements NetworkBoundItemSession { @@ -23,12 +21,12 @@ class NetworkBoundItemSessionImpl implements NetworkBoundItemSession { private final Vec3 playerPosition; private final SlotReference slotReference; @Nullable - private final NetworkReference networkReference; + private final GlobalPos networkLocation; NetworkBoundItemSessionImpl( final Player player, final SlotReference slotReference, - @Nullable final NetworkReference networkReference + @Nullable final GlobalPos networkLocation ) { this.player = player; // We copy the player position as it can change after opening the network bound item (opening while walking) @@ -37,18 +35,18 @@ class NetworkBoundItemSessionImpl implements NetworkBoundItemSession { // be removed after it was added). this.playerPosition = new Vec3(player.position().x, player.position().y, player.position().z); this.slotReference = slotReference; - this.networkReference = networkReference; + this.networkLocation = networkLocation; } @Override public Optional resolveNetwork() { - if (networkReference == null) { + if (networkLocation == null) { return Optional.empty(); } return Optional.ofNullable(player.getServer()) - .map(server -> server.getLevel(networkReference.dimensionKey())) - .filter(level -> level.isLoaded(networkReference.pos())) - .map(level -> level.getBlockEntity(networkReference.pos())) + .map(server -> server.getLevel(networkLocation.dimension())) + .filter(level -> level.isLoaded(networkLocation.pos())) + .map(level -> level.getBlockEntity(networkLocation.pos())) .filter(NetworkBoundItemTargetBlockEntity.class::isInstance) .map(NetworkBoundItemTargetBlockEntity.class::cast) .map(NetworkBoundItemTargetBlockEntity::getNetworkForBoundItem) @@ -79,7 +77,4 @@ public void drainEnergy(final long amount) { energyStorage -> energyStorage.extract(amount, Action.EXECUTE) ); } - - record NetworkReference(ResourceKey dimensionKey, BlockPos pos) { - } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketContext.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketContext.java new file mode 100644 index 000000000..0bccaf3b6 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketContext.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet; + +import net.minecraft.world.entity.player.Player; + +@FunctionalInterface +public interface PacketContext { + Player getPlayer(); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketHandler.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketHandler.java new file mode 100644 index 000000000..e0d9c7b7c --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketHandler.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet; + +@FunctionalInterface +public interface PacketHandler { + void handle(T packet, PacketContext ctx); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketIds.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketIds.java deleted file mode 100644 index c6a0ec64d..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketIds.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet; - -import net.minecraft.resources.ResourceLocation; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public final class PacketIds { - public static final ResourceLocation STORAGE_INFO_RESPONSE = createIdentifier("storage_info_response"); - public static final ResourceLocation STORAGE_INFO_REQUEST = createIdentifier("storage_info_request"); - public static final ResourceLocation ENERGY_INFO = createIdentifier("controller_energy"); - public static final ResourceLocation WIRELESS_TRANSMITTER_RANGE = createIdentifier("wireless_transmitter_range"); - public static final ResourceLocation GRID_ACTIVE = createIdentifier("grid_active"); - public static final ResourceLocation GRID_UPDATE = createIdentifier("grid_update"); - public static final ResourceLocation GRID_CLEAR = createIdentifier("grid_clear"); - public static final ResourceLocation PROPERTY_CHANGE = createIdentifier("property_change"); - public static final ResourceLocation GRID_INSERT = createIdentifier("grid_insert"); - public static final ResourceLocation GRID_EXTRACT = createIdentifier("grid_extract"); - public static final ResourceLocation GRID_SCROLL = createIdentifier("grid_scroll"); - public static final ResourceLocation CRAFTING_GRID_CLEAR = createIdentifier("crafting_grid_clear"); - public static final ResourceLocation CRAFTING_GRID_RECIPE_TRANSFER = - createIdentifier("crafting_grid_recipe_transfer"); - public static final ResourceLocation RESOURCE_SLOT_UPDATE = createIdentifier("resource_slot_update"); - public static final ResourceLocation RESOURCE_SLOT_CHANGE = createIdentifier("resource_slot_change"); - public static final ResourceLocation RESOURCE_FILTER_SLOT_CHANGE = createIdentifier("resource_filter_slot_change"); - public static final ResourceLocation RESOURCE_SLOT_AMOUNT_CHANGE = createIdentifier("resource_slot_amount_change"); - public static final ResourceLocation SINGLE_AMOUNT_CHANGE = createIdentifier("detector_amount_change"); - public static final ResourceLocation USE_NETWORK_BOUND_ITEM = createIdentifier("use_network_bound_item"); - public static final ResourceLocation NETWORK_TRANSMITTER_STATUS = createIdentifier("network_transmitter_status"); - public static final ResourceLocation SECURITY_CARD_PERMISSION = createIdentifier("security_card_permission"); - public static final ResourceLocation SECURITY_CARD_RESET_PERMISSION = createIdentifier( - "security_card_reset_permission" - ); - public static final ResourceLocation SECURITY_CARD_BOUND_PLAYER = createIdentifier("security_card_bound_player"); - public static final ResourceLocation NO_PERMISSION = createIdentifier("no_permission"); - - private PacketIds() { - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/C2SPackets.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/C2SPackets.java new file mode 100644 index 000000000..ecf525671 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/C2SPackets.java @@ -0,0 +1,83 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; + +import java.util.List; +import java.util.UUID; + +public final class C2SPackets { + private C2SPackets() { + } + + public static void sendGridExtract(final PlatformResourceKey resource, + final GridExtractMode mode, + final boolean cursor) { + Platform.INSTANCE.sendPacketToServer(new GridExtractPacket(resource, mode, cursor)); + } + + public static void sendGridScroll(final PlatformResourceKey resource, + final GridScrollMode mode, + final int slotIndex) { + Platform.INSTANCE.sendPacketToServer(new GridScrollPacket(resource, mode, slotIndex)); + } + + public static void sendGridInsert(final GridInsertMode mode, final boolean tryAlternatives) { + Platform.INSTANCE.sendPacketToServer(new GridInsertPacket(mode, tryAlternatives)); + } + + public static void sendCraftingGridClear(final boolean toPlayerInventory) { + Platform.INSTANCE.sendPacketToServer(new CraftingGridClearPacket(toPlayerInventory)); + } + + public static void sendCraftingGridRecipeTransfer(final List> recipe) { + Platform.INSTANCE.sendPacketToServer(new CraftingGridRecipeTransferPacket(recipe)); + } + + public static void sendPropertyChange(final PropertyType type, final T value) { + Platform.INSTANCE.sendPacketToServer(new PropertyChangePacket(type.id(), type.serializer().apply(value))); + } + + public static void sendStorageInfoRequest(final UUID storageId) { + Platform.INSTANCE.sendPacketToServer(new StorageInfoRequestPacket(storageId)); + } + + public static void sendResourceSlotChange(final int slotIndex, final boolean tryAlternatives) { + Platform.INSTANCE.sendPacketToServer(new ResourceSlotChangePacket(slotIndex, tryAlternatives)); + } + + public static void sendResourceFilterSlotChange(final PlatformResourceKey resource, final int slotIndex) { + Platform.INSTANCE.sendPacketToServer(new ResourceFilterSlotChangePacket(slotIndex, resource)); + } + + public static void sendResourceSlotAmountChange(final int slotIndex, final long amount) { + Platform.INSTANCE.sendPacketToServer(new ResourceSlotAmountChangePacket(slotIndex, amount)); + } + + public static void sendSingleAmountChange(final double amount) { + Platform.INSTANCE.sendPacketToServer(new SingleAmountChangePacket(amount)); + } + + public static void sendUseNetworkBoundItem(final SlotReference slotReference) { + Platform.INSTANCE.sendPacketToServer(new UseNetworkBoundItemPacket(slotReference)); + } + + public static void sendSecurityCardPermission(final PlatformPermission permission, final boolean allowed) { + Platform.INSTANCE.sendPacketToServer(new SecurityCardPermissionPacket(permission, allowed)); + } + + public static void sendSecurityCardResetPermission(final PlatformPermission permission) { + Platform.INSTANCE.sendPacketToServer(new SecurityCardResetPermissionPacket(permission)); + } + + public static void sendSecurityCardBoundPlayer(final UUID playerId) { + Platform.INSTANCE.sendPacketToServer(new SecurityCardBoundPlayerPacket(playerId)); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridClearPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridClearPacket.java new file mode 100644 index 000000000..8fe45f79d --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridClearPacket.java @@ -0,0 +1,31 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record CraftingGridClearPacket(boolean toPlayerInventory) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("crafting_grid_clear")); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.BOOL, CraftingGridClearPacket::toPlayerInventory, + CraftingGridClearPacket::new + ); + + public static void handle(final CraftingGridClearPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof CraftingGridContainerMenu craftingGridContainerMenu) { + craftingGridContainerMenu.clear(packet.toPlayerInventory()); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java new file mode 100644 index 000000000..18263739d --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record CraftingGridRecipeTransferPacket(List> recipe) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("crafting_grid_recipe_transfer") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.collection(ArrayList::new, + ByteBufCodecs.collection(ArrayList::new, ResourceCodecs.ITEM_STREAM_CODEC)), + CraftingGridRecipeTransferPacket::recipe, + CraftingGridRecipeTransferPacket::new + ); + + public static void handle(final CraftingGridRecipeTransferPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof CraftingGridContainerMenu craftingGridContainerMenu) { + craftingGridContainerMenu.transferRecipe(packet.recipe()); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridExtractPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridExtractPacket.java new file mode 100644 index 000000000..120dcc4d2 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridExtractPacket.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage2.platform.common.util.PacketUtil.enumStreamCodec; + +public record GridExtractPacket( + PlatformResourceKey resource, + GridExtractMode mode, + boolean cursor +) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_extract")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ResourceCodecs.STREAM_CODEC, GridExtractPacket::resource, + enumStreamCodec(GridExtractMode.values()), GridExtractPacket::mode, + ByteBufCodecs.BOOL, GridExtractPacket::cursor, + GridExtractPacket::new + ); + + public static void handle(final GridExtractPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof GridExtractionStrategy strategy) { + strategy.onExtract(packet.resource, packet.mode, packet.cursor); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridInsertPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridInsertPacket.java new file mode 100644 index 000000000..2516e63fe --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridInsertPacket.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage2.platform.common.util.PacketUtil.enumStreamCodec; + +public record GridInsertPacket(GridInsertMode mode, boolean tryAlternatives) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_insert")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + enumStreamCodec(GridInsertMode.values()), GridInsertPacket::mode, + ByteBufCodecs.BOOL, GridInsertPacket::tryAlternatives, + GridInsertPacket::new + ); + + public static void handle(final GridInsertPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof GridInsertionStrategy strategy) { + strategy.onInsert(packet.mode, packet.tryAlternatives); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridScrollPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridScrollPacket.java new file mode 100644 index 000000000..818b72d4a --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridScrollPacket.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage2.platform.common.util.PacketUtil.enumStreamCodec; + +public record GridScrollPacket( + PlatformResourceKey resource, + GridScrollMode mode, + int slotIndex +) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_scroll")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ResourceCodecs.STREAM_CODEC, GridScrollPacket::resource, + enumStreamCodec(GridScrollMode.values()), GridScrollPacket::mode, + ByteBufCodecs.INT, GridScrollPacket::slotIndex, + GridScrollPacket::new + ); + + public static void handle(final GridScrollPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof GridScrollingStrategy strategy) { + strategy.onScroll(packet.resource, packet.mode, packet.slotIndex); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/PropertyChangePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/PropertyChangePacket.java new file mode 100644 index 000000000..9f4e91d33 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/PropertyChangePacket.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.resources.ResourceLocation; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record PropertyChangePacket(ResourceLocation propertyId, int value) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("property_change")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ResourceLocation.STREAM_CODEC, PropertyChangePacket::propertyId, + ByteBufCodecs.INT, PropertyChangePacket::value, + PropertyChangePacket::new + ); + + public static void handle(final PropertyChangePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractBaseContainerMenu menu) { + menu.receivePropertyChangeFromClient(packet.propertyId, packet.value); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java new file mode 100644 index 000000000..284dc05c1 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java @@ -0,0 +1,38 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static java.util.Objects.requireNonNull; + +public record ResourceFilterSlotChangePacket(int slotIndex, PlatformResourceKey resource) + implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("resource_filter_slot_change") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + ByteBufCodecs.INT, ResourceFilterSlotChangePacket::slotIndex, + ResourceCodecs.STREAM_CODEC, ResourceFilterSlotChangePacket::resource, + ResourceFilterSlotChangePacket::new + ); + + public static void handle(final ResourceFilterSlotChangePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractResourceContainerMenu containerMenu) { + containerMenu.handleResourceFilterSlotUpdate(packet.slotIndex, requireNonNull(packet.resource)); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java new file mode 100644 index 000000000..0b585daeb --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record ResourceSlotAmountChangePacket(int slotIndex, long amount) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("resource_slot_amount_change") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + ByteBufCodecs.INT, ResourceSlotAmountChangePacket::slotIndex, + ByteBufCodecs.VAR_LONG, ResourceSlotAmountChangePacket::amount, + ResourceSlotAmountChangePacket::new + ); + + public static void handle(final ResourceSlotAmountChangePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractResourceContainerMenu containerMenu) { + containerMenu.handleResourceSlotAmountChange(packet.slotIndex, packet.amount); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotChangePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotChangePacket.java new file mode 100644 index 000000000..f7e40d487 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotChangePacket.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record ResourceSlotChangePacket(int slotIndex, boolean tryAlternatives) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("resource_slot_change") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + ByteBufCodecs.INT, ResourceSlotChangePacket::slotIndex, + ByteBufCodecs.BOOL, ResourceSlotChangePacket::tryAlternatives, + ResourceSlotChangePacket::new + ); + + public static void handle(final ResourceSlotChangePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractResourceContainerMenu containerMenu) { + containerMenu.handleResourceSlotChange(packet.slotIndex, packet.tryAlternatives); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java new file mode 100644 index 000000000..ada869f1f --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java @@ -0,0 +1,42 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import java.util.UUID; + +import net.minecraft.core.UUIDUtil; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record SecurityCardBoundPlayerPacket(UUID playerId) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("security_card_bound_player") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + UUIDUtil.STREAM_CODEC, SecurityCardBoundPlayerPacket::playerId, + SecurityCardBoundPlayerPacket::new + ); + + public static void handle(final SecurityCardBoundPlayerPacket packet, final PacketContext ctx) { + final Player player = ctx.getPlayer(); + final MinecraftServer server = player.getServer(); + if (server == null) { + return; + } + if (player.containerMenu instanceof SecurityCardContainerMenu securityCardContainerMenu) { + securityCardContainerMenu.setBoundPlayer(server, packet.playerId); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java new file mode 100644 index 000000000..62933cb23 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java @@ -0,0 +1,37 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage2.platform.common.security.AbstractSecurityCardContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record SecurityCardPermissionPacket(PlatformPermission permission, boolean allowed) + implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("security_card_permission") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), SecurityCardPermissionPacket::permission, + ByteBufCodecs.BOOL, SecurityCardPermissionPacket::allowed, + SecurityCardPermissionPacket::new + ); + + public static void handle(final SecurityCardPermissionPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { + securityCardContainerMenu.setPermission(packet.permission, packet.allowed); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java new file mode 100644 index 000000000..d903e0a4f --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage2.platform.common.security.AbstractSecurityCardContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record SecurityCardResetPermissionPacket(PlatformPermission permission) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("security_card_reset_permission") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), SecurityCardResetPermissionPacket::permission, + SecurityCardResetPermissionPacket::new + ); + + public static void handle(final SecurityCardResetPermissionPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { + securityCardContainerMenu.resetPermissionServer(packet.permission); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SingleAmountChangePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SingleAmountChangePacket.java new file mode 100644 index 000000000..5f4646a55 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SingleAmountChangePacket.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record SingleAmountChangePacket(double amount) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("single_amount_change") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.DOUBLE, SingleAmountChangePacket::amount, + SingleAmountChangePacket::new + ); + + public static void handle(final SingleAmountChangePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractSingleAmountContainerMenu singleAmountContainerMenu) { + singleAmountContainerMenu.changeAmountOnServer(packet.amount()); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/StorageInfoRequestPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/StorageInfoRequestPacket.java new file mode 100644 index 000000000..932d4c185 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/StorageInfoRequestPacket.java @@ -0,0 +1,41 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; + +import java.util.UUID; + +import net.minecraft.core.UUIDUtil; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record StorageInfoRequestPacket(UUID storageId) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("storage_info_request") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + UUIDUtil.STREAM_CODEC, StorageInfoRequestPacket::storageId, + StorageInfoRequestPacket::new + ); + + public static void handle(final StorageInfoRequestPacket packet, final PacketContext ctx) { + final Player player = ctx.getPlayer(); + final StorageInfo info = PlatformApi.INSTANCE + .getStorageRepository(player.getCommandSenderWorld()) + .getInfo(packet.storageId()); + S2CPackets.sendStorageInfoResponse((ServerPlayer) player, packet.storageId, info); + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/UseNetworkBoundItemPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java similarity index 50% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/UseNetworkBoundItemPacket.java rename to refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java index 52d344471..09fffeb06 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/UseNetworkBoundItemPacket.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java @@ -1,35 +1,32 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; import com.refinedmods.refinedstorage2.platform.api.support.energy.AbstractNetworkBoundEnergyItem; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; +import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; -import javax.annotation.Nullable; - -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -import static java.util.Objects.requireNonNull; -public record UseNetworkBoundItemPacket(@Nullable SlotReference slotReference) implements CustomPacketPayload { - public static UseNetworkBoundItemPacket decode(final FriendlyByteBuf buf) { - return new UseNetworkBoundItemPacket(PlatformApi.INSTANCE.getSlotReference(buf).orElse(null)); - } +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - public static void handle(final UseNetworkBoundItemPacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> doHandle(packet, player))); - } +public record UseNetworkBoundItemPacket(SlotReference slotReference) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("use_network_bound_item") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + SlotReferenceFactory.STREAM_CODEC, UseNetworkBoundItemPacket::slotReference, + UseNetworkBoundItemPacket::new + ); - private static void doHandle(final UseNetworkBoundItemPacket packet, final Player player) { - if (packet.slotReference == null) { - return; - } + public static void handle(final UseNetworkBoundItemPacket packet, final PacketContext ctx) { + final Player player = ctx.getPlayer(); packet.slotReference.resolve(player).ifPresent(stack -> { if (!(stack.getItem() instanceof AbstractNetworkBoundEnergyItem networkBoundItem)) { return; @@ -44,12 +41,7 @@ private static void doHandle(final UseNetworkBoundItemPacket packet, final Playe } @Override - public void write(final FriendlyByteBuf buf) { - PlatformApi.INSTANCE.writeSlotReference(requireNonNull(slotReference), buf); - } - - @Override - public ResourceLocation id() { - return PacketIds.USE_NETWORK_BOUND_ITEM; + public Type type() { + return PACKET_TYPE; } } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/package-info.java similarity index 73% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/package-info.java rename to refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/package-info.java index 2e5a53e4b..569d41490 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/package-info.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; +package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/EnergyInfoPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/EnergyInfoPacket.java new file mode 100644 index 000000000..9239bb930 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/EnergyInfoPacket.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.world.inventory.AbstractContainerMenu; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record EnergyInfoPacket(long stored, long capacity) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("energy_info")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.VAR_LONG, EnergyInfoPacket::stored, + ByteBufCodecs.VAR_LONG, EnergyInfoPacket::capacity, + EnergyInfoPacket::new + ); + + public static void handle(final EnergyInfoPacket packet, final PacketContext ctx) { + final AbstractContainerMenu menu = ctx.getPlayer().containerMenu; + if (menu instanceof EnergyContainerMenu energy) { + energy.getEnergyInfo().setEnergy(packet.stored, packet.capacity); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridActivePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridActivePacket.java new file mode 100644 index 000000000..7322730ae --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridActivePacket.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.world.inventory.AbstractContainerMenu; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record GridActivePacket(boolean active) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_active")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.BOOL, GridActivePacket::active, + GridActivePacket::new + ); + + public static void handle(final GridActivePacket packet, final PacketContext ctx) { + final AbstractContainerMenu menu = ctx.getPlayer().containerMenu; + if (menu instanceof GridWatcher gridWatcher) { + gridWatcher.onActiveChanged(packet.active); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridClearPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridClearPacket.java new file mode 100644 index 000000000..eb4c3c2fb --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridClearPacket.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.world.inventory.AbstractContainerMenu; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public class GridClearPacket implements CustomPacketPayload { + public static final GridClearPacket INSTANCE = new GridClearPacket(); + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_clear")); + public static final StreamCodec STREAM_CODEC = StreamCodec.unit(INSTANCE); + + private GridClearPacket() { + } + + public static void handle(final PacketContext ctx) { + final AbstractContainerMenu menu = ctx.getPlayer().containerMenu; + if (menu instanceof AbstractGridContainerMenu grid) { + grid.onClear(); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridUpdatePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridUpdatePacket.java new file mode 100644 index 000000000..13cf3c546 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridUpdatePacket.java @@ -0,0 +1,42 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.storage.StorageCodecs; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; + +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record GridUpdatePacket( + PlatformResourceKey resource, + long amount, + Optional trackedResource +) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_update")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ResourceCodecs.STREAM_CODEC, GridUpdatePacket::resource, + ByteBufCodecs.VAR_LONG, GridUpdatePacket::amount, + StorageCodecs.TRACKED_RESOURCE_OPTIONAL_STREAM_CODEC, GridUpdatePacket::trackedResource, + GridUpdatePacket::new + ); + + public static void handle(final GridUpdatePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractGridContainerMenu containerMenu) { + containerMenu.onResourceUpdate(packet.resource, packet.amount, packet.trackedResource.orElse(null)); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java new file mode 100644 index 000000000..3d88c4181 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java @@ -0,0 +1,39 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterData; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentSerialization; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.world.inventory.AbstractContainerMenu; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record NetworkTransmitterStatusPacket(boolean error, Component message) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("network_transmitter_status") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.BOOL, NetworkTransmitterStatusPacket::error, + ComponentSerialization.STREAM_CODEC, NetworkTransmitterStatusPacket::message, + NetworkTransmitterStatusPacket::new + ); + + public static void handle(final NetworkTransmitterStatusPacket packet, final PacketContext ctx) { + final AbstractContainerMenu menu = ctx.getPlayer().containerMenu; + if (menu instanceof NetworkTransmitterContainerMenu containerMenu) { + containerMenu.setStatus(new NetworkTransmitterData(packet.error, packet.message)); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NoPermissionPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NoPermissionPacket.java new file mode 100644 index 000000000..54b57af11 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NoPermissionPacket.java @@ -0,0 +1,28 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.platform.common.util.SecurityToastUtil; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentSerialization; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record NoPermissionPacket(Component component) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("no_permission")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ComponentSerialization.STREAM_CODEC, NoPermissionPacket::component, + NoPermissionPacket::new + ); + + public static void handle(final NoPermissionPacket packet) { + SecurityToastUtil.addNoPermissionToast(packet.component); + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java new file mode 100644 index 000000000..c18c6c66b --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java @@ -0,0 +1,41 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; + +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record ResourceSlotUpdatePacket( + int slotIndex, + Optional resourceAmount +) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("resource_slot_update") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.INT, ResourceSlotUpdatePacket::slotIndex, + ByteBufCodecs.optional(ResourceCodecs.AMOUNT_STREAM_CODEC), ResourceSlotUpdatePacket::resourceAmount, + ResourceSlotUpdatePacket::new + ); + + public static void handle(final ResourceSlotUpdatePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractResourceContainerMenu containerMenu) { + containerMenu.handleResourceSlotUpdate(packet.slotIndex, packet.resourceAmount.orElse(null)); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/S2CPackets.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/S2CPackets.java new file mode 100644 index 000000000..1edd95a2e --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/S2CPackets.java @@ -0,0 +1,76 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterData; + +import java.util.Optional; +import java.util.UUID; +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; + +public final class S2CPackets { + private S2CPackets() { + } + + public static void sendEnergyInfo(final ServerPlayer player, final long stored, final long capacity) { + Platform.INSTANCE.sendPacketToClient(player, new EnergyInfoPacket(stored, capacity)); + } + + public static void sendWirelessTransmitterRange(final ServerPlayer player, final int range) { + Platform.INSTANCE.sendPacketToClient(player, new WirelessTransmitterRangePacket(range)); + } + + public static void sendGridActiveness(final ServerPlayer player, final boolean active) { + Platform.INSTANCE.sendPacketToClient(player, new GridActivePacket(active)); + } + + public static void sendGridUpdate(final ServerPlayer player, + final PlatformResourceKey resource, + final long change, + @Nullable final TrackedResource trackedResource) { + Platform.INSTANCE.sendPacketToClient(player, new GridUpdatePacket( + resource, + change, + Optional.ofNullable(trackedResource) + )); + } + + public static void sendGridClear(final ServerPlayer player) { + Platform.INSTANCE.sendPacketToClient(player, GridClearPacket.INSTANCE); + } + + public static void sendResourceSlotUpdate(final ServerPlayer player, + @Nullable final ResourceAmount resourceAmount, + final int slotIndex) { + Platform.INSTANCE.sendPacketToClient(player, new ResourceSlotUpdatePacket( + slotIndex, + Optional.ofNullable(resourceAmount) + )); + } + + public static void sendStorageInfoResponse(final ServerPlayer player, + final UUID id, + final StorageInfo storageInfo) { + Platform.INSTANCE.sendPacketToClient( + player, + new StorageInfoResponsePacket(id, storageInfo.stored(), storageInfo.capacity()) + ); + } + + public static void sendNetworkTransmitterStatus(final ServerPlayer player, final NetworkTransmitterData status) { + Platform.INSTANCE.sendPacketToClient( + player, + new NetworkTransmitterStatusPacket(status.error(), status.message()) + ); + } + + public static void sendNoPermission(final ServerPlayer player, final Component message) { + Platform.INSTANCE.sendPacketToClient(player, new NoPermissionPacket(message)); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/StorageInfoResponsePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/StorageInfoResponsePacket.java new file mode 100644 index 000000000..a5d543e77 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/StorageInfoResponsePacket.java @@ -0,0 +1,38 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.common.storage.ClientStorageRepository; + +import java.util.UUID; + +import net.minecraft.core.UUIDUtil; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record StorageInfoResponsePacket(UUID storageId, long stored, long capacity) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("storage_info_response") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + UUIDUtil.STREAM_CODEC, StorageInfoResponsePacket::storageId, + ByteBufCodecs.VAR_LONG, StorageInfoResponsePacket::stored, + ByteBufCodecs.VAR_LONG, StorageInfoResponsePacket::capacity, + StorageInfoResponsePacket::new + ); + + public static void handle(final StorageInfoResponsePacket packet) { + final ClientStorageRepository storageRepository = + (ClientStorageRepository) PlatformApi.INSTANCE.getClientStorageRepository(); + storageRepository.setInfo(packet.storageId, packet.stored, packet.capacity); + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java new file mode 100644 index 000000000..25cb9803f --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; + +public record WirelessTransmitterRangePacket(int range) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("wireless_transmitter_range") + ); + + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.INT, WirelessTransmitterRangePacket::range, + WirelessTransmitterRangePacket::new + ); + + public static void handle(final WirelessTransmitterRangePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof WirelessTransmitterContainerMenu containerMenu) { + containerMenu.setRange(packet.range); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/package-info.java similarity index 73% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/package-info.java rename to refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/package-info.java index f27fc0c3e..e6b686a98 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/package-info.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; +package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImpl.java index 99e83daef..d804acfb7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImpl.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImpl.java @@ -11,6 +11,10 @@ import java.util.Optional; import javax.annotation.Nullable; +import com.mojang.serialization.Codec; +import com.mojang.serialization.DataResult; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceLocation; public class PlatformRegistryImpl implements PlatformRegistry { @@ -21,6 +25,21 @@ public class PlatformRegistryImpl implements PlatformRegistry { private final Map valueToIdMap = new HashMap<>(); private final List order = new ArrayList<>(); private final List viewList = Collections.unmodifiableList(order); + private final Codec codec = ResourceLocation.CODEC.comapFlatMap( + id -> get(id).map(DataResult::success).orElseGet(() -> DataResult.error(() -> "Unknown ID: " + id)), + value -> getId(value).orElseThrow() + ); + private final StreamCodec streamCodec = new StreamCodec<>() { + @Override + public T decode(final RegistryFriendlyByteBuf buf) { + return get(buf.readResourceLocation()).orElseThrow(); + } + + @Override + public void encode(final RegistryFriendlyByteBuf buf, final T value) { + buf.writeResourceLocation(getId(value).orElseThrow()); + } + }; @Override public void register(final ResourceLocation id, final T value) { @@ -65,4 +84,14 @@ public T nextOrNullIfLast(final T value) { } return order.get(nextIndex); } + + @Override + public Codec codec() { + return codec; + } + + @Override + public StreamCodec streamCodec() { + return streamCodec; + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractFluidRenderer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractFluidRenderer.java index 1e17d2483..0fda4fcf3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractFluidRenderer.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractFluidRenderer.java @@ -2,6 +2,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.BufferUploader; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; @@ -30,21 +31,23 @@ protected void render(final PoseStack poseStack, RenderSystem.setShader(GameRenderer::getPositionTexColorShader); final Tesselator tesselator = Tesselator.getInstance(); - final BufferBuilder bufferBuilder = tesselator.getBuilder(); - bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); - bufferBuilder.vertex(poseStack.last().pose(), x, slotYEnd, 0) - .uv(sprite.getU0(), sprite.getV1()) - .color(r, g, b, 255).endVertex(); - bufferBuilder.vertex(poseStack.last().pose(), slotXEnd, slotYEnd, 0) - .uv(sprite.getU1(), sprite.getV1()) - .color(r, g, b, 255).endVertex(); - bufferBuilder.vertex(poseStack.last().pose(), slotXEnd, y, 0) - .uv(sprite.getU1(), sprite.getV0()) - .color(r, g, b, 255).endVertex(); - bufferBuilder.vertex(poseStack.last().pose(), x, y, 0) - .uv(sprite.getU0(), sprite.getV0()) - .color(r, g, b, 255).endVertex(); - tesselator.end(); + final BufferBuilder bufferBuilder = tesselator.begin( + VertexFormat.Mode.QUADS, + DefaultVertexFormat.POSITION_TEX_COLOR + ); + bufferBuilder.addVertex(poseStack.last().pose(), x, slotYEnd, 0) + .setUv(sprite.getU0(), sprite.getV1()) + .setColor(r, g, b, 255); + bufferBuilder.addVertex(poseStack.last().pose(), slotXEnd, slotYEnd, 0) + .setUv(sprite.getU1(), sprite.getV1()) + .setColor(r, g, b, 255); + bufferBuilder.addVertex(poseStack.last().pose(), slotXEnd, y, 0) + .setUv(sprite.getU1(), sprite.getV0()) + .setColor(r, g, b, 255); + bufferBuilder.addVertex(poseStack.last().pose(), x, y, 0) + .setUv(sprite.getU0(), sprite.getV0()) + .setColor(r, g, b, 255); + BufferUploader.drawWithShader(bufferBuilder.buildOrThrow()); } protected void render(final PoseStack poseStack, @@ -60,33 +63,29 @@ protected void render(final PoseStack poseStack, final var x1 = scale / 2; final var y1 = -scale / 2; final var transform = poseStack.last().pose(); - buffer.vertex(transform, x0, y1, 0) - .color(packedRgb) - .uv(sprite.getU0(), sprite.getV1()) - .overlayCoords(OverlayTexture.NO_OVERLAY) - .uv2(light) - .normal(0, 0, 1) - .endVertex(); - buffer.vertex(transform, x1, y1, 0) - .color(packedRgb) - .uv(sprite.getU1(), sprite.getV1()) - .overlayCoords(OverlayTexture.NO_OVERLAY) - .uv2(light) - .normal(0, 0, 1) - .endVertex(); - buffer.vertex(transform, x1, y0, 0) - .color(packedRgb) - .uv(sprite.getU1(), sprite.getV0()) - .overlayCoords(OverlayTexture.NO_OVERLAY) - .uv2(light) - .normal(0, 0, 1) - .endVertex(); - buffer.vertex(transform, x0, y0, 0) - .color(packedRgb) - .uv(sprite.getU0(), sprite.getV0()) - .overlayCoords(OverlayTexture.NO_OVERLAY) - .uv2(light) - .normal(0, 0, 1) - .endVertex(); + buffer.addVertex(transform, x0, y1, 0) + .setColor(packedRgb) + .setUv(sprite.getU0(), sprite.getV1()) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(light) + .setNormal(0, 0, 1); + buffer.addVertex(transform, x1, y1, 0) + .setColor(packedRgb) + .setUv(sprite.getU1(), sprite.getV1()) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(light) + .setNormal(0, 0, 1); + buffer.addVertex(transform, x1, y0, 0) + .setColor(packedRgb) + .setUv(sprite.getU1(), sprite.getV0()) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(light) + .setNormal(0, 0, 1); + buffer.addVertex(transform, x0, y0, 0) + .setColor(packedRgb) + .setUv(sprite.getU0(), sprite.getV0()) + .setOverlay(OverlayTexture.NO_OVERLAY) + .setLight(light) + .setNormal(0, 0, 1); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/CubeBuilder.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/CubeBuilder.java index 89a113e16..2de51dbdb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/CubeBuilder.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/CubeBuilder.java @@ -93,6 +93,6 @@ private static void putVertex(final VertexConsumer builder, final float x, final float y, final float z) { - builder.vertex(poseStack.last().pose(), x, y, z).color(r, g, b, a).endVertex(); + builder.addVertex(poseStack.last().pose(), x, y, z).setColor(r, g, b, a); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResource.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResource.java index 7d1095013..0cfa90343 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResource.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResource.java @@ -6,57 +6,25 @@ import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import java.util.Optional; -import javax.annotation.Nullable; - -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.component.DataComponentPatch; import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.Fluids; import org.apiguardian.api.API; @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public record FluidResource(Fluid fluid, @Nullable CompoundTag tag) +public record FluidResource(Fluid fluid, DataComponentPatch components) implements PlatformResourceKey, FuzzyModeNormalizer { - private static final String TAG_TAG = "tag"; - private static final String TAG_ID = "id"; + public FluidResource(final Fluid fluid) { + this(fluid, DataComponentPatch.EMPTY); + } - public FluidResource(final Fluid fluid, @Nullable final CompoundTag tag) { + public FluidResource(final Fluid fluid, final DataComponentPatch components) { this.fluid = CoreValidations.validateNotNull(fluid, "Fluid must not be null"); - this.tag = tag; + this.components = CoreValidations.validateNotNull(components, "Components must not be null"); } @Override public ResourceKey normalize() { - return new FluidResource(fluid, null); - } - - static Optional fromTag(final CompoundTag tag) { - final ResourceLocation id = new ResourceLocation(tag.getString(TAG_ID)); - final Fluid fluid = BuiltInRegistries.FLUID.get(id); - if (fluid == Fluids.EMPTY) { - return Optional.empty(); - } - final CompoundTag itemTag = tag.contains(TAG_TAG) ? tag.getCompound(TAG_TAG) : null; - return Optional.of(new FluidResource(fluid, itemTag)); - } - - @Override - public CompoundTag toTag() { - final CompoundTag nbt = new CompoundTag(); - if (tag != null) { - nbt.put(TAG_TAG, tag); - } - nbt.putString(TAG_ID, BuiltInRegistries.FLUID.getKey(fluid).toString()); - return nbt; - } - - @Override - public void toBuffer(final FriendlyByteBuf buf) { - buf.writeVarInt(BuiltInRegistries.FLUID.getId(fluid)); - buf.writeNbt(tag); + return new FluidResource(fluid); } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceType.java index 7f5b06582..ddd195912 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceType.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceType.java @@ -11,12 +11,13 @@ import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.grid.view.FluidGridResource; import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; -import com.refinedmods.refinedstorage2.platform.common.util.PacketUtil; import java.util.Optional; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; @@ -31,11 +32,6 @@ class FluidResourceType extends AbstractResourceType { ); } - @Override - public PlatformResourceKey fromBuffer(final FriendlyByteBuf buf) { - return PacketUtil.readFluidResource(buf); - } - @Override public Optional toGridResource(final ResourceAmount resourceAmount) { return Platform.INSTANCE.getFluidGridResourceFactory().apply(resourceAmount); @@ -72,7 +68,20 @@ public GridOperations createGridOperations(final StorageChannel storageChannel, } @Override - public Optional fromTag(final CompoundTag tag) { - return FluidResource.fromTag(tag); + @SuppressWarnings({"unchecked", "rawtypes"}) + public MapCodec getMapCodec() { + return (MapCodec) ResourceCodecs.FLUID_MAP_CODEC; + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public Codec getCodec() { + return (Codec) ResourceCodecs.FLUID_CODEC; + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public StreamCodec getStreamCodec() { + return (StreamCodec) ResourceCodecs.FLUID_STREAM_CODEC; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java index 122254f2f..2f3024014 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java @@ -6,72 +6,47 @@ import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import java.util.Optional; -import javax.annotation.Nullable; - -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.component.DataComponentPatch; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import org.apiguardian.api.API; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public record ItemResource(Item item, @Nullable CompoundTag tag) implements PlatformResourceKey, FuzzyModeNormalizer { +public record ItemResource(Item item, DataComponentPatch components) + implements PlatformResourceKey, FuzzyModeNormalizer { private static final Logger LOGGER = LoggerFactory.getLogger(ItemResource.class); - private static final String TAG_TAG = "tag"; - private static final String TAG_ID = "id"; + public ItemResource(final Item item) { + this(item, DataComponentPatch.EMPTY); + } - public ItemResource(final Item item, @Nullable final CompoundTag tag) { + public ItemResource(final Item item, final DataComponentPatch components) { this.item = CoreValidations.validateNotNull(item, "Item must not be null"); - this.tag = tag; + this.components = CoreValidations.validateNotNull(components, "Components must not be null"); } public ItemStack toItemStack() { - final ItemStack itemStack = new ItemStack(item); - itemStack.setTag(tag); - return itemStack; + return toItemStack(1); } + @SuppressWarnings("deprecation") public ItemStack toItemStack(final long amount) { if (amount > Integer.MAX_VALUE) { LOGGER.warn("Truncating too large amount for {} to fit into ItemStack {}", this, amount); } - final ItemStack stack = toItemStack(); - stack.setCount((int) amount); - return stack; + return new ItemStack(item.builtInRegistryHolder(), (int) amount, components); } @Override public ResourceKey normalize() { - return new ItemResource(item, null); - } - - @Override - public CompoundTag toTag() { - final CompoundTag nbt = new CompoundTag(); - if (this.tag != null) { - nbt.put(TAG_TAG, this.tag); - } - nbt.putString(TAG_ID, BuiltInRegistries.ITEM.getKey(item).toString()); - return nbt; + return new ItemResource(item); } @Override - public void toBuffer(final FriendlyByteBuf buf) { - buf.writeVarInt(Item.getId(item)); - buf.writeNbt(tag); - } - - @Override - @SuppressWarnings("deprecation") public long getInterfaceExportLimit() { - return item.getMaxStackSize(); + return item.getDefaultMaxStackSize(); } @Override @@ -80,16 +55,6 @@ public ResourceType getResourceType() { } public static ItemResource ofItemStack(final ItemStack itemStack) { - return new ItemResource(itemStack.getItem(), itemStack.getTag()); - } - - static Optional fromTag(final CompoundTag tag) { - final ResourceLocation id = new ResourceLocation(tag.getString(TAG_ID)); - final Item item = BuiltInRegistries.ITEM.get(id); - if (item == Items.AIR) { - return Optional.empty(); - } - final CompoundTag itemTag = tag.contains(TAG_TAG) ? tag.getCompound(TAG_TAG) : null; - return Optional.of(new ItemResource(item, itemTag)); + return new ItemResource(itemStack.getItem(), itemStack.getComponentsPatch()); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceRendering.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceRendering.java index 86c143b66..efd8b748e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceRendering.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceRendering.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.network.chat.Component; import net.minecraft.util.Mth; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; @@ -56,6 +57,7 @@ public List getTooltip(final ResourceKey resource) { } final Minecraft minecraft = Minecraft.getInstance(); return getStack(itemResource).getTooltipLines( + Item.TooltipContext.EMPTY, minecraft.player, minecraft.options.advancedItemTooltips ? TooltipFlag.ADVANCED : TooltipFlag.NORMAL ); @@ -81,7 +83,7 @@ public void render(final ResourceKey resource, return; } final ItemStack itemStack = getStack(itemResource); - poseStack.mulPoseMatrix(IN_WORLD_SCALE); + poseStack.mulPose(IN_WORLD_SCALE); poseStack.last().normal().rotateX(Mth.DEG_TO_RAD * -45f); Minecraft.getInstance().getItemRenderer().renderStatic( itemStack, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceType.java index 468f64636..8a7cc2c2a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceType.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceType.java @@ -11,12 +11,13 @@ import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.grid.view.ItemGridResource; import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; -import com.refinedmods.refinedstorage2.platform.common.util.PacketUtil; import java.util.Optional; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; @@ -31,11 +32,6 @@ class ItemResourceType extends AbstractResourceType { ); } - @Override - public ItemResource fromBuffer(final FriendlyByteBuf buf) { - return PacketUtil.readItemResource(buf); - } - @Override public Optional toGridResource(final ResourceAmount resourceAmount) { return Platform.INSTANCE.getItemGridResourceFactory().apply(resourceAmount); @@ -62,18 +58,32 @@ public long getInterfaceExportLimit() { } @Override - @SuppressWarnings("deprecation") public GridOperations createGridOperations(final StorageChannel storageChannel, final Actor actor) { return new GridOperationsImpl( storageChannel, actor, - resource -> resource instanceof ItemResource itemResource ? itemResource.item().getMaxStackSize() : 0, + resource -> resource instanceof ItemResource itemResource + ? itemResource.item().getDefaultMaxStackSize() + : 0, 1 ); } @Override - public Optional fromTag(final CompoundTag tag) { - return ItemResource.fromTag(tag); + @SuppressWarnings({"unchecked", "rawtypes"}) + public MapCodec getMapCodec() { + return (MapCodec) ResourceCodecs.ITEM_MAP_CODEC; + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public Codec getCodec() { + return (Codec) ResourceCodecs.ITEM_CODEC; + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public StreamCodec getStreamCodec() { + return (StreamCodec) ResourceCodecs.ITEM_STREAM_CODEC; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceCodecs.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceCodecs.java new file mode 100644 index 000000000..27c325e8a --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceCodecs.java @@ -0,0 +1,92 @@ +package com.refinedmods.refinedstorage2.platform.common.support.resource; + +import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; + +import java.util.Optional; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import io.netty.handler.codec.DecoderException; +import net.minecraft.core.component.DataComponentPatch; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.resources.ResourceLocation; + +public final class ResourceCodecs { + public static final MapCodec ITEM_MAP_CODEC = RecordCodecBuilder.mapCodec(ins -> ins.group( + BuiltInRegistries.ITEM.byNameCodec().fieldOf("item").forGetter(ItemResource::item), + DataComponentPatch.CODEC.fieldOf("components").forGetter(ItemResource::components) + ).apply(ins, ItemResource::new)); + public static final Codec ITEM_CODEC = ITEM_MAP_CODEC.codec(); + + public static final MapCodec FLUID_MAP_CODEC = RecordCodecBuilder.mapCodec(ins -> ins.group( + BuiltInRegistries.FLUID.byNameCodec().fieldOf("fluid").forGetter(FluidResource::fluid), + DataComponentPatch.CODEC.fieldOf("components").forGetter(FluidResource::components) + ).apply(ins, FluidResource::new)); + public static final Codec FLUID_CODEC = FLUID_MAP_CODEC.codec(); + + public static final Codec CODEC = PlatformApi.INSTANCE.getResourceTypeRegistry() + .codec() + .dispatch(PlatformResourceKey::getResourceType, ResourceType::getMapCodec); + public static final Codec AMOUNT_CODEC = RecordCodecBuilder.create(instance -> instance.group( + CODEC.fieldOf("resource").forGetter(resourceAmount -> (PlatformResourceKey) resourceAmount.getResource()), + Codec.LONG.fieldOf("amount").forGetter(ResourceAmount::getAmount) + ).apply(instance, ResourceAmount::new)); + + public static final StreamCodec STREAM_CODEC = new StreamCodec<>() { + @Override + public PlatformResourceKey decode(final RegistryFriendlyByteBuf buf) { + final ResourceLocation id = buf.readResourceLocation(); + final ResourceType resourceType = PlatformApi.INSTANCE.getResourceTypeRegistry().get(id).orElseThrow(); + return resourceType.getStreamCodec().decode(buf); + } + + @Override + public void encode(final RegistryFriendlyByteBuf buf, final PlatformResourceKey resourceKey) { + final ResourceType resourceType = resourceKey.getResourceType(); + final ResourceLocation id = PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType) + .orElseThrow(); + buf.writeResourceLocation(id); + resourceType.getStreamCodec().encode(buf, resourceKey); + } + }; + public static final StreamCodec AMOUNT_STREAM_CODEC = StreamCodec.of( + (buf, resourceAmount) -> { + final ResourceKey resourceKey = resourceAmount.getResource(); + if (!(resourceKey instanceof PlatformResourceKey platformResourceKey)) { + throw new DecoderException("Cannot encode non-platform resource key"); + } + STREAM_CODEC.encode(buf, platformResourceKey); + buf.writeLong(resourceAmount.getAmount()); + }, + buf -> { + final PlatformResourceKey resourceKey = STREAM_CODEC.decode(buf); + final long amount = buf.readLong(); + return new ResourceAmount(resourceKey, amount); + } + ); + public static final StreamCodec> AMOUNT_STREAM_OPTIONAL_CODEC = + ByteBufCodecs.optional(AMOUNT_STREAM_CODEC); + + public static final StreamCodec ITEM_STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.registry(Registries.ITEM), ItemResource::item, + DataComponentPatch.STREAM_CODEC, ItemResource::components, + ItemResource::new + ); + public static final StreamCodec FLUID_STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.registry(Registries.FLUID), FluidResource::fluid, + DataComponentPatch.STREAM_CODEC, FluidResource::components, + FluidResource::new + ); + + private ResourceCodecs() { + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerData.java new file mode 100644 index 000000000..700324781 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerData.java @@ -0,0 +1,29 @@ +package com.refinedmods.refinedstorage2.platform.common.support.resource; + +import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record ResourceContainerData(List> resources) { + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.collection(ArrayList::new, ResourceCodecs.AMOUNT_STREAM_OPTIONAL_CODEC), + ResourceContainerData::resources, + ResourceContainerData::new + ); + + public static ResourceContainerData of(final ResourceContainer resourceContainer) { + final List> resources = new ArrayList<>(); + for (int i = 0; i < resourceContainer.size(); ++i) { + resources.add(Optional.ofNullable(resourceContainer.get(i))); + } + return new ResourceContainerData(resources); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerImpl.java index 1db47747c..686802eab 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerImpl.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerImpl.java @@ -8,7 +8,6 @@ import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; import com.refinedmods.refinedstorage2.platform.common.util.MathUtil; import java.util.ArrayList; @@ -19,9 +18,10 @@ import java.util.function.ToLongFunction; import javax.annotation.Nullable; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.nbt.NbtOps; +import net.minecraft.nbt.Tag; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; @@ -201,82 +201,32 @@ public List getResources() { } @Override - public void writeToUpdatePacket(final FriendlyByteBuf buf) { - for (final ResourceContainerSlot slot : slots) { - if (slot == null) { - buf.writeBoolean(false); - continue; - } - writeToUpdatePacket(buf, slot); - } - } - - private void writeToUpdatePacket(final FriendlyByteBuf buf, final ResourceContainerSlot slot) { - final ResourceType resourceType = slot.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresentOrElse(id -> { - buf.writeBoolean(true); - buf.writeResourceLocation(id); - slot.getPlatformResource().toBuffer(buf); - buf.writeLong(slot.getAmount()); - }, () -> buf.writeBoolean(false)); - } - - @Override - public void readFromUpdatePacket(final int index, final FriendlyByteBuf buf) { - final boolean present = buf.readBoolean(); - if (!present) { - removeSilently(index); - return; - } - final ResourceLocation id = buf.readResourceLocation(); - PlatformApi.INSTANCE.getResourceTypeRegistry().get(id).ifPresent( - resourceType -> readFromUpdatePacket(index, buf, resourceType) - ); - } - - private void readFromUpdatePacket(final int index, - final FriendlyByteBuf buf, - final ResourceType resourceType) { - final ResourceKey resource = resourceType.fromBuffer(buf); - final long amount = buf.readLong(); - setSilently(index, new ResourceAmount(resource, amount)); - } - - @Override - public CompoundTag toTag() { + public CompoundTag toTag(final HolderLookup.Provider provider) { final CompoundTag tag = new CompoundTag(); for (int i = 0; i < size(); ++i) { final ResourceContainerSlot slot = slots[i]; if (slot == null) { continue; } - addToTag(tag, i, slot); + addToTag(tag, i, slot, provider); } return tag; } - private void addToTag(final CompoundTag tag, - final int index, - final ResourceContainerSlot slot) { - final ResourceType resourceType = slot.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresent( - resourceTypeId -> addToTag(tag, index, slot, resourceTypeId) - ); - } - private void addToTag(final CompoundTag tag, final int index, final ResourceContainerSlot slot, - final ResourceLocation resourceTypeId) { - final CompoundTag serialized = new CompoundTag(); - serialized.putString("t", resourceTypeId.toString()); - serialized.put("v", slot.getPlatformResource().toTag()); - serialized.putLong("a", slot.getAmount()); + final HolderLookup.Provider provider) { + final Tag serialized = ResourceCodecs.AMOUNT_CODEC.encode( + slot.getResourceAmount(), + provider.createSerializationContext(NbtOps.INSTANCE), + new CompoundTag() + ).getOrThrow(); tag.put("s" + index, serialized); } @Override - public void fromTag(final CompoundTag tag) { + public void fromTag(final CompoundTag tag, final HolderLookup.Provider provider) { for (int i = 0; i < size(); ++i) { final String key = "s" + i; if (!tag.contains(key)) { @@ -284,23 +234,16 @@ public void fromTag(final CompoundTag tag) { continue; } final CompoundTag item = tag.getCompound(key); - fromTag(i, item); + fromTag(i, item, provider); } } - private void fromTag(final int index, final CompoundTag tag) { - final ResourceLocation resourceTypeId = new ResourceLocation(tag.getString("t")); - PlatformApi.INSTANCE.getResourceTypeRegistry().get(resourceTypeId).ifPresent( - resourceType -> fromTag(index, tag, resourceType) - ); - } - - private void fromTag(final int index, final CompoundTag tag, final ResourceType resourceType) { - final long amount = tag.getLong("a"); - resourceType.fromTag(tag.getCompound("v")).ifPresent(resource -> setSilently( - index, - new ResourceAmount(resource, amount) - )); + private void fromTag(final int index, final CompoundTag tag, final HolderLookup.Provider provider) { + final ResourceAmount resourceAmount = ResourceCodecs.AMOUNT_CODEC.decode( + provider.createSerializationContext(NbtOps.INSTANCE), + tag + ).getOrThrow().getFirst(); + setSilently(index, resourceAmount); } @Override @@ -418,6 +361,15 @@ public static ResourceContainer createForFilter() { return createForFilter(9); } + public static ResourceContainer createForFilter(final ResourceContainerData data) { + final ResourceContainer resourceContainer = createForFilter(data.resources().size()); + for (int i = 0; i < data.resources().size(); ++i) { + final int ii = i; + data.resources().get(i).ifPresent(resource -> resourceContainer.set(ii, resource)); + } + return resourceContainer; + } + public static ResourceContainer createForFilter(final int size) { return new ResourceContainerImpl( size, @@ -428,11 +380,25 @@ public static ResourceContainer createForFilter(final int size) { } public static ResourceContainer createForFilter(final ResourceFactory resourceFactory) { + return createForFilter(resourceFactory, 9); + } + + public static ResourceContainer createForFilter(final ResourceFactory resourceFactory, final int size) { return new ResourceContainerImpl( - 9, + size, resource -> Long.MAX_VALUE, resourceFactory, Collections.emptySet() ); } + + public static ResourceContainer createForFilter(final ResourceFactory resourceFactory, + final ResourceContainerData data) { + final ResourceContainer resourceContainer = createForFilter(resourceFactory, data.resources().size()); + for (int i = 0; i < data.resources().size(); ++i) { + final int ii = i; + data.resources().get(i).ifPresent(resource -> resourceContainer.set(ii, resource)); + } + return resourceContainer; + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/CustomCheckboxWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/CustomCheckboxWidget.java index 66d8b8fa5..d06ae0fa9 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/CustomCheckboxWidget.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/CustomCheckboxWidget.java @@ -14,16 +14,16 @@ // A custom checkbox so that we can change the font color. public class CustomCheckboxWidget extends AbstractButton { - private static final ResourceLocation CHECKBOX_SELECTED_HIGHLIGHTED_SPRITE = new ResourceLocation( + private static final ResourceLocation CHECKBOX_SELECTED_HIGHLIGHTED_SPRITE = ResourceLocation.withDefaultNamespace( "widget/checkbox_selected_highlighted" ); - private static final ResourceLocation CHECKBOX_SELECTED_SPRITE = new ResourceLocation( + private static final ResourceLocation CHECKBOX_SELECTED_SPRITE = ResourceLocation.withDefaultNamespace( "widget/checkbox_selected" ); - private static final ResourceLocation CHECKBOX_HIGHLIGHTED_SPRITE = new ResourceLocation( + private static final ResourceLocation CHECKBOX_HIGHLIGHTED_SPRITE = ResourceLocation.withDefaultNamespace( "widget/checkbox_highlighted" ); - private static final ResourceLocation CHECKBOX_SPRITE = new ResourceLocation("widget/checkbox"); + private static final ResourceLocation CHECKBOX_SPRITE = ResourceLocation.withDefaultNamespace("widget/checkbox"); private static final int BOX_SIZE = 9 + 8; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/FortuneUpgradeItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/FortuneUpgradeItem.java index a46ff32e3..e204a4645 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/FortuneUpgradeItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/FortuneUpgradeItem.java @@ -1,16 +1,22 @@ package com.refinedmods.refinedstorage2.platform.common.upgrade; +import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; import com.refinedmods.refinedstorage2.platform.common.Platform; +import java.util.Optional; + import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; public class FortuneUpgradeItem extends AbstractUpgradeItem { + private static final Component HELP = createTranslation("item", "fortune_upgrade.help"); + private final int fortuneLevel; private final Component name; @@ -39,4 +45,9 @@ public boolean isFoil(final ItemStack stack) { public Component getName(final ItemStack stack) { return name; } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(HELP)); + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RangeUpgradeItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RangeUpgradeItem.java index 387fcf51a..0ca852b3c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RangeUpgradeItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RangeUpgradeItem.java @@ -1,12 +1,23 @@ package com.refinedmods.refinedstorage2.platform.common.upgrade; +import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; import com.refinedmods.refinedstorage2.platform.common.Platform; +import java.util.Optional; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; + +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; public class RangeUpgradeItem extends AbstractUpgradeItem { + private static final Component HELP = createTranslation("item", "range_upgrade.help"); + private static final Component CREATIVE_HELP = createTranslation("item", "creative_range_upgrade.help"); + private final boolean creative; public RangeUpgradeItem(final UpgradeRegistry registry, final boolean creative) { @@ -21,4 +32,9 @@ public long getEnergyUsage() { } return Platform.INSTANCE.getConfig().getUpgrade().getRangeUpgradeEnergyUsage(); } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(creative ? CREATIVE_HELP : HELP)); + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeContainerMenu.java index 076b4f039..0f689fd83 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeContainerMenu.java @@ -4,11 +4,11 @@ import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; import com.refinedmods.refinedstorage2.platform.common.content.Menus; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; import java.util.function.Consumer; import javax.annotation.Nullable; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -21,8 +21,10 @@ public class RegulatorUpgradeContainerMenu extends AbstractSingleAmountContainer @Nullable private Consumer amountAcceptor; - public RegulatorUpgradeContainerMenu(final int syncId, final Inventory playerInventory, final FriendlyByteBuf buf) { - super(Menus.INSTANCE.getRegulatorUpgrade(), syncId, playerInventory, buf, FILTER_HELP); + public RegulatorUpgradeContainerMenu(final int syncId, + final Inventory playerInventory, + final SingleAmountData singleAmountData) { + super(Menus.INSTANCE.getRegulatorUpgrade(), syncId, playerInventory, singleAmountData, FILTER_HELP); } RegulatorUpgradeContainerMenu(final int syncId, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeItem.java index dfa3e843d..54ae00ca1 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeItem.java @@ -10,8 +10,10 @@ import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; import java.util.Optional; @@ -19,9 +21,9 @@ import java.util.function.Consumer; import javax.annotation.Nullable; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -37,8 +39,6 @@ public class RegulatorUpgradeItem extends AbstractUpgradeItem { private static final Component HELP = createTranslation("item", "regulator_upgrade.help"); - private static final String TAG_AMOUNT = "a"; - private static final String TAG_RESOURCE_FILTER_CONTAINER = "rf"; public RegulatorUpgradeItem(final UpgradeRegistry registry) { super(new Item.Properties(), registry); @@ -48,9 +48,13 @@ public RegulatorUpgradeItem(final UpgradeRegistry registry) { public InteractionResultHolder use(final Level level, final Player player, final InteractionHand hand) { final ItemStack stack = player.getItemInHand(hand); if (player instanceof ServerPlayer serverPlayer) { + final RegulatorUpgradeState initialState = stack.getOrDefault( + DataComponents.INSTANCE.getRegulatorUpgradeState(), + RegulatorUpgradeState.EMPTY + ); Platform.INSTANCE.getMenuOpener().openMenu(serverPlayer, new ExtendedMenuProviderImpl( - getResourceFilterContainer(stack), - getAmount(stack), + createResourceFilterContainer(stack, initialState), + initialState.amount(), newAmount -> setAmount(stack, newAmount), PlatformApi.INSTANCE.createInventorySlotReference(player, hand) )); @@ -58,39 +62,32 @@ public InteractionResultHolder use(final Level level, final Player pl return InteractionResultHolder.success(stack); } + private ResourceContainer createResourceFilterContainer(final ItemStack stack, + final RegulatorUpgradeState initialState) { + final ResourceContainer container = ResourceContainerImpl.createForFilter(1); + container.setListener(() -> { + final RegulatorUpgradeState state = stack.getOrDefault( + DataComponents.INSTANCE.getRegulatorUpgradeState(), + RegulatorUpgradeState.EMPTY + ); + final PlatformResourceKey resource = container.getResource(0); + stack.set(DataComponents.INSTANCE.getRegulatorUpgradeState(), state.withResource(resource)); + }); + initialState.resource().ifPresent(initialResource -> container.set(0, new ResourceAmount(initialResource, 1))); + return container; + } + @Override public Optional getTooltipImage(final ItemStack stack) { return Optional.of(new RegulatorTooltipComponent(HELP, getConfiguredResource(stack))); } - @Nullable - private ResourceAmount getConfiguredResource(final ItemStack stack) { - final ResourceContainer container = getResourceFilterContainer(stack); - final PlatformResourceKey resource = container.getResource(0); - if (resource == null) { - return null; - } - final double amount = getAmount(stack); - final long normalizedAmount = resource.getResourceType().normalizeAmount(amount); - return new ResourceAmount(resource, normalizedAmount); - } - - public double getAmount(final ItemStack stack) { - return stack.getTag() == null ? 1 : stack.getTag().getDouble(TAG_AMOUNT); - } - private void setAmount(final ItemStack stack, final double amount) { - stack.getOrCreateTag().putDouble(TAG_AMOUNT, amount); - } - - private ResourceContainer getResourceFilterContainer(final ItemStack stack) { - final ResourceContainer container = ResourceContainerImpl.createForFilter(1); - container.setListener(() -> stack.getOrCreateTag().put(TAG_RESOURCE_FILTER_CONTAINER, container.toTag())); - final CompoundTag tag = stack.getTagElement(TAG_RESOURCE_FILTER_CONTAINER); - if (tag != null) { - container.fromTag(tag); - } - return container; + final RegulatorUpgradeState state = stack.getOrDefault( + DataComponents.INSTANCE.getRegulatorUpgradeState(), + RegulatorUpgradeState.EMPTY + ); + stack.set(DataComponents.INSTANCE.getRegulatorUpgradeState(), state.withAmount(amount)); } @Override @@ -98,27 +95,42 @@ public long getEnergyUsage() { return Platform.INSTANCE.getConfig().getUpgrade().getRegulatorUpgradeEnergyUsage(); } - public OptionalLong getDesiredAmount(final ItemStack stack, final ResourceKey resource) { - final ResourceContainer container = getResourceFilterContainer(stack); - final PlatformResourceKey configuredResource = container.getResource(0); - if (configuredResource == null) { - return OptionalLong.empty(); - } - final boolean same = configuredResource.equals(resource); - if (!same) { - return OptionalLong.empty(); + @Nullable + private ResourceAmount getConfiguredResource(final ItemStack stack) { + final RegulatorUpgradeState state = stack.get(DataComponents.INSTANCE.getRegulatorUpgradeState()); + if (state == null) { + return null; } - final double amount = getAmount(stack); - final long normalizedAmount = configuredResource.getResourceType().normalizeAmount(amount); - return OptionalLong.of(normalizedAmount); + return state.resource().map(resource -> { + final double amount = state.amount(); + final long normalizedAmount = resource.getResourceType().normalizeAmount(amount); + return new ResourceAmount(resource, normalizedAmount); + }).orElse(null); } - public record RegulatorTooltipComponent(Component helpText, - @Nullable ResourceAmount configuredResource) + public OptionalLong getDesiredAmount(final ItemStack stack, final ResourceKey resource) { + final RegulatorUpgradeState state = stack.getOrDefault( + DataComponents.INSTANCE.getRegulatorUpgradeState(), + RegulatorUpgradeState.EMPTY + ); + return state.resource().flatMap(configuredResource -> { + final boolean same = configuredResource.equals(resource); + if (!same) { + return Optional.empty(); + } + return Optional.of(configuredResource.getResourceType()); + }).map(type -> { + final double amount = state.amount(); + final long normalizedAmount = type.normalizeAmount(amount); + return OptionalLong.of(normalizedAmount); + }).orElse(OptionalLong.empty()); + } + + public record RegulatorTooltipComponent(Component helpText, @Nullable ResourceAmount configuredResource) implements TooltipComponent { } - private static class ExtendedMenuProviderImpl implements ExtendedMenuProvider { + private static class ExtendedMenuProviderImpl implements ExtendedMenuProvider { private final ResourceContainer resourceContainer; private final double amount; private final Consumer amountAcceptor; @@ -135,8 +147,17 @@ private ExtendedMenuProviderImpl(final ResourceContainer resourceContainer, } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - AbstractSingleAmountContainerMenu.writeToBuf(buf, amount, resourceContainer, slotReference); + public SingleAmountData getMenuData() { + return new SingleAmountData( + Optional.of(slotReference), + amount, + ResourceContainerData.of(resourceContainer) + ); + } + + @Override + public StreamEncoder getMenuCodec() { + return SingleAmountData.STREAM_CODEC; } @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeState.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeState.java new file mode 100644 index 000000000..7898651d7 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeState.java @@ -0,0 +1,37 @@ +package com.refinedmods.refinedstorage2.platform.common.upgrade; + +import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; + +import java.util.Optional; +import javax.annotation.Nullable; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record RegulatorUpgradeState(double amount, Optional resource) { + public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + Codec.DOUBLE.fieldOf("amount").forGetter(RegulatorUpgradeState::amount), + Codec.optionalField("resource", ResourceCodecs.CODEC, false).forGetter(RegulatorUpgradeState::resource) + ).apply(instance, RegulatorUpgradeState::new)); + + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + ByteBufCodecs.DOUBLE, RegulatorUpgradeState::amount, + ByteBufCodecs.optional(ResourceCodecs.STREAM_CODEC), RegulatorUpgradeState::resource, + RegulatorUpgradeState::new + ); + + static final RegulatorUpgradeState EMPTY = new RegulatorUpgradeState(1, Optional.empty()); + + RegulatorUpgradeState withAmount(final double newAmount) { + return new RegulatorUpgradeState(newAmount, resource); + } + + RegulatorUpgradeState withResource(@Nullable final PlatformResourceKey newResource) { + return new RegulatorUpgradeState(amount, Optional.ofNullable(newResource)); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/SimpleUpgradeItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/SimpleUpgradeItem.java index 5f35382ef..d1a8a0b7d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/SimpleUpgradeItem.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/SimpleUpgradeItem.java @@ -1,23 +1,34 @@ package com.refinedmods.refinedstorage2.platform.common.upgrade; +import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage2.platform.common.Platform; +import java.util.Optional; import java.util.function.LongSupplier; +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; + public final class SimpleUpgradeItem extends AbstractUpgradeItem { private final LongSupplier energyUsageResolver; private final boolean foil; + private final Component helpText; - public SimpleUpgradeItem(final UpgradeRegistry registry, - final LongSupplier energyUsageResolver, - final boolean foil) { + private SimpleUpgradeItem(final UpgradeRegistry registry, + final LongSupplier energyUsageResolver, + final boolean foil, + final Component helpText) { super(new Item.Properties(), registry); this.energyUsageResolver = energyUsageResolver; this.foil = foil; + this.helpText = helpText; } @Override @@ -29,4 +40,36 @@ public long getEnergyUsage() { public boolean isFoil(final ItemStack stack) { return foil; } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(helpText)); + } + + public static SimpleUpgradeItem speedUpgrade() { + return new SimpleUpgradeItem( + PlatformApi.INSTANCE.getUpgradeRegistry(), + Platform.INSTANCE.getConfig().getUpgrade()::getSpeedUpgradeEnergyUsage, + false, + createTranslation("item", "speed_upgrade.help") + ); + } + + public static SimpleUpgradeItem stackUpgrade() { + return new SimpleUpgradeItem( + PlatformApi.INSTANCE.getUpgradeRegistry(), + Platform.INSTANCE.getConfig().getUpgrade()::getStackUpgradeEnergyUsage, + false, + createTranslation("item", "stack_upgrade.help") + ); + } + + public static SimpleUpgradeItem silkTouchUpgrade() { + return new SimpleUpgradeItem( + PlatformApi.INSTANCE.getUpgradeRegistry(), + Platform.INSTANCE.getConfig().getUpgrade()::getSilkTouchUpgradeEnergyUsage, + true, + createTranslation("item", "silk_touch_upgrade.help") + ); + } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeContainer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeContainer.java index de42370b7..aa2a8b37e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeContainer.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeContainer.java @@ -13,6 +13,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.ListTag; import net.minecraft.world.SimpleContainer; import net.minecraft.world.item.Item; @@ -76,8 +77,8 @@ public OptionalLong getRegulatedAmount(final ResourceKey resource) { } @Override - public void fromTag(final ListTag tag) { - super.fromTag(tag); + public void fromTag(final ListTag tag, final HolderLookup.Provider provider) { + super.fromTag(tag, provider); updateIndex(); } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java index e6a5d69e1..1a79b670b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java @@ -2,59 +2,61 @@ import com.refinedmods.refinedstorage2.platform.common.content.Items; -import java.util.Objects; import java.util.Optional; import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.core.Holder; import net.minecraft.core.NonNullList; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; 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.CraftingInput; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.ShapedRecipe; import net.minecraft.world.item.crafting.ShapedRecipePattern; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.EnchantmentInstance; +import net.minecraft.world.item.enchantment.ItemEnchantments; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; -import static java.util.Objects.requireNonNull; - public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe { - public static final Codec CODEC = RecordCodecBuilder.create( + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( instance -> instance.group( - Codec.STRING.fieldOf("enchantment") - .xmap(ResourceLocation::new, ResourceLocation::toString) - .forGetter(UpgradeWithEnchantedBookRecipe::getEnchantmentId), + Enchantment.CODEC.fieldOf("enchantment") + .forGetter(UpgradeWithEnchantedBookRecipe::getEnchantment), Codec.INT.fieldOf("level").orElse(1) .forGetter(UpgradeWithEnchantedBookRecipe::getEnchantmentLevel), - Codec.STRING.fieldOf("result") - .xmap(ResourceLocation::new, ResourceLocation::toString) - .forGetter(UpgradeWithEnchantedBookRecipe::getResultItemId) + ItemStack.CODEC.fieldOf("result") + .forGetter(UpgradeWithEnchantedBookRecipe::getResultItem) ).apply(instance, UpgradeWithEnchantedBookRecipe::new) ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.holderRegistry(Registries.ENCHANTMENT), UpgradeWithEnchantedBookRecipe::getEnchantment, + ByteBufCodecs.INT, UpgradeWithEnchantedBookRecipe::getEnchantmentLevel, + ItemStack.STREAM_CODEC, UpgradeWithEnchantedBookRecipe::getResultItem, + UpgradeWithEnchantedBookRecipe::new + ); - private final ResourceLocation enchantmentId; + private final Holder enchantment; private final int level; - private final ResourceLocation resultItemId; + private final ItemStack resultItem; - UpgradeWithEnchantedBookRecipe(final ResourceLocation enchantmentId, + UpgradeWithEnchantedBookRecipe(final Holder enchantment, final int level, - final ResourceLocation resultItemId) { + final ItemStack resultItem) { super("", CraftingBookCategory.MISC, new ShapedRecipePattern(3, 3, NonNullList.of( Ingredient.EMPTY, Ingredient.of(new ItemStack(Items.INSTANCE.getQuartzEnrichedIron())), - Ingredient.of(EnchantedBookItem.createForEnchantment(new EnchantmentInstance( - getEnchantment(enchantmentId), - level - ))), + Ingredient.of(EnchantedBookItem.createForEnchantment(new EnchantmentInstance(enchantment, level))), Ingredient.of(new ItemStack(Items.INSTANCE.getQuartzEnrichedIron())), Ingredient.of(new ItemStack(Blocks.BOOKSHELF)), Ingredient.of(new ItemStack(Items.INSTANCE.getUpgrade())), @@ -62,22 +64,18 @@ public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe { Ingredient.of(new ItemStack(Items.INSTANCE.getQuartzEnrichedIron())), Ingredient.of(new ItemStack(Items.INSTANCE.getQuartzEnrichedIron())), Ingredient.of(new ItemStack(Items.INSTANCE.getQuartzEnrichedIron())) - ), Optional.empty()), new ItemStack(BuiltInRegistries.ITEM.get(resultItemId))); - this.enchantmentId = enchantmentId; + ), Optional.empty()), resultItem); + this.enchantment = enchantment; this.level = level; - this.resultItemId = resultItemId; - } - - private static Enchantment getEnchantment(final ResourceLocation enchantmentId) { - return requireNonNull(BuiltInRegistries.ENCHANTMENT.get(enchantmentId)); + this.resultItem = resultItem; } - ResourceLocation getResultItemId() { - return resultItemId; + ItemStack getResultItem() { + return resultItem; } - ResourceLocation getEnchantmentId() { - return enchantmentId; + Holder getEnchantment() { + return enchantment; } int getEnchantmentLevel() { @@ -85,19 +83,13 @@ int getEnchantmentLevel() { } @Override - public boolean matches(final CraftingContainer craftingContainer, final Level theLevel) { + public boolean matches(final CraftingInput craftingContainer, final Level theLevel) { if (!super.matches(craftingContainer, theLevel)) { return false; } - final ListTag enchantments = EnchantedBookItem.getEnchantments(craftingContainer.getItem(1)); - for (int i = 0; i < enchantments.size(); ++i) { - final CompoundTag tag = enchantments.getCompound(i); - final int containerLevel = EnchantmentHelper.getEnchantmentLevel(tag); - final ResourceLocation containerEnchantment = EnchantmentHelper.getEnchantmentId(tag); - if (Objects.equals(containerEnchantment, getEnchantmentId()) && containerLevel == level) { - return true; - } - } - return false; + final ItemEnchantments enchantments = EnchantmentHelper.getEnchantmentsForCrafting( + craftingContainer.getItem(1) + ); + return enchantments.getLevel(enchantment) == level; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java index 30cd78fbd..dffbc973b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java @@ -1,28 +1,18 @@ package com.refinedmods.refinedstorage2.platform.common.upgrade; -import com.mojang.serialization.Codec; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import com.mojang.serialization.MapCodec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.item.crafting.RecipeSerializer; public class UpgradeWithEnchantedBookRecipeSerializer implements RecipeSerializer { @Override - public Codec codec() { + public MapCodec codec() { return UpgradeWithEnchantedBookRecipe.CODEC; } @Override - public UpgradeWithEnchantedBookRecipe fromNetwork(final FriendlyByteBuf buf) { - final ResourceLocation resultItemId = buf.readResourceLocation(); - final ResourceLocation enchantmentId = buf.readResourceLocation(); - final int level = buf.readInt(); - return new UpgradeWithEnchantedBookRecipe(enchantmentId, level, resultItemId); - } - - @Override - public void toNetwork(final FriendlyByteBuf buf, final UpgradeWithEnchantedBookRecipe recipe) { - buf.writeResourceLocation(recipe.getResultItemId()); - buf.writeResourceLocation(recipe.getEnchantmentId()); - buf.writeInt(recipe.getEnchantmentLevel()); + public StreamCodec streamCodec() { + return UpgradeWithEnchantedBookRecipe.STREAM_CODEC; } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ContainerUtil.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ContainerUtil.java index 7e24227e8..f95ef26ce 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ContainerUtil.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ContainerUtil.java @@ -1,5 +1,6 @@ package com.refinedmods.refinedstorage2.platform.common.util; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; @@ -8,28 +9,35 @@ public final class ContainerUtil { private ContainerUtil() { } - public static CompoundTag write(final Container container) { + public static CompoundTag write(final Container container, final HolderLookup.Provider provider) { final CompoundTag tag = new CompoundTag(); for (int i = 0; i < container.getContainerSize(); ++i) { final ItemStack stack = container.getItem(i); if (!stack.isEmpty()) { - tag.put(getSlotKey(i), stack.save(new CompoundTag())); + tag.put(getSlotKey(i), stack.save(provider)); } } return tag; } - public static void read(final CompoundTag tag, final Container container) { + public static void read(final CompoundTag tag, + final Container container, + final HolderLookup.Provider provider) { for (int i = 0; i < container.getContainerSize(); ++i) { - readSlot(tag, container, i); + readSlot(tag, container, i, provider); } } - private static void readSlot(final CompoundTag tag, final Container container, final int i) { + private static void readSlot( + final CompoundTag tag, + final Container container, + final int i, + final HolderLookup.Provider provider + ) { if (!hasItemInSlot(tag, i)) { return; } - final ItemStack stack = getItemInSlot(tag, i); + final ItemStack stack = getItemInSlot(tag, i, provider); if (stack.isEmpty()) { return; } @@ -44,7 +52,11 @@ public static boolean hasItemInSlot(final CompoundTag tag, final int slot) { return tag.contains(getSlotKey(slot)); } - public static ItemStack getItemInSlot(final CompoundTag tag, final int i) { - return ItemStack.of(tag.getCompound(getSlotKey(i))); + public static ItemStack getItemInSlot( + final CompoundTag tag, + final int i, + final HolderLookup.Provider provider + ) { + return ItemStack.parseOptional(provider, tag.getCompound(getSlotKey(i))); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/IdentifierUtil.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/IdentifierUtil.java index 8965e7670..0719a3045 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/IdentifierUtil.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/IdentifierUtil.java @@ -17,7 +17,7 @@ private IdentifierUtil() { } public static ResourceLocation createIdentifier(final String value) { - return new ResourceLocation(MOD_ID, value); + return ResourceLocation.fromNamespaceAndPath(MOD_ID, value); } public static String createTranslationKey(final String category, final String value) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/PacketUtil.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/PacketUtil.java index bd04f3482..7bbb9ba11 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/PacketUtil.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/PacketUtil.java @@ -1,51 +1,14 @@ package com.refinedmods.refinedstorage2.platform.common.util; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; - -import javax.annotation.Nullable; - -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.item.Item; +import io.netty.buffer.ByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; public final class PacketUtil { private PacketUtil() { } - public static ItemResource readItemResource(final FriendlyByteBuf buf) { - final int id = buf.readVarInt(); - final CompoundTag nbt = buf.readNbt(); - return new ItemResource(Item.byId(id), nbt); - } - - public static PlatformResourceKey readFluidResource(final FriendlyByteBuf buf) { - final int id = buf.readVarInt(); - final CompoundTag nbt = buf.readNbt(); - return new FluidResource(BuiltInRegistries.FLUID.byId(id), nbt); - } - - public static void writeTrackedResource(final FriendlyByteBuf buf, - @Nullable final TrackedResource trackedResource) { - if (trackedResource == null) { - buf.writeBoolean(false); - } else { - buf.writeBoolean(true); - buf.writeLong(trackedResource.getTime()); - buf.writeUtf(trackedResource.getSourceName()); - } - } - - @Nullable - public static TrackedResource readTrackedResource(final FriendlyByteBuf buf) { - if (!buf.readBoolean()) { - return null; - } - final long time = buf.readLong(); - final String sourceName = buf.readUtf(); - return new TrackedResource(sourceName, time); + public static > StreamCodec enumStreamCodec(final T[] values) { + return ByteBufCodecs.idMapper(id -> id < 0 || id >= values.length ? values[0] : values[id], Enum::ordinal); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/SecurityToastHelper.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/SecurityToastUtil.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/SecurityToastHelper.java rename to refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/SecurityToastUtil.java index 14ac988a7..5249f3635 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/SecurityToastHelper.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/SecurityToastUtil.java @@ -6,10 +6,10 @@ import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; -public final class SecurityToastHelper { +public final class SecurityToastUtil { private static final SystemToast.SystemToastId NO_PERMISSION_TOAST_ID = new SystemToast.SystemToastId(); - private SecurityToastHelper() { + private SecurityToastUtil() { } public static void addNoPermissionToast(final Component message) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java index 30fbfeeb0..554419806 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java @@ -8,7 +8,7 @@ import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; @@ -17,11 +17,12 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.codec.StreamEncoder; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -29,7 +30,7 @@ public class WirelessTransmitterBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements NetworkNodeMenuProvider { + implements NetworkNodeExtendedMenuProvider { private static final String TAG_UPGRADES = "u"; private final UpgradeContainer upgradeContainer = new UpgradeContainer( @@ -50,18 +51,18 @@ protected InWorldNetworkNodeContainer createMainContainer(final SimpleNetworkNod } @Override - public void saveAdditional(final CompoundTag tag) { - super.saveAdditional(tag); - tag.put(TAG_UPGRADES, upgradeContainer.createTag()); + public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { + super.saveAdditional(tag, provider); + tag.put(TAG_UPGRADES, upgradeContainer.createTag(provider)); } @Override - public void load(final CompoundTag tag) { + public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider provider) { if (tag.contains(TAG_UPGRADES)) { - upgradeContainer.fromTag(tag.getList(TAG_UPGRADES, Tag.TAG_COMPOUND)); + upgradeContainer.fromTag(tag.getList(TAG_UPGRADES, Tag.TAG_COMPOUND), provider); } configureAccordingToUpgrades(); - super.load(tag); + super.loadAdditional(tag, provider); } @Override @@ -93,13 +94,18 @@ public AbstractContainerMenu createMenu(final int syncId, final Inventory invent return new WirelessTransmitterContainerMenu(syncId, inventory, this, upgradeContainer); } - int getRange() { - return PlatformApi.INSTANCE.getWirelessTransmitterRangeModifier().modifyRange(upgradeContainer, 0); + @Override + public WirelessTransmitterData getMenuData() { + return new WirelessTransmitterData(getRange()); } @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - buf.writeInt(getRange()); + public StreamEncoder getMenuCodec() { + return WirelessTransmitterData.STREAM_CODEC; + } + + int getRange() { + return PlatformApi.INSTANCE.getWirelessTransmitterRangeModifier().modifyRange(upgradeContainer, 0); } private void upgradeContainerChanged() { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java index 11f05aadb..4291509a5 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java @@ -1,13 +1,13 @@ package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.common.Platform; import com.refinedmods.refinedstorage2.platform.common.content.Menus; import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeSlot; @@ -15,7 +15,6 @@ import javax.annotation.Nullable; import com.google.common.util.concurrent.RateLimiter; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -30,14 +29,14 @@ public class WirelessTransmitterContainerMenu extends AbstractBaseContainerMenu public WirelessTransmitterContainerMenu(final int syncId, final Inventory playerInventory, - final FriendlyByteBuf buf) { + final WirelessTransmitterData data) { super(Menus.INSTANCE.getWirelessTransmitter(), syncId); addSlots(playerInventory, new UpgradeContainer( UpgradeDestinations.WIRELESS_TRANSMITTER, PlatformApi.INSTANCE.getUpgradeRegistry() )); registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - this.range = buf.readInt(); + this.range = data.range(); this.wirelessTransmitter = null; this.player = playerInventory.player; } @@ -76,10 +75,7 @@ public void broadcastChanges() { final boolean changed = range != newRange; if (changed && rangeRateLimiter.tryAcquire()) { this.range = newRange; - Platform.INSTANCE.getServerToClientCommunications().sendWirelessTransmitterRange( - (ServerPlayer) player, - range - ); + S2CPackets.sendWirelessTransmitterRange((ServerPlayer) player, range); } } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterData.java new file mode 100644 index 000000000..bc6d2f85d --- /dev/null +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterData.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record WirelessTransmitterData(int range) { + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.INT, WirelessTransmitterData::range, + WirelessTransmitterData::new + ); +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json index 79efad7d4..61725cbc3 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json @@ -194,7 +194,11 @@ "item.refinedstorage2.4k_storage_disk": "4K Storage Disk", "item.refinedstorage2.16k_storage_disk": "16K Storage Disk", "item.refinedstorage2.64k_storage_disk": "64K Storage Disk", + "item.refinedstorage2.storage_disk.help": "Stores %s items.", + "item.refinedstorage2.storage_block.help": "Stores %s items.", "item.refinedstorage2.creative_storage_disk": "Creative Storage Disk", + "item.refinedstorage2.creative_storage_disk.help": "Stores an infinite amount of items.", + "item.refinedstorage2.creative_storage_block.help": "Stores an infinite amount of items.", "item.refinedstorage2.64b_fluid_storage_part": "64B Fluid Storage Part", "item.refinedstorage2.256b_fluid_storage_part": "256B Fluid Storage Part", "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", @@ -203,23 +207,33 @@ "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage2.fluid_storage_disk.help": "Stores %s buckets.", + "item.refinedstorage2.fluid_storage_block.help": "Stores %s buckets.", "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage2.creative_fluid_storage_disk.help": "Stores an infinite amount of buckets.", + "item.refinedstorage2.creative_fluid_storage_block.help": "Stores an infinite amount of buckets.", "item.refinedstorage2.storage_housing": "Storage Housing", "item.refinedstorage2.construction_core": "Construction Core", "item.refinedstorage2.destruction_core": "Destruction Core", "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage2.wrench.help": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", "item.refinedstorage2.upgrade": "Upgrade", "item.refinedstorage2.speed_upgrade": "Speed Upgrade", + "item.refinedstorage2.speed_upgrade.help": "Increases the operation speed of a storage network device.", "item.refinedstorage2.stack_upgrade": "Stack Upgrade", + "item.refinedstorage2.stack_upgrade.help": "Increases the amount of resources that the storage network device handles per operation.", "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage2.silk_touch_upgrade.help": "Acts like the Silk Touch enchantment on a pickaxe.", "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage2.fortune_upgrade.help": "Yields more resources when breaking a block. Acts like the Fortune enchantment on a pickaxe.", "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", "item.refinedstorage2.range_upgrade": "Range Upgrade", + "item.refinedstorage2.range_upgrade.help": "Increases the range of the Wireless Transmitter.", "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage2.creative_range_upgrade.help": "Provides infinite range for the Wireless Transmitter. Does not work cross-dimensionally.", "item.refinedstorage2.wireless_grid": "Wireless Grid", "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", @@ -242,6 +256,9 @@ "item.refinedstorage2.network_card.unbound": "Unbound.", "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage2.network_transmitter.help": "Transmits a network signal wirelessly. Needs a Network Card that is paired with a Network Receiver.", + "item.refinedstorage2.network_receiver.help": "Receives a network signal wirelessly. Bind a Network Card to this block.", + "item.refinedstorage2.cable.help": "Connects storage network devices with each other.", "item.refinedstorage2.security_card": "Security Card", "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", "item.refinedstorage2.security_card.unbound": "Unbound.", @@ -250,6 +267,8 @@ "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", "item.refinedstorage2.fallback_security_card": "Fallback Security Card", "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "item.refinedstorage2.portable_grid.help": "Allows to interact with a storage disk while not being connected to a storage network. Can be used as a block in world, or from your inventory.", + "item.refinedstorage2.storage_monitor.help": "A block that displays the current amount of a certain resource in your storage network. SHIFT + right click to configure. Left click to extract a stack, SHIFT + left click to extract a single resource, right click to insert a resource, right click multiple times to insert resources in bulk.", "misc.refinedstorage2.stored": "Stored: %s", "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", "misc.refinedstorage2.total": "%d total", diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card.json index d0e58b52d..947338412 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card.json +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card.json @@ -3,13 +3,13 @@ "overrides": [ { "predicate": { - "active": 0 + "refinedstorage2:configuration_card_active": 0 }, "model": "refinedstorage2:item/configuration_card/inactive" }, { "predicate": { - "active": 1 + "refinedstorage2:configuration_card_active": 1 }, "model": "refinedstorage2:item/configuration_card/active" } diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_wireless_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_wireless_grid.json index 380a93266..e1c52172c 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_wireless_grid.json +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_wireless_grid.json @@ -3,13 +3,13 @@ "overrides": [ { "predicate": { - "active": 0 + "refinedstorage2:network_bound_active": 0 }, "model": "refinedstorage2:item/wireless_grid/inactive" }, { "predicate": { - "active": 1 + "refinedstorage2:network_bound_active": 1 }, "model": "refinedstorage2:item/wireless_grid/active" } diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card.json index 9138e7731..3d191cb97 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card.json +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card.json @@ -3,13 +3,13 @@ "overrides": [ { "predicate": { - "active": 0 + "refinedstorage2:network_card_active": 0 }, "model": "refinedstorage2:item/network_card/inactive" }, { "predicate": { - "active": 1 + "refinedstorage2:network_card_active": 1 }, "model": "refinedstorage2:item/network_card/active" } diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card.json index 9bf6e03d2..99a019e65 100755 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card.json +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card.json @@ -3,13 +3,13 @@ "overrides": [ { "predicate": { - "active": 0 + "refinedstorage2:security_card_active": 0 }, "model": "refinedstorage2:item/security_card/inactive" }, { "predicate": { - "active": 1 + "refinedstorage2:security_card_active": 1 }, "model": "refinedstorage2:item/security_card/active" } diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid.json index 380a93266..e1c52172c 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid.json +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid.json @@ -3,13 +3,13 @@ "overrides": [ { "predicate": { - "active": 0 + "refinedstorage2:network_bound_active": 0 }, "model": "refinedstorage2:item/wireless_grid/inactive" }, { "predicate": { - "active": 1 + "refinedstorage2:network_bound_active": 1 }, "model": "refinedstorage2:item/wireless_grid/active" } diff --git a/refinedstorage2-platform-forge/src/main/resources/data/forge/tags/items/tools/wrench.json b/refinedstorage2-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json similarity index 100% rename from refinedstorage2-platform-forge/src/main/resources/data/forge/tags/items/tools/wrench.json rename to refinedstorage2-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/better_than_a_barrel.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/better_than_a_barrel.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json index a05321c59..03253a45a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/better_than_a_barrel.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:storage_monitor" + "id": "refinedstorage2:storage_monitor" }, "title": { "translate": "advancements.refinedstorage2.better_than_a_barrel" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/conditional_connecting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json similarity index 93% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/conditional_connecting.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json index 28a80e541..17159acfe 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/conditional_connecting.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:relay" + "id": "refinedstorage2:relay" }, "title": { "translate": "advancements.refinedstorage2.conditional_connecting" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/connecting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/connecting.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json index f235632ea..a08cf5f8a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/connecting.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:cable" + "id": "refinedstorage2:cable" }, "title": { "translate": "advancements.refinedstorage2.connecting" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/construction.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/construction.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json index 48d5e00f9..48755e5cc 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/construction.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:constructor" + "id": "refinedstorage2:constructor" }, "title": { "translate": "advancements.refinedstorage2.construction" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/destruction.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/destruction.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json index 1e69b848f..08de8e294 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/destruction.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:destructor" + "id": "refinedstorage2:destructor" }, "title": { "translate": "advancements.refinedstorage2.destruction" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/detecting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/detecting.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json index 0f7cec2dd..702a43d40 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/detecting.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:detector" + "id": "refinedstorage2:detector" }, "title": { "translate": "advancements.refinedstorage2.detecting" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/drives.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/drives.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json index 7430b51ef..f12739870 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/drives.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:disk_drive" + "id": "refinedstorage2:disk_drive" }, "title": { "translate": "advancements.refinedstorage2.drives" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/exporting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/exporting.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json index 3662ca317..962d92ac0 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/exporting.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:exporter" + "id": "refinedstorage2:exporter" }, "title": { "translate": "advancements.refinedstorage2.exporting" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/importing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/importing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json index b8be6d1fd..7f23c03c4 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/importing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:importer" + "id": "refinedstorage2:importer" }, "title": { "translate": "advancements.refinedstorage2.importing" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/interface_to_the_world.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/interface_to_the_world.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json index 84e1b4aae..f040af3a4 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/interface_to_the_world.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:interface" + "id": "refinedstorage2:interface" }, "title": { "translate": "advancements.refinedstorage2.interface_to_the_world" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/interfacing_with_disks.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/interfacing_with_disks.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json index abf6a881f..f809a5327 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/interfacing_with_disks.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:disk_interface" + "id": "refinedstorage2:disk_interface" }, "title": { "translate": "advancements.refinedstorage2.interfacing_with_disks" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/no_cables_required.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json similarity index 93% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/no_cables_required.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json index b13859692..98474fccb 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/no_cables_required.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:network_transmitter" + "id": "refinedstorage2:network_transmitter" }, "title": { "translate": "advancements.refinedstorage2.no_cables_required" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/portable_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/portable_storage.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json index d17050d16..d83cb8aa3 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/portable_storage.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:portable_grid" + "id": "refinedstorage2:portable_grid" }, "title": { "translate": "advancements.refinedstorage2.portable_storage" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/root.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json similarity index 90% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/root.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json index 3a930f8ff..fefc5a07b 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/root.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:creative_controller" + "id": "refinedstorage2:creative_controller" }, "title": { "translate": "mod.refinedstorage2" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/security.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json similarity index 93% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/security.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json index c8bc62011..ec7457e90 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/security.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:security_manager" + "id": "refinedstorage2:security_manager" }, "title": { "translate": "advancements.refinedstorage2.security" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/storing_externally.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/storing_externally.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json index 4753d30f7..3d665d23a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/storing_externally.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:external_storage" + "id": "refinedstorage2:external_storage" }, "title": { "translate": "advancements.refinedstorage2.storing_externally" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/storing_fluids.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json similarity index 90% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/storing_fluids.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json index d8fddd71c..a7138e468 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/storing_fluids.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:64b_fluid_storage_disk" + "id": "refinedstorage2:64b_fluid_storage_disk" }, "title": { "translate": "advancements.refinedstorage2.storing_fluids" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/storing_items.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/storing_items.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json index 0dbdc1a53..1b7b25e79 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/storing_items.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:1k_storage_disk" + "id": "refinedstorage2:1k_storage_disk" }, "title": { "translate": "advancements.refinedstorage2.storing_items" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/upgrading.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/upgrading.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json index 73939a392..9423e8a44 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/upgrading.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:upgrade" + "id": "refinedstorage2:upgrade" }, "title": { "translate": "advancements.refinedstorage2.upgrading" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/upgrading_your_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/upgrading_your_grid.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json index 81ee9ab70..e48fe5f81 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/upgrading_your_grid.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:crafting_grid" + "id": "refinedstorage2:crafting_grid" }, "title": { "translate": "advancements.refinedstorage2.upgrading_your_grid" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/viewing_your_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json similarity index 93% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/viewing_your_storage.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json index 254586ad4..51a627f81 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/viewing_your_storage.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:grid" + "id": "refinedstorage2:grid" }, "title": { "translate": "advancements.refinedstorage2.viewing_your_storage" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/wireless.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json similarity index 93% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/wireless.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json index 29b9fe2e9..713477748 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancements/wireless.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "refinedstorage2:wireless_grid" + "id": "refinedstorage2:wireless_grid" }, "title": { "translate": "advancements.refinedstorage2.wireless" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/1024b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1024b_fluid_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/1024b_fluid_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1024b_fluid_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/16k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/16k_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/16k_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/16k_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/1k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1k_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/1k_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1k_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/256b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/256b_fluid_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/256b_fluid_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/256b_fluid_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/4096b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4096b_fluid_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/4096b_fluid_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4096b_fluid_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/4k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4k_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/4k_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4k_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/64b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64b_fluid_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/64b_fluid_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64b_fluid_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/64k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64k_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/64k_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64k_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/creative_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_fluid_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/creative_fluid_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_fluid_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/creative_portable_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_portable_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/creative_portable_grid.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_portable_grid.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/creative_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_storage_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/creative_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_storage_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/disk_drive.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/disk_drive.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/disk_drive.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/disk_drive.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/exporter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/exporter.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/exporter.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/exporter.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/external_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/external_storage.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/external_storage.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/external_storage.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/importer.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/importer.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/importer.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/importer.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/interface.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/interface.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/interface.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/interface.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/machine_casing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/machine_casing.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/machine_casing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/machine_casing.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/portable_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/portable_grid.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/portable_grid.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/portable_grid.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/quartz_enriched_iron_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/quartz_enriched_iron_block.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/quartz_enriched_iron_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/quartz_enriched_iron_block.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/storage_monitor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/storage_monitor.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_tables/blocks/storage_monitor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/storage_monitor.json diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json index 446ea82f7..7e362b8f6 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:1024b_fluid_storage_block" + "id": "refinedstorage2:1024b_fluid_storage_block" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_disk.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json index ed72b05d8..18712aace 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:1024b_fluid_storage_disk" + "id": "refinedstorage2:1024b_fluid_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk_from_storage_housing.json similarity index 79% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_disk_from_storage_housing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk_from_storage_housing.json index 47ff71028..015954141 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_disk_from_storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk_from_storage_housing.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:1024b_fluid_storage_disk" + "id": "refinedstorage2:1024b_fluid_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_part.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json index f1e35c826..1823b49cc 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1024b_fluid_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:1024b_fluid_storage_part" + "id": "refinedstorage2:1024b_fluid_storage_part" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json index 68f911c64..a712ee859 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:16k_storage_block" + "id": "refinedstorage2:16k_storage_block" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_disk.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json index 250286153..1d188c6b9 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:16k_storage_disk" + "id": "refinedstorage2:16k_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk_from_storage_housing.json similarity index 81% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_disk_from_storage_housing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk_from_storage_housing.json index f548d6dce..14e50a6a5 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_disk_from_storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk_from_storage_housing.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:16k_storage_disk" + "id": "refinedstorage2:16k_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json similarity index 89% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_part.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json index 5589ea1ed..bbd1cf544 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/16k_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:16k_storage_part" + "id": "refinedstorage2:16k_storage_part" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json similarity index 89% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json index 6df942a73..8e1ec2004 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:1k_storage_block" + "id": "refinedstorage2:1k_storage_block" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_disk.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json index 3329e503a..0d17bdfb5 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:1k_storage_disk" + "id": "refinedstorage2:1k_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk_from_storage_housing.json similarity index 81% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_disk_from_storage_housing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk_from_storage_housing.json index 2594ef3bb..c38566098 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_disk_from_storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk_from_storage_housing.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:1k_storage_disk" + "id": "refinedstorage2:1k_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_part.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json index 3be097277..ba196934a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/1k_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:1k_storage_part" + "id": "refinedstorage2:1k_storage_part" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json index 0433ec81f..7e5a22a69 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:256b_fluid_storage_block" + "id": "refinedstorage2:256b_fluid_storage_block" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_disk.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json index 5cdc05d31..13e7f5996 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:256b_fluid_storage_disk" + "id": "refinedstorage2:256b_fluid_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk_from_storage_housing.json similarity index 80% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_disk_from_storage_housing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk_from_storage_housing.json index 2d52efd82..8c3ffebb0 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_disk_from_storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk_from_storage_housing.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:256b_fluid_storage_disk" + "id": "refinedstorage2:256b_fluid_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_part.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json index 31810f24d..da37d01c4 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/256b_fluid_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:256b_fluid_storage_part" + "id": "refinedstorage2:256b_fluid_storage_part" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json index 99c03781a..7ef712cf1 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:4096b_fluid_storage_block" + "id": "refinedstorage2:4096b_fluid_storage_block" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_disk.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json index 6a1ad441c..b2870ee62 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:4096b_fluid_storage_disk" + "id": "refinedstorage2:4096b_fluid_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk_from_storage_housing.json similarity index 79% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_disk_from_storage_housing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk_from_storage_housing.json index a6e7a63c8..4f691f6c2 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_disk_from_storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk_from_storage_housing.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:4096b_fluid_storage_disk" + "id": "refinedstorage2:4096b_fluid_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_part.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json index 79dd47ccd..b9aca1764 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4096b_fluid_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:4096b_fluid_storage_part" + "id": "refinedstorage2:4096b_fluid_storage_part" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json similarity index 89% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json index 658a15f09..984e4597f 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:4k_storage_block" + "id": "refinedstorage2:4k_storage_block" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_disk.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json index 1e3511e06..d4cc70522 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:4k_storage_disk" + "id": "refinedstorage2:4k_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk_from_storage_housing.json similarity index 81% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_disk_from_storage_housing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk_from_storage_housing.json index c4d3731c8..20d5584b1 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_disk_from_storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk_from_storage_housing.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:4k_storage_disk" + "id": "refinedstorage2:4k_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json similarity index 89% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_part.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json index 09024d294..9596b9e89 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/4k_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:4k_storage_part" + "id": "refinedstorage2:4k_storage_part" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json index 2228fd7b2..b2ca56ee1 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:64b_fluid_storage_block" + "id": "refinedstorage2:64b_fluid_storage_block" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_disk.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json index 5989af17b..319cc703a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:64b_fluid_storage_disk" + "id": "refinedstorage2:64b_fluid_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk_from_storage_housing.json similarity index 80% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_disk_from_storage_housing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk_from_storage_housing.json index caf595d83..2507aa062 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_disk_from_storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk_from_storage_housing.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:64b_fluid_storage_disk" + "id": "refinedstorage2:64b_fluid_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_part.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json index d3310a1f4..f4f51a16c 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64b_fluid_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:64b_fluid_storage_part" + "id": "refinedstorage2:64b_fluid_storage_part" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json index 9b550f293..790c3a54c 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:64k_storage_block" + "id": "refinedstorage2:64k_storage_block" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_disk.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json index 7ba432617..a4aef390f 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:64k_storage_disk" + "id": "refinedstorage2:64k_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk_from_storage_housing.json similarity index 81% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_disk_from_storage_housing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk_from_storage_housing.json index a95fa467d..94f4e1e46 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_disk_from_storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk_from_storage_housing.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:64k_storage_disk" + "id": "refinedstorage2:64k_storage_disk" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json similarity index 89% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_part.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json index ae55af8a0..4adcd2287 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/64k_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:64k_storage_part" + "id": "refinedstorage2:64k_storage_part" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/advanced_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/advanced_processor.json similarity index 66% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/advanced_processor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/advanced_processor.json index 0fbb97b74..1275224e1 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/advanced_processor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/advanced_processor.json @@ -3,6 +3,8 @@ "ingredient": { "item": "refinedstorage2:raw_advanced_processor" }, - "result": "refinedstorage2:advanced_processor", + "result": { + "id": "refinedstorage2:advanced_processor" + }, "experience": 0.5 } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/basic_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/basic_processor.json similarity index 67% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/basic_processor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/basic_processor.json index 5566bed31..0febc9ec3 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/basic_processor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/basic_processor.json @@ -3,6 +3,8 @@ "ingredient": { "item": "refinedstorage2:raw_basic_processor" }, - "result": "refinedstorage2:basic_processor", + "result": { + "id": "refinedstorage2:basic_processor" + }, "experience": 0.5 } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/block_of_quartz_enriched_iron.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/block_of_quartz_enriched_iron.json similarity index 77% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/block_of_quartz_enriched_iron.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/block_of_quartz_enriched_iron.json index e022d1445..8968bef9a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/block_of_quartz_enriched_iron.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/block_of_quartz_enriched_iron.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "refinedstorage2:quartz_enriched_iron_block" + "id": "refinedstorage2:quartz_enriched_iron_block" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/cable.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json similarity index 89% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/cable.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json index 466fb5944..c330e24e3 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/cable.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "refinedstorage2:cable", + "id": "refinedstorage2:cable", "count": 12 } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/configuration_card.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/configuration_card.json similarity index 86% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/configuration_card.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/configuration_card.json index 553f5a645..2ca724164 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/configuration_card.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/configuration_card.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "refinedstorage2:configuration_card" + "id": "refinedstorage2:configuration_card" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/construction_core.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json similarity index 80% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/construction_core.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json index 0792d40d6..edd4e5a56 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/construction_core.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:construction_core" + "id": "refinedstorage2:construction_core" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/constructor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/constructor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json index bb7ba680a..6e3599d87 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/constructor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "refinedstorage2:constructor" + "id": "refinedstorage2:constructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/controller.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/controller.json similarity index 90% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/controller.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/controller.json index 417fc411f..dff6830fe 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/controller.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/controller.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:controller" + "id": "refinedstorage2:controller" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/crafting_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json similarity index 85% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/crafting_grid.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json index 242f67e15..5189ebaae 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/crafting_grid.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json @@ -12,6 +12,6 @@ } ], "result": { - "item": "refinedstorage2:crafting_grid" + "id": "refinedstorage2:crafting_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/destruction_core.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json similarity index 80% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/destruction_core.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json index 65c886f79..ed7432e90 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/destruction_core.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:destruction_core" + "id": "refinedstorage2:destruction_core" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/destructor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/destructor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json index 52aa0c9b9..3e405636f 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/destructor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "refinedstorage2:destructor" + "id": "refinedstorage2:destructor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/detector.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/detector.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/detector.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/detector.json index 688f80147..8f11ecacf 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/detector.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/detector.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "refinedstorage2:detector" + "id": "refinedstorage2:detector" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/disk_drive.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json similarity index 90% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/disk_drive.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json index f3d7eec0e..089d74b60 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/disk_drive.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:disk_drive" + "id": "refinedstorage2:disk_drive" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/disk_interface.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_interface.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/disk_interface.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_interface.json index 4dd84737c..dd3a8bedf 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/disk_interface.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_interface.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "refinedstorage2:disk_interface" + "id": "refinedstorage2:disk_interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/exporter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/exporter.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/exporter.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/exporter.json index 46803c03a..317288d1c 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/exporter.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/exporter.json @@ -12,6 +12,6 @@ } ], "result": { - "item": "refinedstorage2:exporter" + "id": "refinedstorage2:exporter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/external_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/external_storage.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json index 68e62c684..28a994ee0 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/external_storage.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json @@ -26,6 +26,6 @@ } }, "result": { - "item": "refinedstorage2:external_storage" + "id": "refinedstorage2:external_storage" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fallback_security_card.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fallback_security_card.json similarity index 78% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fallback_security_card.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fallback_security_card.json index 0186f81b7..28dff3f31 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fallback_security_card.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fallback_security_card.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "refinedstorage2:fallback_security_card" + "id": "refinedstorage2:fallback_security_card" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fortune_1_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_1_upgrade.json similarity index 63% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fortune_1_upgrade.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_1_upgrade.json index 8c7a4bf15..4fa74cd62 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fortune_1_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_1_upgrade.json @@ -2,5 +2,7 @@ "type": "refinedstorage2:upgrade_with_enchanted_book", "enchantment": "minecraft:fortune", "level": 1, - "result": "refinedstorage2:fortune_1_upgrade" + "result": { + "id": "refinedstorage2:fortune_1_upgrade" + } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fortune_2_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_2_upgrade.json similarity index 63% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fortune_2_upgrade.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_2_upgrade.json index 68a36dd30..e2d3b258b 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fortune_2_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_2_upgrade.json @@ -2,5 +2,7 @@ "type": "refinedstorage2:upgrade_with_enchanted_book", "enchantment": "minecraft:fortune", "level": 2, - "result": "refinedstorage2:fortune_2_upgrade" + "result": { + "id": "refinedstorage2:fortune_2_upgrade" + } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fortune_3_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_3_upgrade.json similarity index 63% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fortune_3_upgrade.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_3_upgrade.json index 51a503666..083ea2c4b 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/fortune_3_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_3_upgrade.json @@ -2,5 +2,7 @@ "type": "refinedstorage2:upgrade_with_enchanted_book", "enchantment": "minecraft:fortune", "level": 3, - "result": "refinedstorage2:fortune_3_upgrade" + "result": { + "id": "refinedstorage2:fortune_3_upgrade" + } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json similarity index 93% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/grid.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json index 190680b03..ca1f283fe 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/grid.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json @@ -26,6 +26,6 @@ } }, "result": { - "item": "refinedstorage2:grid" + "id": "refinedstorage2:grid" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/importer.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/importer.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/importer.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/importer.json index 90e057dbd..42d7961df 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/importer.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/importer.json @@ -12,6 +12,6 @@ } ], "result": { - "item": "refinedstorage2:importer" + "id": "refinedstorage2:importer" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/improved_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/improved_processor.json similarity index 66% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/improved_processor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/improved_processor.json index 915993aad..32d851fc7 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/improved_processor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/improved_processor.json @@ -3,6 +3,8 @@ "ingredient": { "item": "refinedstorage2:raw_improved_processor" }, - "result": "refinedstorage2:improved_processor", + "result": { + "id": "refinedstorage2:improved_processor" + }, "experience": 0.5 } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/interface.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/interface.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json index 6fd78e456..7a4d89334 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/interface.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "refinedstorage2:interface" + "id": "refinedstorage2:interface" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/machine_casing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json similarity index 84% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/machine_casing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json index b872195c6..792e1ce36 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/machine_casing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "refinedstorage2:machine_casing" + "id": "refinedstorage2:machine_casing" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/network_card.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_card.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/network_card.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_card.json index 05980b01d..51d61404e 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/network_card.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_card.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "refinedstorage2:network_card" + "id": "refinedstorage2:network_card" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/network_receiver.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/network_receiver.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json index 4f9df536f..308f80013 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/network_receiver.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json @@ -26,6 +26,6 @@ } }, "result": { - "item": "refinedstorage2:network_receiver" + "id": "refinedstorage2:network_receiver" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/network_transmitter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/network_transmitter.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json index ee854972e..7b991111f 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/network_transmitter.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json @@ -26,6 +26,6 @@ } }, "result": { - "item": "refinedstorage2:network_transmitter" + "id": "refinedstorage2:network_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/portable_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/portable_grid.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/portable_grid.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/portable_grid.json index 2fe492a7a..c2dad6ad4 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/portable_grid.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/portable_grid.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "refinedstorage2:portable_grid" + "id": "refinedstorage2:portable_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/processor_binding.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json similarity index 83% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/processor_binding.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json index 0159993e2..1db4a0b38 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/processor_binding.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "refinedstorage2:processor_binding", + "id": "refinedstorage2:processor_binding", "count": 8 } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/quartz_enriched_iron.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json similarity index 81% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/quartz_enriched_iron.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json index ee740401c..1343282f0 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/quartz_enriched_iron.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "refinedstorage2:quartz_enriched_iron", + "id": "refinedstorage2:quartz_enriched_iron", "count": 4 } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/quartz_enriched_iron_from_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_from_block.json similarity index 76% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/quartz_enriched_iron_from_block.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_from_block.json index 912a5bdb8..dcf8cf4af 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/quartz_enriched_iron_from_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_from_block.json @@ -6,7 +6,7 @@ } ], "result": { - "item": "refinedstorage2:quartz_enriched_iron", + "id": "refinedstorage2:quartz_enriched_iron", "count": 9 } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/range_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/range_upgrade.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json index 7f20bcb19..9951c8846 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/range_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "refinedstorage2:range_upgrade" + "id": "refinedstorage2:range_upgrade" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/raw_advanced_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json similarity index 84% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/raw_advanced_processor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json index 94b377310..a21670708 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/raw_advanced_processor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json @@ -15,6 +15,6 @@ } ], "result": { - "item": "refinedstorage2:raw_advanced_processor" + "id": "refinedstorage2:raw_advanced_processor" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/raw_basic_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json similarity index 85% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/raw_basic_processor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json index 8c6b4851a..695dc20e9 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/raw_basic_processor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json @@ -15,6 +15,6 @@ } ], "result": { - "item": "refinedstorage2:raw_basic_processor" + "id": "refinedstorage2:raw_basic_processor" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/raw_improved_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json similarity index 85% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/raw_improved_processor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json index 2ef02c75f..3c1c64185 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/raw_improved_processor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json @@ -15,6 +15,6 @@ } ], "result": { - "item": "refinedstorage2:raw_improved_processor" + "id": "refinedstorage2:raw_improved_processor" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/regulator_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/regulator_upgrade.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json index d0020b8c4..d786978d5 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/regulator_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:regulator_upgrade" + "id": "refinedstorage2:regulator_upgrade" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/relay.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/relay.json similarity index 89% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/relay.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/relay.json index 47503ccd9..7d2789e6b 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/relay.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/relay.json @@ -15,6 +15,6 @@ } ], "result": { - "item": "refinedstorage2:relay" + "id": "refinedstorage2:relay" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/security_card.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_card.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/security_card.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_card.json index 073ce7ff8..6872ddc56 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/security_card.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_card.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "refinedstorage2:security_card" + "id": "refinedstorage2:security_card" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/security_manager.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json similarity index 90% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/security_manager.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json index 73b19056c..40dd7549d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/security_manager.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "refinedstorage2:security_manager" + "id": "refinedstorage2:security_manager" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/silicon.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json similarity index 66% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/silicon.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json index 232c13ed3..3f10f5355 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/silicon.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json @@ -3,6 +3,8 @@ "ingredient": { "item": "minecraft:quartz" }, - "result": "refinedstorage2:silicon", + "result": { + "id": "refinedstorage2:silicon" + }, "experience": 0.5 } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/silk_touch_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silk_touch_upgrade.json similarity index 60% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/silk_touch_upgrade.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silk_touch_upgrade.json index c2f8c20fb..651923a27 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/silk_touch_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silk_touch_upgrade.json @@ -1,5 +1,7 @@ { "type": "refinedstorage2:upgrade_with_enchanted_book", "enchantment": "minecraft:silk_touch", - "result": "refinedstorage2:silk_touch_upgrade" + "result": { + "id": "refinedstorage2:silk_touch_upgrade" + } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/speed_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/speed_upgrade.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/speed_upgrade.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/speed_upgrade.json index bcc314348..517239eb9 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/speed_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/speed_upgrade.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "refinedstorage2:speed_upgrade" + "id": "refinedstorage2:speed_upgrade" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/stack_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/stack_upgrade.json similarity index 84% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/stack_upgrade.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/stack_upgrade.json index 428183a12..cff02da76 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/stack_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/stack_upgrade.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "refinedstorage2:stack_upgrade" + "id": "refinedstorage2:stack_upgrade" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json similarity index 86% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/storage_housing.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json index 769a88cde..d209a9c5d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "refinedstorage2:storage_housing" + "id": "refinedstorage2:storage_housing" } } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/storage_monitor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/storage_monitor.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json index ac7b229d1..ade910ce1 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/storage_monitor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json @@ -26,6 +26,6 @@ } }, "result": { - "item": "refinedstorage2:storage_monitor" + "id": "refinedstorage2:storage_monitor" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json similarity index 89% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/upgrade.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json index 550ee76f2..05a6422d7 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "refinedstorage2:upgrade" + "id": "refinedstorage2:upgrade" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/wireless_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json similarity index 89% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/wireless_grid.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json index 3e5dcb128..3811adf5b 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/wireless_grid.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:wireless_grid" + "id": "refinedstorage2:wireless_grid" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/wireless_transmitter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json similarity index 88% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/wireless_transmitter.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json index 52e8f90d1..3bd6b834a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "refinedstorage2:wireless_transmitter" + "id": "refinedstorage2:wireless_transmitter" } } \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/wrench.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wrench.json similarity index 87% rename from refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/wrench.json rename to refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wrench.json index 174a032ab..d2a7f1121 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipes/wrench.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wrench.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "refinedstorage2:wrench" + "id": "refinedstorage2:wrench" } } diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/PlatformTestFixtures.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/PlatformTestFixtures.java deleted file mode 100644 index 5c12ddd44..000000000 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/PlatformTestFixtures.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common; - -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes; -import com.refinedmods.refinedstorage2.platform.common.support.registry.PlatformRegistryImpl; - -import net.minecraft.resources.ResourceLocation; - -public final class PlatformTestFixtures { - public static final PlatformRegistry STORAGE_TYPE_REGISTRY = new PlatformRegistryImpl<>(); - - static { - STORAGE_TYPE_REGISTRY.register(new ResourceLocation("item"), StorageTypes.ITEM); - } - - private PlatformTestFixtures() { - } -} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/TestPlatform.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/TestPlatform.java index 7a0c108bd..7b7e33730 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/TestPlatform.java +++ b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/TestPlatform.java @@ -4,8 +4,6 @@ import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.support.ClientToServerCommunications; -import com.refinedmods.refinedstorage2.platform.common.support.ServerToClientCommunications; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager; import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer; @@ -25,16 +23,17 @@ import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; -import net.minecraft.tags.TagKey; 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.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; @@ -50,16 +49,6 @@ public TestPlatform(final long bucketAmount) { this.bucketAmount = bucketAmount; } - @Override - public ServerToClientCommunications getServerToClientCommunications() { - throw new UnsupportedOperationException(); - } - - @Override - public ClientToServerCommunications getClientToServerCommunications() { - throw new UnsupportedOperationException(); - } - @Override public MenuOpener getMenuOpener() { throw new UnsupportedOperationException(); @@ -70,11 +59,6 @@ public long getBucketAmount() { return bucketAmount; } - @Override - public TagKey getWrenchTag() { - throw new UnsupportedOperationException(); - } - @Override public Config getConfig() { throw new UnsupportedOperationException(); @@ -139,7 +123,7 @@ public ItemStack getCloneItemStack(final BlockState state, final Level level, fi @Override public NonNullList getRemainingCraftingItems(final Player player, final CraftingRecipe craftingRecipe, - final CraftingContainer container) { + final CraftingInput input) { throw new UnsupportedOperationException(); } @@ -200,4 +184,14 @@ public void renderTooltip(final GuiGraphics graphics, final List getEnergyStorage(final ItemStack stack) { throw new UnsupportedOperationException(); } + + @Override + public void sendPacketToServer(final T packet) { + throw new UnsupportedOperationException(); + } + + @Override + public void sendPacketToClient(final ServerPlayer player, final T packet) { + throw new UnsupportedOperationException(); + } } diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java index fb32d276c..ac8e04280 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java +++ b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java @@ -14,6 +14,7 @@ import java.util.Comparator; import java.util.Optional; +import net.minecraft.core.component.DataComponentPatch; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import org.junit.jupiter.api.BeforeEach; @@ -49,9 +50,9 @@ void setUp() { view -> Comparator.comparing(GridResource::getName), view -> Comparator.comparing(GridResource::getAmount) ); - dirt = new ItemResource(Items.DIRT, null); - stone = new ItemResource(Items.STONE, null); - gold = new ItemResource(Items.GOLD_INGOT, null); + dirt = new ItemResource(Items.DIRT, DataComponentPatch.EMPTY); + stone = new ItemResource(Items.STONE, DataComponentPatch.EMPTY); + gold = new ItemResource(Items.GOLD_INGOT, DataComponentPatch.EMPTY); } @ParameterizedTest diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageTypeTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageTypeTest.java deleted file mode 100644 index dfbfd1832..000000000 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageTypeTest.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage2.platform.common.SimpleListener; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.test.SetupMinecraft; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.material.Fluids; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import static com.refinedmods.refinedstorage2.platform.test.TagHelper.createDummyTag; -import static org.assertj.core.api.Assertions.assertThat; - -@SetupMinecraft -class FluidStorageTypeTest { - StorageType sut = StorageTypes.FLUID; - SimpleListener listener; - - @BeforeEach - void setUp() { - listener = new SimpleListener(); - } - - @Test - void shouldSerializeAndDeserializeRegularStorage() { - // Arrange - final InMemoryTrackedStorageRepository tracker = new InMemoryTrackedStorageRepository(); - final Storage storage = new PlatformStorage( - new TrackedStorageImpl(new InMemoryStorageImpl(), tracker, () -> 123L), - StorageTypes.FLUID, - tracker, - () -> { - } - ); - - storage.insert(new FluidResource(Fluids.WATER, createDummyTag()), 10, Action.EXECUTE, new PlayerActor("A")); - storage.insert(new FluidResource(Fluids.LAVA, null), 15, Action.EXECUTE, EmptyActor.INSTANCE); - - // Act - final CompoundTag serialized = sut.toTag(storage); - final Storage deserialized = sut.fromTag(serialized, listener); - - // Assert - assertThat(listener.isChanged()).isFalse(); - assertThat(deserialized).isInstanceOf(PlatformStorage.class); - assertThat(deserialized.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( - new ResourceAmount(new FluidResource(Fluids.WATER, createDummyTag()), 10), - new ResourceAmount(new FluidResource(Fluids.LAVA, null), 15) - ); - assertThat(((TrackedStorage) deserialized).findTrackedResourceByActorType( - new FluidResource(Fluids.WATER, createDummyTag()), - PlayerActor.class - )).get().usingRecursiveComparison().isEqualTo(new TrackedResource("A", 123)); - assertThat(((TrackedStorage) deserialized).findTrackedResourceByActorType( - new FluidResource(Fluids.LAVA, null), - PlayerActor.class - )).isEmpty(); - } - - @Test - void shouldCallListenerOnDeserializedStorage() { - // Arrange - final InMemoryTrackedStorageRepository tracker = new InMemoryTrackedStorageRepository(); - final Storage storage = new PlatformStorage( - new TrackedStorageImpl(new InMemoryStorageImpl(), tracker, () -> 123L), - StorageTypes.FLUID, - tracker, - () -> { - } - ); - storage.insert(new FluidResource(Fluids.WATER, null), 15, Action.EXECUTE, EmptyActor.INSTANCE); - - final CompoundTag serialized = sut.toTag(storage); - final Storage deserialized = sut.fromTag(serialized, listener); - - // Act - final boolean preInsert = listener.isChanged(); - deserialized.insert(new FluidResource(Fluids.WATER, null), 15, Action.EXECUTE, EmptyActor.INSTANCE); - final boolean postInsert = listener.isChanged(); - - // Assert - assertThat(preInsert).isFalse(); - assertThat(postInsert).isTrue(); - } - - @Test - void shouldSerializeLimitedStorage() { - // Arrange - final InMemoryTrackedStorageRepository tracker = new InMemoryTrackedStorageRepository(); - final Storage storage = new LimitedPlatformStorage( - new LimitedStorageImpl( - new TrackedStorageImpl(new InMemoryStorageImpl(), tracker, () -> 123L), - 100 - ), - StorageTypes.FLUID, - tracker, - () -> { - } - ); - - storage.insert(new FluidResource(Fluids.WATER, createDummyTag()), 10, Action.EXECUTE, new PlayerActor("A")); - storage.insert(new FluidResource(Fluids.LAVA, null), 15, Action.EXECUTE, EmptyActor.INSTANCE); - - // Act - final CompoundTag serialized = sut.toTag(storage); - final Storage deserialized = sut.fromTag(serialized, listener); - - // Assert - assertThat(listener.isChanged()).isFalse(); - assertThat(deserialized).isInstanceOf(LimitedStorage.class); - assertThat(((LimitedStorage) deserialized).getCapacity()).isEqualTo(100); - assertThat(deserialized.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( - new ResourceAmount(new FluidResource(Fluids.WATER, createDummyTag()), 10), - new ResourceAmount(new FluidResource(Fluids.LAVA, null), 15) - ); - assertThat(((TrackedStorage) deserialized).findTrackedResourceByActorType( - new FluidResource(Fluids.WATER, createDummyTag()), - PlayerActor.class - )).get().usingRecursiveComparison().isEqualTo(new TrackedResource("A", 123)); - assertThat(((TrackedStorage) deserialized).findTrackedResourceByActorType( - new FluidResource(Fluids.LAVA, null), - PlayerActor.class - )).isEmpty(); - } -} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageTypeTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageTypeTest.java deleted file mode 100644 index dbf632236..000000000 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageTypeTest.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage2.platform.common.SimpleListener; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.test.SetupMinecraft; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.item.Items; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import static com.refinedmods.refinedstorage2.platform.test.TagHelper.createDummyTag; -import static org.assertj.core.api.Assertions.assertThat; - -@SetupMinecraft -class ItemStorageTypeTest { - StorageType sut = StorageTypes.ITEM; - SimpleListener listener; - - @BeforeEach - void setUp() { - listener = new SimpleListener(); - } - - @Test - void shouldSerializeAndDeserializeRegularStorage() { - // Arrange - final InMemoryTrackedStorageRepository tracker = new InMemoryTrackedStorageRepository(); - final Storage storage = new PlatformStorage( - new TrackedStorageImpl(new InMemoryStorageImpl(), tracker, () -> 123L), - StorageTypes.ITEM, - tracker, - () -> { - } - ); - - storage.insert(new ItemResource(Items.DIRT, createDummyTag()), 10, Action.EXECUTE, new PlayerActor("A")); - storage.insert(new ItemResource(Items.GLASS, null), 15, Action.EXECUTE, EmptyActor.INSTANCE); - - // Act - final CompoundTag serialized = sut.toTag(storage); - final Storage deserialized = sut.fromTag(serialized, listener); - - // Assert - assertThat(listener.isChanged()).isFalse(); - assertThat(deserialized).isInstanceOf(PlatformStorage.class); - assertThat(deserialized.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( - new ResourceAmount(new ItemResource(Items.DIRT, createDummyTag()), 10), - new ResourceAmount(new ItemResource(Items.GLASS, null), 15) - ); - assertThat(((TrackedStorage) deserialized).findTrackedResourceByActorType( - new ItemResource(Items.DIRT, createDummyTag()), - PlayerActor.class - )).get().usingRecursiveComparison().isEqualTo(new TrackedResource("A", 123)); - assertThat(((TrackedStorage) deserialized).findTrackedResourceByActorType( - new ItemResource(Items.GLASS, null), - PlayerActor.class - )).isEmpty(); - } - - @Test - void shouldCallListenerOnDeserializedStorage() { - // Arrange - final InMemoryTrackedStorageRepository tracker = new InMemoryTrackedStorageRepository(); - final Storage storage = new PlatformStorage( - new TrackedStorageImpl(new InMemoryStorageImpl(), tracker, () -> 123L), - StorageTypes.ITEM, - tracker, - () -> { - } - ); - storage.insert(new ItemResource(Items.GLASS, null), 15, Action.EXECUTE, EmptyActor.INSTANCE); - - final CompoundTag serialized = sut.toTag(storage); - final Storage deserialized = sut.fromTag(serialized, listener); - - // Act - final boolean preInsert = listener.isChanged(); - deserialized.insert(new ItemResource(Items.GLASS, null), 15, Action.EXECUTE, EmptyActor.INSTANCE); - final boolean postInsert = listener.isChanged(); - - // Assert - assertThat(preInsert).isFalse(); - assertThat(postInsert).isTrue(); - } - - @Test - void shouldSerializeLimitedStorage() { - // Arrange - final InMemoryTrackedStorageRepository tracker = new InMemoryTrackedStorageRepository(); - final Storage storage = new LimitedPlatformStorage( - new LimitedStorageImpl(new TrackedStorageImpl(new InMemoryStorageImpl(), tracker, () -> 123L), 100), - StorageTypes.ITEM, - tracker, - () -> { - } - ); - - storage.insert(new ItemResource(Items.DIRT, createDummyTag()), 10, Action.EXECUTE, new PlayerActor("A")); - storage.insert(new ItemResource(Items.GLASS, null), 15, Action.EXECUTE, EmptyActor.INSTANCE); - - // Act - final CompoundTag serialized = sut.toTag(storage); - final Storage deserialized = sut.fromTag(serialized, listener); - - // Assert - assertThat(listener.isChanged()).isFalse(); - assertThat(deserialized).isInstanceOf(LimitedStorage.class); - assertThat(((LimitedStorage) deserialized).getCapacity()).isEqualTo(100); - assertThat(deserialized.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( - new ResourceAmount(new ItemResource(Items.DIRT, createDummyTag()), 10), - new ResourceAmount(new ItemResource(Items.GLASS, null), 15) - ); - assertThat(((TrackedStorage) deserialized).findTrackedResourceByActorType( - new ItemResource(Items.DIRT, createDummyTag()), - PlayerActor.class - )).get().usingRecursiveComparison().isEqualTo(new TrackedResource("A", 123)); - assertThat(((TrackedStorage) deserialized).findTrackedResourceByActorType( - new ItemResource(Items.GLASS, null), - PlayerActor.class - )).isEmpty(); - } -} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorageTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorageTest.java deleted file mode 100644 index d86c9a56a..000000000 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorageTest.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.common.SimpleListener; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.test.SetupMinecraft; - -import net.minecraft.world.item.Items; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; - -import static org.assertj.core.api.Assertions.assertThat; - -@SetupMinecraft -class PlatformStorageTest { - PlatformStorage sut; - SimpleListener listener; - - @BeforeEach - void setUp() { - final TrackedStorageRepository trackedStorageRepository = new InMemoryTrackedStorageRepository(); - final TrackedStorageImpl delegate = new TrackedStorageImpl( - new LimitedStorageImpl(new InMemoryStorageImpl(), 100), - trackedStorageRepository, - () -> 0L - ); - listener = new SimpleListener(); - sut = new PlatformStorage(delegate, StorageTypes.ITEM, trackedStorageRepository, listener); - } - - @Test - void testInitialState() { - // Assert - assertThat(sut.getType()).isEqualTo(StorageTypes.ITEM); - assertThat(sut).isNotInstanceOf(LimitedStorage.class); - } - - @Test - void shouldLoadAndUpdateTrackedResources() { - // Act - sut.load(new ItemResource(Items.DIRT, null), 10, "A", 100); - sut.load(new ItemResource(Items.GLASS, null), 20, null, 200); - sut.load(new ItemResource(Items.STONE, null), 30, "", 300); - - // Assert - assertThat(sut.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( - new ResourceAmount(new ItemResource(Items.DIRT, null), 10), - new ResourceAmount(new ItemResource(Items.GLASS, null), 20), - new ResourceAmount(new ItemResource(Items.STONE, null), 30) - ); - assertThat(sut.findTrackedResourceByActorType(new ItemResource(Items.DIRT, null), PlayerActor.class)) - .get() - .usingRecursiveComparison() - .isEqualTo(new TrackedResource("A", 100)); - assertThat( - sut.findTrackedResourceByActorType(new ItemResource(Items.GLASS, null), PlayerActor.class)).isEmpty(); - assertThat( - sut.findTrackedResourceByActorType(new ItemResource(Items.STONE, null), PlayerActor.class)).isEmpty(); - assertThat(listener.getChanges()).isZero(); - } - - @ParameterizedTest - @EnumSource(Action.class) - void shouldInsert(final Action action) { - // Act - sut.insert(new ItemResource(Items.DIRT, null), 10, action, new PlayerActor("A")); - sut.insert(new ItemResource(Items.DIRT, null), 95, action, new PlayerActor("A")); - sut.insert(new ItemResource(Items.DIRT, null), 1, action, new PlayerActor("A")); - - // Assert - if (action == Action.EXECUTE) { - assertThat(listener.getChanges()).isEqualTo(2); - assertThat(sut.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new ResourceAmount(new ItemResource(Items.DIRT, null), 100) - ); - assertThat(sut.findTrackedResourceByActorType(new ItemResource(Items.DIRT, null), PlayerActor.class)) - .get() - .usingRecursiveComparison() - .isEqualTo(new TrackedResource("A", 0)); - } else { - assertThat(listener.getChanges()).isZero(); - assertThat(sut.getAll()).isEmpty(); - assertThat( - sut.findTrackedResourceByActorType(new ItemResource(Items.DIRT, null), PlayerActor.class)).isEmpty(); - } - } -} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImplTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImplTest.java deleted file mode 100644 index 7ed352c33..000000000 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImplTest.java +++ /dev/null @@ -1,281 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.common.PlatformTestFixtures; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.test.SetupMinecraft; - -import java.util.Optional; -import java.util.UUID; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.item.Items; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.function.Executable; - -import static com.refinedmods.refinedstorage2.platform.test.TagHelper.createDummyTag; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; - -@SetupMinecraft -class StorageRepositoryImplTest { - StorageRepositoryImpl sut; - - @BeforeEach - void setUp() { - sut = new StorageRepositoryImpl(PlatformTestFixtures.STORAGE_TYPE_REGISTRY); - } - - private PlatformStorage createSerializableStorage(final Storage storage) { - if (storage instanceof LimitedStorageImpl limitedStorage) { - return new LimitedPlatformStorage( - limitedStorage, - StorageTypes.ITEM, - new InMemoryTrackedStorageRepository(), - () -> { - } - ); - } - return new PlatformStorage( - storage, - StorageTypes.ITEM, - new InMemoryTrackedStorageRepository(), - () -> { - } - ); - } - - @Test - void testInitialState() { - // Assert - assertThat(sut.isDirty()).isFalse(); - } - - @Test - void shouldNotRetrieveNonExistentStorage() { - // Assert - assertThat(sut.get(UUID.randomUUID())).isEmpty(); - } - - @Test - void shouldBeAbleToSetAndRetrieveStorage() { - // Arrange - final UUID id = UUID.randomUUID(); - final Storage storage = createSerializableStorage(new InMemoryStorageImpl()); - storage.insert(new ItemResource(Items.DIRT, null), 10, Action.EXECUTE, EmptyActor.INSTANCE); - - // Act - sut.set(id, storage); - - // Assert - assertThat(sut.get(id)).containsSame(storage); - assertThat(sut.isDirty()).isTrue(); - assertThat(sut.getInfo(id)).usingRecursiveComparison().isEqualTo(new StorageInfo(10, 0)); - } - - @Test - void shouldNotBeAbleToSetStorageWithExistingId() { - // Arrange - final UUID id = UUID.randomUUID(); - sut.set(id, createSerializableStorage(new InMemoryStorageImpl())); - - // Act - final Executable action = () -> sut.set(id, createSerializableStorage(new InMemoryStorageImpl())); - - // Assert - assertThrows(IllegalArgumentException.class, action); - } - - @Test - void shouldNotBeAbleToSetUnserializableStorage() { - // Arrange - final UUID id = UUID.randomUUID(); - final InMemoryStorageImpl storage = new InMemoryStorageImpl(); - - // Act & assert - assertThrows(IllegalArgumentException.class, () -> sut.set(id, storage)); - } - - @Test - @SuppressWarnings("ConstantConditions") - void shouldNotBeAbleToSetWithInvalidId() { - // Arrange - final Storage storage = createSerializableStorage(new InMemoryStorageImpl()); - - // Act & assert - assertThrows(NullPointerException.class, () -> sut.set(null, storage)); - } - - @Test - @SuppressWarnings("ConstantConditions") - void shouldNotBeAbleToSetWithInvalidStorage() { - // Arrange - final UUID id = UUID.randomUUID(); - - // Act & assert - assertThrows(NullPointerException.class, () -> sut.set(id, null)); - } - - @Test - void shouldRemoveIfEmpty() { - // Arrange - final UUID id = UUID.randomUUID(); - final Storage storage = createSerializableStorage(new InMemoryStorageImpl()); - sut.set(id, storage); - sut.setDirty(false); - - // Act - final Optional result = sut.removeIfEmpty(id); - - // Assert - assertThat(result).get().isEqualTo(storage); - assertThat(sut.isDirty()).isTrue(); - assertThat(sut.get(id)).isEmpty(); - } - - @Test - void shouldNotRemoveIfEmptyIfNotEmpty() { - // Arrange - final UUID id = UUID.randomUUID(); - final Storage storage = createSerializableStorage(new InMemoryStorageImpl()); - storage.insert(new ItemResource(Items.DIRT, null), 10, Action.EXECUTE, EmptyActor.INSTANCE); - sut.set(id, storage); - sut.setDirty(false); - - // Act - final Optional result = sut.removeIfEmpty(id); - - // Assert - assertThat(result).isEmpty(); - assertThat(sut.isDirty()).isFalse(); - assertThat(sut.get(id)).isPresent(); - } - - @Test - void shouldNotRemoveIfEmptyIfNotExists() { - // Act - final Optional disassembled = sut.removeIfEmpty(UUID.randomUUID()); - - // Assert - assertThat(disassembled).isEmpty(); - assertThat(sut.isDirty()).isFalse(); - } - - @Test - void shouldBeDirtyWhenMarkedAsChanged() { - // Act - sut.markAsChanged(); - - // Assert - assertThat(sut.isDirty()).isTrue(); - } - - @Test - void shouldRetrieveInfoFromLimitedStorage() { - // Arrange - final UUID id = UUID.randomUUID(); - final Storage storage = createSerializableStorage(new LimitedStorageImpl(10)); - storage.insert(new ItemResource(Items.DIRT, null), 5, Action.EXECUTE, EmptyActor.INSTANCE); - - // Act - sut.set(id, storage); - - // Assert - final StorageInfo info = sut.getInfo(id); - - assertThat(info.capacity()).isEqualTo(10); - assertThat(info.stored()).isEqualTo(5); - } - - @Test - void shouldRetrieveInfoFromRegularStorage() { - // Arrange - final UUID id = UUID.randomUUID(); - final Storage storage = createSerializableStorage(new InMemoryStorageImpl()); - storage.insert(new ItemResource(Items.DIRT, null), 5, Action.EXECUTE, EmptyActor.INSTANCE); - - // Act - sut.set(id, storage); - - // Assert - final StorageInfo info = sut.getInfo(id); - - assertThat(info.capacity()).isZero(); - assertThat(info.stored()).isEqualTo(5); - } - - @Test - void shouldRetrieveInfoFromNonExistentStorage() { - // Act - final StorageInfo info = sut.getInfo(UUID.randomUUID()); - - // Assert - assertThat(info.capacity()).isZero(); - assertThat(info.stored()).isZero(); - } - - @Test - void shouldSerializeAndDeserialize() { - // Arrange - final InMemoryTrackedStorageRepository repository = new InMemoryTrackedStorageRepository(); - final PlatformStorage a = new PlatformStorage( - new TrackedStorageImpl(new InMemoryStorageImpl(), repository, () -> 123L), - StorageTypes.ITEM, - repository, - sut::markAsChanged - ); - final PlatformStorage b = new LimitedPlatformStorage( - new LimitedStorageImpl(new InMemoryStorageImpl(), 100), - StorageTypes.ITEM, - new InMemoryTrackedStorageRepository(), - sut::markAsChanged - ); - - final UUID aId = UUID.randomUUID(); - final UUID bId = UUID.randomUUID(); - - sut.set(aId, a); - sut.set(bId, b); - - a.insert(new ItemResource(Items.DIRT, createDummyTag()), 10, Action.EXECUTE, new PlayerActor("A")); - b.insert(new ItemResource(Items.GLASS, null), 20, Action.EXECUTE, EmptyActor.INSTANCE); - - // Act - final CompoundTag serialized = sut.save(new CompoundTag()); - sut = new StorageRepositoryImpl(PlatformTestFixtures.STORAGE_TYPE_REGISTRY); - sut.read(serialized); - - // Assert - assertThat(sut.isDirty()).isFalse(); - assertThat(sut.get(aId)).isPresent(); - assertThat(sut.get(bId)).isPresent(); - assertThat(sut.get(aId)) - .get() - .isInstanceOf(PlatformStorage.class); - assertThat(sut.get(aId).get().getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new ResourceAmount(new ItemResource(Items.DIRT, createDummyTag()), 10) - ); - assertThat(((TrackedStorage) sut.get(aId).get()).findTrackedResourceByActorType( - new ItemResource(Items.DIRT, createDummyTag()), PlayerActor.class)) - .get() - .usingRecursiveComparison() - .isEqualTo(new TrackedResource("A", 123L)); - assertThat(sut.get(bId)).get().isInstanceOf(LimitedPlatformStorage.class); - assertThat(((LimitedPlatformStorage) sut.get(bId).get()).getCapacity()).isEqualTo(100); - assertThat(sut.get(bId).get().getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new ResourceAmount(new ItemResource(Items.GLASS, null), 20) - ); - } -} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImplTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImplTest.java index fe2acd6c9..6ad212381 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImplTest.java +++ b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImplTest.java @@ -12,9 +12,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; class PlatformRegistryImplTest { - private static final ResourceLocation A = new ResourceLocation("a"); - private static final ResourceLocation B = new ResourceLocation("b"); - private static final ResourceLocation C = new ResourceLocation("c"); + private static final ResourceLocation A = ResourceLocation.parse("a"); + private static final ResourceLocation B = ResourceLocation.parse("b"); + private static final ResourceLocation C = ResourceLocation.parse("c"); PlatformRegistry sut; diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceTest.java deleted file mode 100644 index 1df545f93..000000000 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceTest.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.test.SetupMinecraft; - -import java.util.Optional; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.Fluids; -import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; - -@SetupMinecraft -class FluidResourceTest { - @SuppressWarnings("ConstantConditions") - @Test - void testInvalidFluid() { - // Assert - assertThrows(NullPointerException.class, () -> new FluidResource(null, null)); - } - - @ParameterizedTest - @ValueSource(booleans = {true, false}) - void testSerialization(final boolean hasTag) { - // Arrange - final CompoundTag fluidTag = hasTag ? createDummyTag() : null; - final FluidResource fluidResource = new FluidResource(Fluids.WATER, fluidTag); - - // Act - final CompoundTag serialized = fluidResource.toTag(); - final Optional deserialized = FluidResource.fromTag(serialized); - - // Assert - assertThat(deserialized).isPresent().contains(fluidResource); - } - - @Test - void testDeserializationWithInvalidFluid() { - // Arrange - final FluidResource fluidResource = new FluidResource(Fluids.WATER, null); - final CompoundTag serialized = fluidResource.toTag(); - serialized.putString("id", "minecraft:non_existent"); - - // Act - final Optional deserialized = FluidResource.fromTag(serialized); - - // Assert - assertThat(deserialized).isEmpty(); - } - - @ParameterizedTest - @ValueSource(booleans = {true, false}) - void testNormalization(final boolean hasTag) { - // Arrange - final CompoundTag fluidTag = hasTag ? createDummyTag() : null; - final FluidResource fluidResource = new FluidResource(Fluids.WATER, fluidTag); - - // Act - final ResourceKey normalized = fluidResource.normalize(); - - // Assert - assertThat(normalized).usingRecursiveComparison().isEqualTo(new FluidResource(Fluids.WATER, null)); - } - - @Test - void testEqualsHashcode() { - // Assert - EqualsVerifier.forClass(FluidResource.class) - .withPrefabValues(Fluid.class, Fluids.WATER, Fluids.LAVA) - .withNonnullFields("fluid") - .verify(); - } - - private CompoundTag createDummyTag() { - final CompoundTag fluidTag = new CompoundTag(); - fluidTag.putString("dummy", "test"); - return fluidTag; - } -} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceTest.java deleted file mode 100644 index 0d95f19a5..000000000 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceTest.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.test.SetupMinecraft; - -import java.util.Optional; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - -import static com.refinedmods.refinedstorage2.platform.test.TagHelper.createDummyTag; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; - -@SetupMinecraft -class ItemResourceTest { - @Test - @SuppressWarnings("ConstantConditions") - void testInvalidItem() { - // Assert - assertThrows(NullPointerException.class, () -> new ItemResource(null, null)); - } - - @ParameterizedTest - @ValueSource(booleans = {true, false}) - void testSerialization(final boolean hasTag) { - // Arrange - final CompoundTag itemTag = hasTag ? createDummyTag() : null; - final ItemResource itemResource = new ItemResource(Items.DIRT, itemTag); - - // Act - final CompoundTag serialized = itemResource.toTag(); - final Optional deserialized = ItemResource.fromTag(serialized); - - // Assert - assertThat(deserialized).isPresent().contains(itemResource); - } - - @Test - void testDeserializationWithInvalidItem() { - // Arrange - final ItemResource itemResource = new ItemResource(Items.DIRT, null); - final CompoundTag serialized = itemResource.toTag(); - serialized.putString("id", "minecraft:non_existent"); - - // Act - final Optional deserialized = ItemResource.fromTag(serialized); - - // Assert - assertThat(deserialized).isEmpty(); - } - - @ParameterizedTest - @ValueSource(booleans = {true, false}) - void testToPlatformStack(final boolean hasTag) { - // Arrange - final CompoundTag itemTag = hasTag ? createDummyTag() : null; - final ItemResource itemResource = new ItemResource(Items.DIRT, itemTag); - - // Act - final ItemStack stack = itemResource.toItemStack(); - - // Assert - assertThat(stack.getItem()).isEqualTo(Items.DIRT); - assertThat(stack.getTag()).isEqualTo(itemTag); - assertThat(stack.getCount()).isEqualTo(1); - } - - @ParameterizedTest - @ValueSource(booleans = {true, false}) - void testNormalization(final boolean hasTag) { - // Arrange - final CompoundTag itemTag = hasTag ? createDummyTag() : null; - final ItemResource itemResource = new ItemResource(Items.DIRT, itemTag); - - // Act - final ResourceKey normalized = itemResource.normalize(); - - // Assert - assertThat(normalized).usingRecursiveComparison().isEqualTo(new ItemResource(Items.DIRT, null)); - } - - @Test - void testEqualsHashcode() { - // Assert - EqualsVerifier.forClass(ItemResource.class) - .withPrefabValues(Item.class, Items.DIRT, Items.GLASS) - .withNonnullFields("item") - .verify(); - } -} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java index 77b523331..c2821c349 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java +++ b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java @@ -9,20 +9,24 @@ import java.util.Collection; import java.util.Optional; +import net.minecraft.core.component.DataComponentPatch; +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Items; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.platform.test.TagHelper.createDummyTag; import static org.assertj.core.api.Assertions.assertThat; @SetupMinecraft class FuzzyResourceListImplTest { - private static final ItemResource DUMMY_A = new ItemResource(Items.DIRT, null); - private static final ItemResource DUMMY_B = new ItemResource(Items.DIRT, createDummyTag("b")); - private static final ItemResource DUMMY_C = new ItemResource(Items.DIRT, createDummyTag("c")); - private static final ItemResource DUMMY_D = new ItemResource(Items.GLASS, null); - private static final ItemResource DUMMY_E = new ItemResource(Items.DARK_OAK_DOOR, null); + private static final ItemResource DUMMY_A = new ItemResource(Items.DIRT, DataComponentPatch.EMPTY); + private static final ItemResource DUMMY_B = new ItemResource(Items.DIRT, DataComponentPatch.builder() + .set(DataComponents.BASE_COLOR, DyeColor.RED).build()); + private static final ItemResource DUMMY_C = new ItemResource(Items.DIRT, DataComponentPatch.builder() + .set(DataComponents.BASE_COLOR, DyeColor.GREEN).build()); + private static final ItemResource DUMMY_D = new ItemResource(Items.GLASS, DataComponentPatch.EMPTY); + private static final ItemResource DUMMY_E = new ItemResource(Items.DARK_OAK_DOOR, DataComponentPatch.EMPTY); FuzzyResourceList sut; diff --git a/refinedstorage2-platform-fabric/build.gradle b/refinedstorage2-platform-fabric/build.gradle index 8fa1fb117..c26d8b907 100644 --- a/refinedstorage2-platform-fabric/build.gradle +++ b/refinedstorage2-platform-fabric/build.gradle @@ -9,10 +9,6 @@ repositories { name = 'Cloth Config' url 'https://maven.shedaniel.me/' } - maven { - name = 'NoIndium' - url = 'https://maven.cafeteria.dev/releases/' - } } fabricProject("refinedstorage2", project(":refinedstorage2-platform-common"), apis, compileApis) @@ -28,10 +24,8 @@ dependencies { } include libs.teamreborn.energy - modApi "me.luligabi:NoIndium:${noIndiumVersion}" - include "me.luligabi:NoIndium:${noIndiumVersion}" - modApi libs.modmenu } enablePublishing() + diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java index c6ba35785..cb9f4ef45 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java @@ -16,7 +16,16 @@ import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardItemPropertyFunction; import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntityRenderer; import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.EnergyInfoPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridActivePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridClearPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridUpdatePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NoPermissionPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.StorageInfoResponsePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; import com.refinedmods.refinedstorage2.platform.common.support.tooltip.CompositeClientTooltipComponent; import com.refinedmods.refinedstorage2.platform.common.support.tooltip.HelpClientTooltipComponent; import com.refinedmods.refinedstorage2.platform.common.support.tooltip.ResourceClientTooltipComponent; @@ -24,15 +33,6 @@ import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinationClientTooltipComponent; import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; import com.refinedmods.refinedstorage2.platform.fabric.mixin.ItemPropertiesAccessor; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.EnergyInfoPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.GridActivePacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.GridClearPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.GridUpdatePacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.NetworkTransmitterStatusPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.NoPermissionPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.ResourceSlotUpdatePacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.StorageInfoResponsePacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.WirelessTransmitterRangePacket; import com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive.DiskDriveBlockEntityRendererImpl; import com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive.DiskDriveUnbakedModel; import com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface.DiskInterfaceBlockEntityRendererImpl; @@ -60,6 +60,7 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; import net.minecraft.client.renderer.item.ItemProperties; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; @@ -71,11 +72,14 @@ import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslationKey; public class ClientModInitializerImpl extends AbstractClientModInitializer implements ClientModInitializer { + private static final String BLOCK_PREFIX = "block"; + private static final String ITEM_PREFIX = "item"; + @Override public void onInitializeClient() { setRenderLayers(); registerEmissiveModels(); - registerPackets(); + registerPacketHandlers(); registerBlockEntityRenderers(); registerCustomModels(); registerCustomTooltips(); @@ -126,40 +130,18 @@ private void setCutout(final Block block) { } private void registerEmissiveModels() { - Blocks.INSTANCE.getController().forEach((color, id, block) -> { - registerEmissiveControllerModels(color); - registerEmissiveControllerItemModels(color, id); - }); - Blocks.INSTANCE.getCreativeController().forEach( - (color, id, block) -> registerEmissiveControllerItemModels(color, id) - ); - Blocks.INSTANCE.getGrid().forEach( - (color, id, block) -> registerEmissiveGridModels(color, id) - ); - Blocks.INSTANCE.getCraftingGrid().forEach( - (color, id, block) -> registerEmissiveCraftingGridModels(color, id) - ); - Blocks.INSTANCE.getDetector().forEach( - (color, id, block) -> registerEmissiveDetectorModels(color, id) - ); - Blocks.INSTANCE.getConstructor().forEach( - (color, id, block) -> registerEmissiveConstructorModels(color, id) - ); - Blocks.INSTANCE.getDestructor().forEach( - (color, id, block) -> registerEmissiveDestructorModels(color, id) - ); - Blocks.INSTANCE.getWirelessTransmitter().forEach( - (color, id, block) -> registerEmissiveWirelessTransmitterModels(color, id) - ); - Blocks.INSTANCE.getNetworkReceiver().forEach( - (color, id, block) -> registerEmissiveNetworkReceiverModels(color, id) - ); + registerColoredEmissiveModels(Blocks.INSTANCE.getController(), "controller"); + registerColoredEmissiveModels(Blocks.INSTANCE.getCreativeController(), "controller"); + registerColoredEmissiveModels(Blocks.INSTANCE.getGrid(), "grid"); + registerColoredEmissiveModels(Blocks.INSTANCE.getCraftingGrid(), "crafting_grid"); + registerColoredEmissiveModels(Blocks.INSTANCE.getDetector(), "detector"); + registerConstructorDestructorEmissiveModels(Blocks.INSTANCE.getConstructor(), "constructor"); + registerConstructorDestructorEmissiveModels(Blocks.INSTANCE.getDestructor(), "destructor"); + registerColoredEmissiveModels(Blocks.INSTANCE.getWirelessTransmitter(), "wireless_transmitter"); + registerColoredEmissiveModels(Blocks.INSTANCE.getNetworkReceiver(), "network_receiver"); Blocks.INSTANCE.getNetworkTransmitter().forEach( (color, id, block) -> registerEmissiveNetworkTransmitterModels(color, id) ); - Blocks.INSTANCE.getGrid().forEach( - (color, id, block) -> registerEmissiveGridModels(color, id) - ); Blocks.INSTANCE.getSecurityManager().forEach( (color, id, block) -> registerEmissiveSecurityManagerModels(color, id) ); @@ -168,165 +150,124 @@ private void registerEmissiveModels() { ); } - private void registerEmissiveControllerModels(final DyeColor color) { - final ResourceLocation spriteLocation = createIdentifier("block/controller/cutouts/" + color.getName()); - // Block - EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/controller/" + color.getName()), - spriteLocation - ); - } - - private void registerEmissiveControllerItemModels(final DyeColor color, final ResourceLocation id) { - final ResourceLocation spriteLocation = createIdentifier("block/controller/cutouts/" + color.getName()); - EmissiveModelRegistry.INSTANCE.register(id, spriteLocation); - } - - private void registerEmissiveGridModels(final DyeColor color, final ResourceLocation id) { - // Block - EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/grid/" + color.getName()), - createIdentifier("block/grid/cutouts/" + color.getName()) - ); - // Item - EmissiveModelRegistry.INSTANCE.register(id, createIdentifier("block/grid/cutouts/" + color.getName())); + private void registerColoredEmissiveModels(final BlockColorMap blockMap, + final String blockDirectory) { + blockMap.forEach((color, id, block) -> { + final ResourceLocation blockModelLocation = createIdentifier( + BLOCK_PREFIX + "/" + blockDirectory + "/" + color.getName() + ); + final ResourceLocation spriteLocation = createIdentifier( + BLOCK_PREFIX + "/" + blockDirectory + "/cutouts/" + color.getName() + ); + EmissiveModelRegistry.INSTANCE.register(blockModelLocation, spriteLocation); + EmissiveModelRegistry.INSTANCE.register(id.withPath(ITEM_PREFIX + "/" + id.getPath()), spriteLocation); + }); } - private void registerEmissiveCraftingGridModels(final DyeColor color, final ResourceLocation id) { - // Block - EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/crafting_grid/" + color.getName()), - createIdentifier("block/crafting_grid/cutouts/" + color.getName()) - ); - // Item - EmissiveModelRegistry.INSTANCE.register(id, createIdentifier("block/crafting_grid/cutouts/" + color.getName())); + private void registerConstructorDestructorEmissiveModels(final BlockColorMap blockMap, + final String blockDirectory) { + blockMap.forEach((color, id, block) -> { + final ResourceLocation blockModelLocation = createIdentifier( + BLOCK_PREFIX + "/" + blockDirectory + "/active" + ); + final ResourceLocation spriteLocation = createIdentifier( + BLOCK_PREFIX + "/" + blockDirectory + "/cutouts/active" + ); + EmissiveModelRegistry.INSTANCE.register(blockModelLocation, spriteLocation); + EmissiveModelRegistry.INSTANCE.register(createIdentifier(ITEM_PREFIX + "/" + id.getPath()), spriteLocation); + }); } - private void registerEmissiveDetectorModels(final DyeColor color, final ResourceLocation id) { - // Block + private void registerEmissiveNetworkTransmitterModels(final DyeColor color, final ResourceLocation id) { EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/detector/" + color.getName()), - createIdentifier("block/detector/cutouts/" + color.getName()) + createIdentifier(BLOCK_PREFIX + "/network_transmitter/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/network_transmitter/cutouts/" + color.getName()) ); - // Item - EmissiveModelRegistry.INSTANCE.register(id, createIdentifier("block/detector/cutouts/" + color.getName())); - } - - private void registerEmissiveConstructorModels(final DyeColor color, final ResourceLocation id) { - // Block EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/constructor/" + color.getName()), - createIdentifier("block/constructor/cutouts/active") + createIdentifier(BLOCK_PREFIX + "/network_transmitter/error"), + createIdentifier(BLOCK_PREFIX + "/network_transmitter/cutouts/error") ); - // Item - EmissiveModelRegistry.INSTANCE.register(id, createIdentifier("block/constructor/cutouts/active")); - } - - private void registerEmissiveDestructorModels(final DyeColor color, final ResourceLocation id) { - // Block EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/destructor/" + color.getName()), - createIdentifier("block/destructor/cutouts/active") + createIdentifier(ITEM_PREFIX + "/" + id.getPath()), + createIdentifier(BLOCK_PREFIX + "/network_transmitter/cutouts/" + color.getName()) ); - // Item - EmissiveModelRegistry.INSTANCE.register(id, createIdentifier("block/destructor/cutouts/active")); } - private void registerEmissiveWirelessTransmitterModels(final DyeColor color, final ResourceLocation id) { - // Block + private void registerEmissiveSecurityManagerModels(final DyeColor color, final ResourceLocation id) { EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/wireless_transmitter/" + color.getName()), - createIdentifier("block/wireless_transmitter/cutouts/" + color.getName()) + createIdentifier(BLOCK_PREFIX + "/security_manager/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/back/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/front/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/left/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/right/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/top/" + color.getName()) ); - // Item EmissiveModelRegistry.INSTANCE.register( - id, - createIdentifier("block/wireless_transmitter/cutouts/" + color.getName()) + createIdentifier(ITEM_PREFIX + "/" + id.getPath()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/back/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/front/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/left/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/right/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/security_manager/cutouts/top/" + color.getName()) ); } - private void registerEmissiveNetworkReceiverModels(final DyeColor color, final ResourceLocation id) { - // Block + private void registerEmissiveRelayModels(final DyeColor color, final ResourceLocation id) { EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/network_receiver/" + color.getName()), - createIdentifier("block/network_receiver/cutouts/" + color.getName()) + createIdentifier(BLOCK_PREFIX + "/relay/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/relay/cutouts/in/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/relay/cutouts/out/" + color.getName()) ); - // Item EmissiveModelRegistry.INSTANCE.register( - id, - createIdentifier("block/network_receiver/cutouts/" + color.getName()) + createIdentifier(ITEM_PREFIX + "/" + id.getPath()), + createIdentifier(BLOCK_PREFIX + "/relay/cutouts/in/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/relay/cutouts/out/" + color.getName()) ); } - private void registerEmissiveNetworkTransmitterModels(final DyeColor color, final ResourceLocation id) { - // Block - EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/network_transmitter/" + color.getName()), - createIdentifier("block/network_transmitter/cutouts/" + color.getName()) + private void registerPacketHandlers() { + ClientPlayNetworking.registerGlobalReceiver( + StorageInfoResponsePacket.PACKET_TYPE, + wrapHandler((packet, ctx) -> StorageInfoResponsePacket.handle(packet)) ); - EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/network_transmitter/error"), - createIdentifier("block/network_transmitter/cutouts/error") + ClientPlayNetworking.registerGlobalReceiver( + GridUpdatePacket.PACKET_TYPE, + wrapHandler(GridUpdatePacket::handle) ); - // Item - EmissiveModelRegistry.INSTANCE.register( - id, - createIdentifier("block/network_transmitter/cutouts/" + color.getName()) + ClientPlayNetworking.registerGlobalReceiver( + GridClearPacket.PACKET_TYPE, + wrapHandler((packet, ctx) -> GridClearPacket.handle(ctx)) ); - } - - private void registerEmissiveSecurityManagerModels(final DyeColor color, final ResourceLocation id) { - // Block - EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/security_manager/" + color.getName()), - createIdentifier("block/security_manager/cutouts/back/" + color.getName()), - createIdentifier("block/security_manager/cutouts/front/" + color.getName()), - createIdentifier("block/security_manager/cutouts/left/" + color.getName()), - createIdentifier("block/security_manager/cutouts/right/" + color.getName()), - createIdentifier("block/security_manager/cutouts/top/" + color.getName()) + ClientPlayNetworking.registerGlobalReceiver( + GridActivePacket.PACKET_TYPE, + wrapHandler(GridActivePacket::handle) ); - // Item - EmissiveModelRegistry.INSTANCE.register( - id, - createIdentifier("block/security_manager/cutouts/back/" + color.getName()), - createIdentifier("block/security_manager/cutouts/front/" + color.getName()), - createIdentifier("block/security_manager/cutouts/left/" + color.getName()), - createIdentifier("block/security_manager/cutouts/right/" + color.getName()), - createIdentifier("block/security_manager/cutouts/top/" + color.getName()) + ClientPlayNetworking.registerGlobalReceiver( + EnergyInfoPacket.PACKET_TYPE, + wrapHandler(EnergyInfoPacket::handle) ); - } - - private void registerEmissiveRelayModels(final DyeColor color, final ResourceLocation id) { - // Block - EmissiveModelRegistry.INSTANCE.register( - createIdentifier("block/relay/" + color.getName()), - createIdentifier("block/relay/cutouts/in/" + color.getName()), - createIdentifier("block/relay/cutouts/out/" + color.getName()) + ClientPlayNetworking.registerGlobalReceiver( + WirelessTransmitterRangePacket.PACKET_TYPE, + wrapHandler(WirelessTransmitterRangePacket::handle) ); - // Item - EmissiveModelRegistry.INSTANCE.register( - id, - createIdentifier("block/relay/cutouts/in/" + color.getName()), - createIdentifier("block/relay/cutouts/out/" + color.getName()) + ClientPlayNetworking.registerGlobalReceiver( + ResourceSlotUpdatePacket.PACKET_TYPE, + wrapHandler(ResourceSlotUpdatePacket::handle) ); - } - - private void registerPackets() { - ClientPlayNetworking.registerGlobalReceiver(PacketIds.STORAGE_INFO_RESPONSE, new StorageInfoResponsePacket()); - ClientPlayNetworking.registerGlobalReceiver(PacketIds.GRID_UPDATE, new GridUpdatePacket()); - ClientPlayNetworking.registerGlobalReceiver(PacketIds.GRID_CLEAR, new GridClearPacket()); - ClientPlayNetworking.registerGlobalReceiver(PacketIds.GRID_ACTIVE, new GridActivePacket()); - ClientPlayNetworking.registerGlobalReceiver(PacketIds.ENERGY_INFO, new EnergyInfoPacket()); ClientPlayNetworking.registerGlobalReceiver( - PacketIds.WIRELESS_TRANSMITTER_RANGE, - new WirelessTransmitterRangePacket() + NetworkTransmitterStatusPacket.PACKET_TYPE, + wrapHandler(NetworkTransmitterStatusPacket::handle) ); - ClientPlayNetworking.registerGlobalReceiver(PacketIds.RESOURCE_SLOT_UPDATE, new ResourceSlotUpdatePacket()); ClientPlayNetworking.registerGlobalReceiver( - PacketIds.NETWORK_TRANSMITTER_STATUS, - new NetworkTransmitterStatusPacket() + NoPermissionPacket.PACKET_TYPE, + wrapHandler((packet, ctx) -> NoPermissionPacket.handle(packet)) ); - ClientPlayNetworking.registerGlobalReceiver(PacketIds.NO_PERMISSION, new NoPermissionPacket()); + } + + private static ClientPlayNetworking.PlayPayloadHandler wrapHandler( + final PacketHandler handler + ) { + return (packet, ctx) -> handler.handle(packet, ctx::player); } private void registerBlockEntityRenderers() { @@ -366,21 +307,21 @@ private void registerCustomDiskInterfaceModels(final ModelLoadingPlugin.Context final QuadRotators quadRotators) { pluginContext.resolveModel().register(context -> { if (context.id().getNamespace().equals(IdentifierUtil.MOD_ID) - && context.id().getPath().startsWith("item/") + && context.id().getPath().startsWith(ITEM_PREFIX + "/") && context.id().getPath().endsWith("disk_interface")) { final boolean isDefault = !context.id().getPath().endsWith("_disk_interface"); final DyeColor color = isDefault ? Blocks.INSTANCE.getDiskInterface().getDefault().getColor() : DyeColor.byName(context.id().getPath().replace("_disk_interface", "") - .replace("item/", ""), Blocks.INSTANCE.getDiskInterface().getDefault().getColor()); + .replace(ITEM_PREFIX + "/", ""), Blocks.INSTANCE.getDiskInterface().getDefault().getColor()); return new DiskInterfaceUnbakedModel(quadRotators, color); } if (context.id().getNamespace().equals(IdentifierUtil.MOD_ID) - && context.id().getPath().startsWith("block/disk_interface/") - && !context.id().getPath().startsWith("block/disk_interface/base_") - && !context.id().getPath().equals("block/disk_interface/inactive")) { + && context.id().getPath().startsWith(BLOCK_PREFIX + "/disk_interface/") + && !context.id().getPath().startsWith(BLOCK_PREFIX + "/disk_interface/base_") + && !context.id().getPath().equals(BLOCK_PREFIX + "/disk_interface/inactive")) { final DyeColor color = DyeColor.byName( - context.id().getPath().replace("block/disk_interface/", ""), + context.id().getPath().replace(BLOCK_PREFIX + "/disk_interface/", ""), Blocks.INSTANCE.getDiskInterface().getDefault().getColor() ); return new DiskInterfaceUnbakedModel(quadRotators, color); @@ -391,10 +332,14 @@ private void registerCustomDiskInterfaceModels(final ModelLoadingPlugin.Context private void registerCustomPortableGridModels(final ModelLoadingPlugin.Context pluginContext, final QuadRotators quadRotators) { - final ResourceLocation portableGridIdentifier = createIdentifier("block/portable_grid"); - final ResourceLocation portableGridIdentifierItem = createIdentifier("item/portable_grid"); - final ResourceLocation creativePortableGridIdentifier = createIdentifier("block/creative_portable_grid"); - final ResourceLocation creativePortableGridIdentifierItem = createIdentifier("item/creative_portable_grid"); + final ResourceLocation portableGridIdentifier = createIdentifier(BLOCK_PREFIX + "/portable_grid"); + final ResourceLocation portableGridIdentifierItem = createIdentifier(ITEM_PREFIX + "/portable_grid"); + final ResourceLocation creativePortableGridIdentifier = createIdentifier( + BLOCK_PREFIX + "/creative_portable_grid" + ); + final ResourceLocation creativePortableGridIdentifierItem = createIdentifier( + ITEM_PREFIX + "/creative_portable_grid" + ); pluginContext.resolveModel().register(context -> { if (context.id().equals(portableGridIdentifier) || context.id().equals(portableGridIdentifierItem) @@ -408,8 +353,8 @@ private void registerCustomPortableGridModels(final ModelLoadingPlugin.Context p private void registerCustomDiskDriveModels(final ModelLoadingPlugin.Context pluginContext, final QuadRotators quadRotators) { - final ResourceLocation diskDriveIdentifier = createIdentifier("block/disk_drive"); - final ResourceLocation diskDriveIdentifierItem = createIdentifier("item/disk_drive"); + final ResourceLocation diskDriveIdentifier = createIdentifier(BLOCK_PREFIX + "/disk_drive"); + final ResourceLocation diskDriveIdentifierItem = createIdentifier(ITEM_PREFIX + "/disk_drive"); pluginContext.resolveModel().register(context -> { if (context.id().equals(diskDriveIdentifier) || context.id().equals(diskDriveIdentifierItem)) { return new DiskDriveUnbakedModel(quadRotators); diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java index d08e39e19..01eb51949 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java @@ -331,7 +331,7 @@ public Optional getSynchronizer() { if (synchronizer == null || synchronizer.trim().isBlank()) { return Optional.empty(); } - return Optional.of(synchronizer).map(ResourceLocation::new); + return Optional.of(synchronizer).map(ResourceLocation::tryParse); } @Override @@ -373,7 +373,7 @@ public Optional getResourceTypeId() { if (resourceTypeId == null || resourceTypeId.trim().isBlank()) { return Optional.empty(); } - return Optional.of(resourceTypeId).map(ResourceLocation::new); + return Optional.of(resourceTypeId).map(ResourceLocation::tryParse); } @Override diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java index 0a832563e..32191e1e6 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java @@ -10,6 +10,7 @@ import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; import com.refinedmods.refinedstorage2.platform.common.content.CreativeModeTabItems; import com.refinedmods.refinedstorage2.platform.common.content.DirectRegistryCallback; +import com.refinedmods.refinedstorage2.platform.common.content.ExtendedMenuTypeFactory; import com.refinedmods.refinedstorage2.platform.common.content.Items; import com.refinedmods.refinedstorage2.platform.common.content.MenuTypeFactory; import com.refinedmods.refinedstorage2.platform.common.content.RegistryCallback; @@ -23,7 +24,31 @@ import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItem; import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType; import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.CraftingGridClearPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.CraftingGridRecipeTransferPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridExtractPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridInsertPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridScrollPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.PropertyChangePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceFilterSlotChangePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceSlotAmountChangePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceSlotChangePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardBoundPlayerPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardPermissionPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardResetPermissionPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SingleAmountChangePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.StorageInfoRequestPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.UseNetworkBoundItemPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.EnergyInfoPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridActivePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridClearPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridUpdatePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NoPermissionPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.StorageInfoResponsePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeItem; @@ -34,21 +59,6 @@ import com.refinedmods.refinedstorage2.platform.fabric.grid.strategy.ItemGridExtractionStrategy; import com.refinedmods.refinedstorage2.platform.fabric.grid.strategy.ItemGridScrollingStrategy; import com.refinedmods.refinedstorage2.platform.fabric.importer.FabricStorageImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.CraftingGridClearPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.CraftingGridRecipeTransferPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.GridExtractPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.GridInsertPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.GridScrollPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.PropertyChangePacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.ResourceFilterSlotChangePacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.ResourceSlotAmountChangePacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.ResourceSlotChangePacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.SecurityCardBoundPlayerPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.SecurityCardPermissionPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.SecurityCardResetPermissionPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.SingleAmountChangePacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.StorageInfoRequestPacket; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.UseNetworkBoundItemPacket; import com.refinedmods.refinedstorage2.platform.fabric.security.NetworkNodeBreakSecurityEventListener; import com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive.FabricDiskDriveBlockEntity; import com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface.FabricDiskInterfaceBlockEntity; @@ -71,6 +81,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.fabricmc.fabric.api.event.player.UseBlockCallback; +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; @@ -84,10 +95,14 @@ import net.fabricmc.loader.api.FabricLoader; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.world.Container; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.CreativeModeTab; @@ -128,6 +143,7 @@ public void onInitialize() { registerExternalStorageProviderFactories(); registerContent(); registerPackets(); + registerPacketHandlers(); registerSounds(new DirectRegistryCallback<>(BuiltInRegistries.SOUND_EVENT)); registerRecipeSerializers(new DirectRegistryCallback<>(BuiltInRegistries.RECIPE_SERIALIZER)); registerSidedHandlers(); @@ -248,10 +264,18 @@ public BlockEntityType create(final BlockEntitySuppli registerMenus(new DirectRegistryCallback<>(BuiltInRegistries.MENU), new MenuTypeFactory() { @Override public MenuType create(final MenuSupplier supplier) { - return new ExtendedScreenHandlerType<>(supplier::create); + return new MenuType<>(supplier::create, FeatureFlags.DEFAULT_FLAGS); + } + }, new ExtendedMenuTypeFactory() { + @Override + public MenuType create(final MenuSupplier supplier, + final StreamCodec + streamCodec) { + return new ExtendedScreenHandlerType<>(supplier::create, streamCodec); } }); registerLootFunctions(new DirectRegistryCallback<>(BuiltInRegistries.LOOT_FUNCTION_TYPE)); + registerDataComponents(new DirectRegistryCallback<>(BuiltInRegistries.DATA_COMPONENT_TYPE)); } private void registerCustomItems(final RegistryCallback callback) { @@ -259,31 +283,31 @@ private void registerCustomItems(final RegistryCallback callback) { PlatformApi.INSTANCE.getUpgradeRegistry() ) { @Override - public boolean allowNbtUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } })); Items.INSTANCE.setWirelessGrid(callback.register(WIRELESS_GRID, () -> new WirelessGridItem() { @Override - public boolean allowNbtUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } })); Items.INSTANCE.setCreativeWirelessGrid(callback.register( CREATIVE_WIRELESS_GRID, () -> new WirelessGridItem() { @Override - public boolean allowNbtUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } } )); @@ -291,43 +315,43 @@ public boolean allowNbtUpdateAnimation(final Player player, Blocks.INSTANCE.getPortableGrid(), PortableGridType.NORMAL ) { @Override - public boolean allowNbtUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } })); Items.INSTANCE.setCreativePortableGrid(callback.register( CREATIVE_PORTABLE_GRID, () -> new PortableGridBlockItem(Blocks.INSTANCE.getCreativePortableGrid(), PortableGridType.CREATIVE) { @Override - public boolean allowNbtUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } } )); Items.INSTANCE.setSecurityCard(callback.register(SECURITY_CARD, () -> new SecurityCardItem() { @Override - public boolean allowNbtUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } })); Items.INSTANCE.setFallbackSecurityCard(callback.register( FALLBACK_SECURITY_CARD, () -> new FallbackSecurityCardItem() { @Override - public boolean allowNbtUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } } )); @@ -346,42 +370,155 @@ private void registerCreativeModeTab() { } private void registerPackets() { - ServerPlayNetworking.registerGlobalReceiver(PacketIds.STORAGE_INFO_REQUEST, new StorageInfoRequestPacket()); - ServerPlayNetworking.registerGlobalReceiver(PacketIds.GRID_INSERT, new GridInsertPacket()); - ServerPlayNetworking.registerGlobalReceiver(PacketIds.GRID_EXTRACT, new GridExtractPacket()); - ServerPlayNetworking.registerGlobalReceiver(PacketIds.GRID_SCROLL, new GridScrollPacket()); - ServerPlayNetworking.registerGlobalReceiver(PacketIds.CRAFTING_GRID_CLEAR, new CraftingGridClearPacket()); + registerServerToClientPackets(); + registerClientToServerPackets(); + } + + private void registerServerToClientPackets() { + PayloadTypeRegistry.playS2C().register(EnergyInfoPacket.PACKET_TYPE, EnergyInfoPacket.STREAM_CODEC); + PayloadTypeRegistry.playS2C().register( + WirelessTransmitterRangePacket.PACKET_TYPE, + WirelessTransmitterRangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playS2C().register(GridActivePacket.PACKET_TYPE, GridActivePacket.STREAM_CODEC); + PayloadTypeRegistry.playS2C().register(GridClearPacket.PACKET_TYPE, GridClearPacket.STREAM_CODEC); + PayloadTypeRegistry.playS2C().register(GridUpdatePacket.PACKET_TYPE, GridUpdatePacket.STREAM_CODEC); + PayloadTypeRegistry.playS2C().register( + NetworkTransmitterStatusPacket.PACKET_TYPE, + NetworkTransmitterStatusPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playS2C().register( + NoPermissionPacket.PACKET_TYPE, + NoPermissionPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playS2C().register( + ResourceSlotUpdatePacket.PACKET_TYPE, + ResourceSlotUpdatePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playS2C().register( + StorageInfoResponsePacket.PACKET_TYPE, + StorageInfoResponsePacket.STREAM_CODEC + ); + } + + private void registerClientToServerPackets() { + PayloadTypeRegistry.playC2S().register( + CraftingGridClearPacket.PACKET_TYPE, + CraftingGridClearPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + CraftingGridRecipeTransferPacket.PACKET_TYPE, + CraftingGridRecipeTransferPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register(GridExtractPacket.PACKET_TYPE, GridExtractPacket.STREAM_CODEC); + PayloadTypeRegistry.playC2S().register(GridInsertPacket.PACKET_TYPE, GridInsertPacket.STREAM_CODEC); + PayloadTypeRegistry.playC2S().register(GridScrollPacket.PACKET_TYPE, GridScrollPacket.STREAM_CODEC); + PayloadTypeRegistry.playC2S().register(PropertyChangePacket.PACKET_TYPE, PropertyChangePacket.STREAM_CODEC); + PayloadTypeRegistry.playC2S().register( + ResourceFilterSlotChangePacket.PACKET_TYPE, + ResourceFilterSlotChangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + ResourceSlotAmountChangePacket.PACKET_TYPE, + ResourceSlotAmountChangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + ResourceSlotChangePacket.PACKET_TYPE, + ResourceSlotChangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + SecurityCardBoundPlayerPacket.PACKET_TYPE, + SecurityCardBoundPlayerPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + SecurityCardPermissionPacket.PACKET_TYPE, + SecurityCardPermissionPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + SecurityCardResetPermissionPacket.PACKET_TYPE, + SecurityCardResetPermissionPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + SingleAmountChangePacket.PACKET_TYPE, + SingleAmountChangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + StorageInfoRequestPacket.PACKET_TYPE, + StorageInfoRequestPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + UseNetworkBoundItemPacket.PACKET_TYPE, + UseNetworkBoundItemPacket.STREAM_CODEC + ); + } + + private void registerPacketHandlers() { + ServerPlayNetworking.registerGlobalReceiver( + StorageInfoRequestPacket.PACKET_TYPE, + wrapHandler(StorageInfoRequestPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + GridInsertPacket.PACKET_TYPE, + wrapHandler(GridInsertPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + GridExtractPacket.PACKET_TYPE, + wrapHandler(GridExtractPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + GridScrollPacket.PACKET_TYPE, + wrapHandler(GridScrollPacket::handle) + ); ServerPlayNetworking.registerGlobalReceiver( - PacketIds.CRAFTING_GRID_RECIPE_TRANSFER, - new CraftingGridRecipeTransferPacket() + CraftingGridClearPacket.PACKET_TYPE, + wrapHandler(CraftingGridClearPacket::handle) ); - ServerPlayNetworking.registerGlobalReceiver(PacketIds.PROPERTY_CHANGE, new PropertyChangePacket()); ServerPlayNetworking.registerGlobalReceiver( - PacketIds.RESOURCE_SLOT_AMOUNT_CHANGE, - new ResourceSlotAmountChangePacket() + CraftingGridRecipeTransferPacket.PACKET_TYPE, + wrapHandler(CraftingGridRecipeTransferPacket::handle) ); ServerPlayNetworking.registerGlobalReceiver( - PacketIds.RESOURCE_FILTER_SLOT_CHANGE, - new ResourceFilterSlotChangePacket() + PropertyChangePacket.PACKET_TYPE, + wrapHandler(PropertyChangePacket::handle) ); ServerPlayNetworking.registerGlobalReceiver( - PacketIds.RESOURCE_SLOT_CHANGE, - new ResourceSlotChangePacket() + ResourceSlotAmountChangePacket.PACKET_TYPE, + wrapHandler(ResourceSlotAmountChangePacket::handle) ); - ServerPlayNetworking.registerGlobalReceiver(PacketIds.SINGLE_AMOUNT_CHANGE, new SingleAmountChangePacket()); - ServerPlayNetworking.registerGlobalReceiver(PacketIds.USE_NETWORK_BOUND_ITEM, new UseNetworkBoundItemPacket()); ServerPlayNetworking.registerGlobalReceiver( - PacketIds.SECURITY_CARD_PERMISSION, - new SecurityCardPermissionPacket() + ResourceFilterSlotChangePacket.PACKET_TYPE, + wrapHandler(ResourceFilterSlotChangePacket::handle) ); ServerPlayNetworking.registerGlobalReceiver( - PacketIds.SECURITY_CARD_RESET_PERMISSION, - new SecurityCardResetPermissionPacket() + ResourceSlotChangePacket.PACKET_TYPE, + wrapHandler(ResourceSlotChangePacket::handle) ); ServerPlayNetworking.registerGlobalReceiver( - PacketIds.SECURITY_CARD_BOUND_PLAYER, - new SecurityCardBoundPlayerPacket() + SingleAmountChangePacket.PACKET_TYPE, + wrapHandler(SingleAmountChangePacket::handle) ); + ServerPlayNetworking.registerGlobalReceiver( + UseNetworkBoundItemPacket.PACKET_TYPE, + wrapHandler(UseNetworkBoundItemPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + SecurityCardPermissionPacket.PACKET_TYPE, + wrapHandler(SecurityCardPermissionPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + SecurityCardResetPermissionPacket.PACKET_TYPE, + wrapHandler(SecurityCardResetPermissionPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + SecurityCardBoundPlayerPacket.PACKET_TYPE, + wrapHandler(SecurityCardBoundPlayerPacket::handle) + ); + } + + private static ServerPlayNetworking.PlayPayloadHandler wrapHandler( + final PacketHandler handler + ) { + return (packet, ctx) -> handler.handle(packet, ctx::player); } private void registerSidedHandlers() { diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/PlatformImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/PlatformImpl.java index e23f64cc8..8cca663e8 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/PlatformImpl.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/PlatformImpl.java @@ -14,8 +14,6 @@ import com.refinedmods.refinedstorage2.platform.fabric.grid.view.FabricItemGridResourceFactory; import com.refinedmods.refinedstorage2.platform.fabric.mixin.EditBoxAccessor; import com.refinedmods.refinedstorage2.platform.fabric.mixin.KeyMappingAccessor; -import com.refinedmods.refinedstorage2.platform.fabric.packet.c2s.ClientToServerCommunicationsImpl; -import com.refinedmods.refinedstorage2.platform.fabric.packet.s2c.ServerToClientCommunicationsImpl; import com.refinedmods.refinedstorage2.platform.fabric.support.containermenu.ContainerTransferDestination; import com.refinedmods.refinedstorage2.platform.fabric.support.containermenu.MenuOpenerImpl; import com.refinedmods.refinedstorage2.platform.fabric.support.energy.EnergyStorageAdapter; @@ -29,8 +27,10 @@ import javax.annotation.Nullable; import com.mojang.blaze3d.platform.InputConstants; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.entity.FakePlayer; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; @@ -50,15 +50,14 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.tags.FluidTags; -import net.minecraft.tags.TagKey; import net.minecraft.world.Container; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -66,9 +65,9 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; @@ -89,19 +88,8 @@ import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toItemVariant; public final class PlatformImpl extends AbstractPlatform { - private static final TagKey WRENCH_TAG = TagKey.create( - BuiltInRegistries.ITEM.key(), - new ResourceLocation("c", "wrenches") - ); - public PlatformImpl() { - super( - new ServerToClientCommunicationsImpl(), - new ClientToServerCommunicationsImpl(), - new MenuOpenerImpl(), - new FluidVariantFluidRenderer(), - ItemGridInsertionStrategy::new - ); + super(new MenuOpenerImpl(), new FluidVariantFluidRenderer(), ItemGridInsertionStrategy::new); } @Override @@ -109,11 +97,6 @@ public long getBucketAmount() { return FluidConstants.BUCKET; } - @Override - public TagKey getWrenchTag() { - return WRENCH_TAG; - } - @Override public Config getConfig() { return ConfigImpl.get(); @@ -209,11 +192,12 @@ public ItemStack getCloneItemStack(final BlockState state, return state.getBlock().getCloneItemStack(level, hitResult.getBlockPos(), state); } + @Override public NonNullList getRemainingCraftingItems(final Player player, final CraftingRecipe craftingRecipe, - final CraftingContainer craftingContainer) { - return craftingRecipe.getRemainingItems(craftingContainer); + final CraftingInput input) { + return craftingRecipe.getRemainingItems(input); } @Override @@ -372,4 +356,14 @@ public Optional getEnergyStorage(final ItemStack stack) { .map(EnergyStorageAdapter.class::cast) .map(EnergyStorageAdapter::getEnergyStorage); } + + @Override + public void sendPacketToServer(final T packet) { + ClientPlayNetworking.send(packet); + } + + @Override + public void sendPacketToClient(final ServerPlayer player, final T packet) { + ServerPlayNetworking.send(player, packet); + } } diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java index 9b3e480d5..bfca9f72b 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java @@ -27,7 +27,7 @@ public class FluidGridExtractionStrategy implements GridExtractionStrategy { private static final ItemVariant BUCKET_ITEM_VARIANT = ItemVariant.of(Items.BUCKET); - private static final ItemResource BUCKET_ITEM_RESOURCE = new ItemResource(Items.BUCKET, null); + private static final ItemResource BUCKET_ITEM_RESOURCE = new ItemResource(Items.BUCKET); private final GridOperations gridOperations; private final PlayerInventoryStorage playerInventoryStorage; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java index 77fad8db0..67e400ac8 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java @@ -41,7 +41,7 @@ public boolean onInsert(final GridInsertMode insertMode, final boolean tryAltern if (carried.isEmpty()) { return false; } - final ItemResource itemResource = new ItemResource(carried.getItem(), carried.getTag()); + final ItemResource itemResource = ItemResource.ofItemStack(carried); gridOperations.insert(itemResource, insertMode, (resource, amount, action, source) -> { if (!(resource instanceof ItemResource itemResource2)) { return 0; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/AbstractModelBakerImplMixin.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/AbstractModelBakerImplMixin.java index 4755550c0..d85291bfe 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/AbstractModelBakerImplMixin.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/AbstractModelBakerImplMixin.java @@ -3,45 +3,36 @@ import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; import com.refinedmods.refinedstorage2.platform.fabric.support.render.EmissiveModelRegistry; -import java.util.Map; - +import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelState; +import net.minecraft.client.resources.model.UnbakedModel; import net.minecraft.resources.ResourceLocation; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(ModelBakery.ModelBakerImpl.class) public abstract class AbstractModelBakerImplMixin { - @Shadow(remap = false) - private ModelBakery field_40571; - - @Inject(method = "bake", at = @At("RETURN"), cancellable = true) - public void onBake(final ResourceLocation resourceLocation, - final ModelState modelState, - final CallbackInfoReturnable returnable) { - if (!resourceLocation.getNamespace().equals(IdentifierUtil.MOD_ID)) { + @Inject(method = "bakeUncached", at = @At("RETURN"), cancellable = true) + public void onBakeUncached(final UnbakedModel unbakedModel, + final ModelState modelState, + final CallbackInfoReturnable cir) { + if (!(unbakedModel instanceof BlockModel blockModel)) { return; } - final BakedModel emissive = EmissiveModelRegistry.INSTANCE.makeEmissive( - resourceLocation, - returnable.getReturnValue() - ); - if (emissive == null) { + if (!blockModel.name.startsWith(IdentifierUtil.MOD_ID)) { return; } - final ModelBakery.BakedCacheKey cacheKey = new ModelBakery.BakedCacheKey( - resourceLocation, - modelState.getRotation(), - modelState.isUvLocked() + final BakedModel wrapped = EmissiveModelRegistry.INSTANCE.tryWrapAsEmissiveModel( + ResourceLocation.parse(blockModel.name), + cir.getReturnValue() ); - final Map bakedCache = ((ModelBakeryAccessor) field_40571) - .getBakedCache(); - bakedCache.put(cacheKey, emissive); - returnable.setReturnValue(emissive); + if (wrapped == null) { + return; + } + cir.setReturnValue(wrapped); } } diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ClientToServerCommunicationsImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ClientToServerCommunicationsImpl.java deleted file mode 100644 index 3d164f3f7..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ClientToServerCommunicationsImpl.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.support.ClientToServerCommunications; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; - -import java.util.List; -import java.util.UUID; -import java.util.function.Consumer; - -import io.netty.buffer.Unpooled; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; - -public class ClientToServerCommunicationsImpl implements ClientToServerCommunications { - @Override - public void sendGridExtract(final PlatformResourceKey resource, final GridExtractMode mode, final boolean cursor) { - final ResourceType resourceType = resource.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresent(id -> sendToServer( - PacketIds.GRID_EXTRACT, - buf -> { - buf.writeResourceLocation(id); - GridExtractPacket.writeMode(buf, mode); - buf.writeBoolean(cursor); - resource.toBuffer(buf); - } - )); - } - - @Override - public void sendGridScroll(final PlatformResourceKey resource, final GridScrollMode mode, final int slotIndex) { - final ResourceType resourceType = resource.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresent(id -> sendToServer( - PacketIds.GRID_SCROLL, - buf -> { - buf.writeResourceLocation(id); - GridScrollPacket.writeMode(buf, mode); - buf.writeInt(slotIndex); - resource.toBuffer(buf); - } - )); - } - - @Override - public void sendGridInsert(final GridInsertMode mode, final boolean tryAlternatives) { - sendToServer(PacketIds.GRID_INSERT, buf -> { - buf.writeBoolean(mode == GridInsertMode.SINGLE_RESOURCE); - buf.writeBoolean(tryAlternatives); - }); - } - - @Override - public void sendCraftingGridClear(final boolean toPlayerInventory) { - sendToServer(PacketIds.CRAFTING_GRID_CLEAR, buf -> buf.writeBoolean(toPlayerInventory)); - } - - @Override - public void sendCraftingGridRecipeTransfer(final List> recipe) { - sendToServer(PacketIds.CRAFTING_GRID_RECIPE_TRANSFER, buf -> { - buf.writeInt(recipe.size()); - for (final List slotPossibilities : recipe) { - buf.writeInt(slotPossibilities.size()); - for (final ItemResource slotPossibility : slotPossibilities) { - slotPossibility.toBuffer(buf); - } - } - }); - } - - @Override - public void sendPropertyChange(final PropertyType type, final T value) { - sendToServer(PacketIds.PROPERTY_CHANGE, buf -> { - buf.writeResourceLocation(type.id()); - buf.writeInt(type.serializer().apply(value)); - }); - } - - @Override - public void sendStorageInfoRequest(final UUID storageId) { - sendToServer(PacketIds.STORAGE_INFO_REQUEST, buf -> buf.writeUUID(storageId)); - } - - @Override - public void sendResourceSlotChange(final int slotIndex, final boolean tryAlternatives) { - sendToServer(PacketIds.RESOURCE_SLOT_CHANGE, buf -> { - buf.writeInt(slotIndex); - buf.writeBoolean(tryAlternatives); - }); - } - - @Override - public void sendResourceFilterSlotChange(final PlatformResourceKey resource, final int slotIndex) { - final ResourceType resourceType = resource.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType) - .ifPresent(id -> sendToServer(PacketIds.RESOURCE_FILTER_SLOT_CHANGE, buf -> { - buf.writeInt(slotIndex); - buf.writeResourceLocation(id); - resource.toBuffer(buf); - })); - } - - @Override - public void sendResourceSlotAmountChange(final int slotIndex, final long amount) { - sendToServer(PacketIds.RESOURCE_SLOT_AMOUNT_CHANGE, buf -> { - buf.writeInt(slotIndex); - buf.writeLong(amount); - }); - } - - @Override - public void sendSingleAmountChange(final double amount) { - sendToServer(PacketIds.SINGLE_AMOUNT_CHANGE, buf -> buf.writeDouble(amount)); - } - - @Override - public void sendUseNetworkBoundItem(final SlotReference slotReference) { - sendToServer( - PacketIds.USE_NETWORK_BOUND_ITEM, - buf -> PlatformApi.INSTANCE.writeSlotReference(slotReference, buf) - ); - } - - @Override - public void sendSecurityCardPermission(final PlatformPermission permission, final boolean allowed) { - PlatformApi.INSTANCE.getPermissionRegistry().getId(permission).ifPresent(id -> sendToServer( - PacketIds.SECURITY_CARD_PERMISSION, - buf -> { - buf.writeResourceLocation(id); - buf.writeBoolean(allowed); - } - )); - } - - @Override - public void sendSecurityCardResetPermission(final PlatformPermission permission) { - PlatformApi.INSTANCE.getPermissionRegistry().getId(permission).ifPresent(id -> sendToServer( - PacketIds.SECURITY_CARD_RESET_PERMISSION, - buf -> buf.writeResourceLocation(id) - )); - } - - @Override - public void sendSecurityCardBoundPlayer(final UUID playerId) { - sendToServer(PacketIds.SECURITY_CARD_BOUND_PLAYER, buf -> buf.writeUUID(playerId)); - } - - private static void sendToServer(final ResourceLocation id, final Consumer bufConsumer) { - final FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer()); - bufConsumer.accept(buf); - ClientPlayNetworking.send(id, buf); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/CraftingGridClearPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/CraftingGridClearPacket.java deleted file mode 100644 index 8660d7e59..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/CraftingGridClearPacket.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.world.inventory.AbstractContainerMenu; - -public class CraftingGridClearPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final boolean toPlayerInventory = buf.readBoolean(); - server.execute(() -> { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof CraftingGridContainerMenu craftingGridMenu) { - craftingGridMenu.clear(toPlayerInventory); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/CraftingGridRecipeTransferPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/CraftingGridRecipeTransferPacket.java deleted file mode 100644 index 4efffd0da..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/CraftingGridRecipeTransferPacket.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.util.PacketUtil; - -import java.util.ArrayList; -import java.util.List; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; - -public class CraftingGridRecipeTransferPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final int slots = buf.readInt(); - final List> recipe = new ArrayList<>(slots); - for (int i = 0; i < slots; ++i) { - final int slotPossibilitiesCount = buf.readInt(); - final List slotPossibilities = new ArrayList<>(slotPossibilitiesCount); - for (int j = 0; j < slotPossibilitiesCount; ++j) { - slotPossibilities.add(PacketUtil.readItemResource(buf)); - } - recipe.add(slotPossibilities); - } - handle(recipe, player, server); - } - - private void handle(final List> recipe, final Player player, final MinecraftServer server) { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof CraftingGridContainerMenu craftingGridContainerMenu) { - server.execute(() -> craftingGridContainerMenu.transferRecipe(recipe)); - } - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridExtractPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridExtractPacket.java deleted file mode 100644 index da105453e..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridExtractPacket.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; - -public class GridExtractPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final ResourceLocation id = buf.readResourceLocation(); - PlatformApi.INSTANCE.getResourceTypeRegistry() - .get(id) - .ifPresent(type -> handle(type, buf, player, server)); - } - - private void handle(final ResourceType type, - final FriendlyByteBuf buf, - final Player player, - final MinecraftServer server) { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof GridExtractionStrategy strategy) { - final GridExtractMode mode = getMode(buf.readByte()); - final boolean cursor = buf.readBoolean(); - final PlatformResourceKey resource = type.fromBuffer(buf); - server.execute(() -> strategy.onExtract(resource, mode, cursor)); - } - } - - private static GridExtractMode getMode(final byte mode) { - if (mode == 0) { - return GridExtractMode.ENTIRE_RESOURCE; - } - return GridExtractMode.HALF_RESOURCE; - } - - public static void writeMode(final FriendlyByteBuf buf, final GridExtractMode mode) { - if (mode == GridExtractMode.ENTIRE_RESOURCE) { - buf.writeByte(0); - } else if (mode == GridExtractMode.HALF_RESOURCE) { - buf.writeByte(1); - } - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridInsertPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridInsertPacket.java deleted file mode 100644 index 642ac2cc6..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridInsertPacket.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.world.inventory.AbstractContainerMenu; - -public class GridInsertPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final boolean single = buf.readBoolean(); - final boolean tryAlternatives = buf.readBoolean(); - server.execute(() -> { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof GridInsertionStrategy strategy) { - final GridInsertMode mode = single ? GridInsertMode.SINGLE_RESOURCE : GridInsertMode.ENTIRE_RESOURCE; - strategy.onInsert(mode, tryAlternatives); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridScrollPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridScrollPacket.java deleted file mode 100644 index 81bb55218..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/GridScrollPacket.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; - -public class GridScrollPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final ResourceLocation id = buf.readResourceLocation(); - PlatformApi.INSTANCE.getResourceTypeRegistry() - .get(id) - .ifPresent(type -> handle(type, buf, player, server)); - } - - private void handle(final ResourceType type, - final FriendlyByteBuf buf, - final Player player, - final MinecraftServer server) { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof GridScrollingStrategy strategy) { - final GridScrollMode mode = getMode(buf.readByte()); - final int slotIndex = buf.readInt(); - final PlatformResourceKey resource = type.fromBuffer(buf); - server.execute(() -> strategy.onScroll(resource, mode, slotIndex)); - } - } - - public static GridScrollMode getMode(final byte mode) { - if (mode == 0) { - return GridScrollMode.GRID_TO_INVENTORY; - } else if (mode == 1) { - return GridScrollMode.GRID_TO_CURSOR; - } - return GridScrollMode.INVENTORY_TO_GRID; - } - - public static void writeMode(final FriendlyByteBuf buf, final GridScrollMode mode) { - switch (mode) { - case GRID_TO_INVENTORY -> buf.writeByte(0); - case GRID_TO_CURSOR -> buf.writeByte(1); - case INVENTORY_TO_GRID -> buf.writeByte(2); - } - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/PropertyChangePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/PropertyChangePacket.java deleted file mode 100644 index bce12abfd..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/PropertyChangePacket.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public class PropertyChangePacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final ResourceLocation id = buf.readResourceLocation(); - final int value = buf.readInt(); - - server.execute(() -> { - if (player.containerMenu instanceof AbstractBaseContainerMenu menu) { - menu.receivePropertyChangeFromClient(id, value); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceFilterSlotChangePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceFilterSlotChangePacket.java deleted file mode 100644 index eb56e7747..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceFilterSlotChangePacket.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public class ResourceFilterSlotChangePacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final int slotIndex = buf.readInt(); - final ResourceLocation resourceTypeId = buf.readResourceLocation(); - PlatformApi.INSTANCE.getResourceTypeRegistry() - .get(resourceTypeId) - .ifPresent(resourceType -> handle(resourceType, buf, server, slotIndex, player)); - } - - private void handle(final ResourceType resourceType, - final FriendlyByteBuf buf, - final MinecraftServer server, - final int slotIndex, - final ServerPlayer serverPlayer) { - final PlatformResourceKey resource = resourceType.fromBuffer(buf); - server.execute(() -> { - if (serverPlayer.containerMenu instanceof AbstractResourceContainerMenu containerMenu) { - containerMenu.handleResourceFilterSlotUpdate(slotIndex, resource); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceSlotAmountChangePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceSlotAmountChangePacket.java deleted file mode 100644 index 0eb3f38b2..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceSlotAmountChangePacket.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public class ResourceSlotAmountChangePacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final int slotIndex = buf.readInt(); - final long amount = buf.readLong(); - server.execute(() -> { - if (player.containerMenu instanceof AbstractResourceContainerMenu menu) { - menu.handleResourceSlotAmountChange(slotIndex, amount); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceSlotChangePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceSlotChangePacket.java deleted file mode 100644 index f2f9b011e..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/ResourceSlotChangePacket.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public class ResourceSlotChangePacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final int slotIndex = buf.readInt(); - final boolean tryAlternatives = buf.readBoolean(); - server.execute(() -> { - if (player.containerMenu instanceof AbstractResourceContainerMenu resourceContainerMenu) { - resourceContainerMenu.handleResourceSlotChange(slotIndex, tryAlternatives); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardBoundPlayerPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardBoundPlayerPacket.java deleted file mode 100644 index 42540536c..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardBoundPlayerPacket.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardContainerMenu; - -import java.util.UUID; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public class SecurityCardBoundPlayerPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final UUID playerId = buf.readUUID(); - if (player.containerMenu instanceof SecurityCardContainerMenu securityCardContainerMenu) { - server.execute(() -> securityCardContainerMenu.setBoundPlayer(server, playerId)); - } - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardPermissionPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardPermissionPacket.java deleted file mode 100644 index cfebef7b1..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardPermissionPacket.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.security.AbstractSecurityCardContainerMenu; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public class SecurityCardPermissionPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final ResourceLocation permissionId = buf.readResourceLocation(); - final boolean allowed = buf.readBoolean(); - if (player.containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { - server.execute(() -> securityCardContainerMenu.setPermission(permissionId, allowed)); - } - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardResetPermissionPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardResetPermissionPacket.java deleted file mode 100644 index de26b2f54..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SecurityCardResetPermissionPacket.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.security.AbstractSecurityCardContainerMenu; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public class SecurityCardResetPermissionPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final ResourceLocation permissionId = buf.readResourceLocation(); - if (player.containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { - server.execute(() -> securityCardContainerMenu.resetPermission(permissionId)); - } - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SingleAmountChangePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SingleAmountChangePacket.java deleted file mode 100644 index 5559cde29..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/SingleAmountChangePacket.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.world.inventory.AbstractContainerMenu; - -public class SingleAmountChangePacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final double amount = buf.readDouble(); - server.execute(() -> { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof AbstractSingleAmountContainerMenu containerMenu) { - containerMenu.changeAmountOnServer(amount); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/StorageInfoRequestPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/StorageInfoRequestPacket.java deleted file mode 100644 index daecf8275..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/StorageInfoRequestPacket.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.common.Platform; - -import java.util.UUID; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public class StorageInfoRequestPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final UUID id = buf.readUUID(); - - server.execute(() -> { - final StorageInfo info = PlatformApi.INSTANCE - .getStorageRepository(player.getCommandSenderWorld()) - .getInfo(id); - - Platform.INSTANCE.getServerToClientCommunications().sendStorageInfoResponse(player, id, info); - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/UseNetworkBoundItemPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/UseNetworkBoundItemPacket.java deleted file mode 100644 index 0a32c7fa4..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/UseNetworkBoundItemPacket.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.energy.AbstractNetworkBoundEnergyItem; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; - -import java.util.Optional; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public class UseNetworkBoundItemPacket implements ServerPlayNetworking.PlayChannelHandler { - @Override - public void receive(final MinecraftServer server, - final ServerPlayer player, - final ServerGamePacketListenerImpl handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final Optional slotRefMaybe = PlatformApi.INSTANCE.getSlotReference(buf); - server.execute(() -> slotRefMaybe.ifPresent(slotReference -> slotReference.resolve(player).ifPresent(stack -> { - if (!(stack.getItem() instanceof AbstractNetworkBoundEnergyItem networkBoundItem)) { - return; - } - final NetworkBoundItemSession sess = PlatformApi.INSTANCE.getNetworkBoundItemHelper().openSession( - stack, - player, - slotReference - ); - networkBoundItem.use(player, slotReference, sess); - }))); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/package-info.java deleted file mode 100644 index aacb09f8d..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/c2s/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.packet.c2s; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/package-info.java deleted file mode 100644 index 84f96f577..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.packet; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/EnergyInfoPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/EnergyInfoPacket.java deleted file mode 100644 index f7e890587..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/EnergyInfoPacket.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyContainerMenu; - -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; - -public class EnergyInfoPacket implements ClientPlayNetworking.PlayChannelHandler { - @Override - public void receive(final Minecraft client, - final ClientPacketListener handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final long stored = buf.readLong(); - final long capacity = buf.readLong(); - - client.execute(() -> { - if (client.player.containerMenu instanceof EnergyContainerMenu energyContainer) { - energyContainer.getEnergyInfo().setEnergy(stored, capacity); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridActivePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridActivePacket.java deleted file mode 100644 index 650fe03fd..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridActivePacket.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; - -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; - -public class GridActivePacket implements ClientPlayNetworking.PlayChannelHandler { - @Override - public void receive(final Minecraft client, - final ClientPacketListener handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final boolean active = buf.readBoolean(); - - client.execute(() -> { - if (client.player.containerMenu instanceof GridWatcher gridWatcher) { - gridWatcher.onActiveChanged(active); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridClearPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridClearPacket.java deleted file mode 100644 index 27f5edba7..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridClearPacket.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; - -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; - -public class GridClearPacket implements ClientPlayNetworking.PlayChannelHandler { - @Override - public void receive(final Minecraft client, - final ClientPacketListener handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - client.execute(() -> { - if (client.player.containerMenu instanceof AbstractGridContainerMenu containerMenu) { - containerMenu.onClear(); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridUpdatePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridUpdatePacket.java deleted file mode 100644 index 774c33335..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/GridUpdatePacket.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.util.PacketUtil; - -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; - -public class GridUpdatePacket implements ClientPlayNetworking.PlayChannelHandler { - @Override - public void receive(final Minecraft client, - final ClientPacketListener handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final ResourceLocation id = buf.readResourceLocation(); - PlatformApi.INSTANCE.getResourceTypeRegistry().get(id).ifPresent(type -> handle(type, buf, client)); - } - - private void handle(final ResourceType type, - final FriendlyByteBuf buf, - final Minecraft client) { - final ResourceKey resource = type.fromBuffer(buf); - final long amount = buf.readLong(); - final TrackedResource trackedResource = PacketUtil.readTrackedResource(buf); - - client.execute(() -> { - if (client.player.containerMenu instanceof AbstractGridContainerMenu containerMenu) { - containerMenu.onResourceUpdate(resource, amount, trackedResource); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/NetworkTransmitterStatusPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/NetworkTransmitterStatusPacket.java deleted file mode 100644 index f174071cd..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/NetworkTransmitterStatusPacket.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterStatus; - -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; - -public class NetworkTransmitterStatusPacket implements ClientPlayNetworking.PlayChannelHandler { - @Override - public void receive(final Minecraft client, - final ClientPacketListener handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final boolean error = buf.readBoolean(); - final Component message = buf.readComponent(); - - client.execute(() -> { - if (client.player.containerMenu instanceof NetworkTransmitterContainerMenu containerMenu) { - containerMenu.setStatus(new NetworkTransmitterStatus(error, message)); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/NoPermissionPacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/NoPermissionPacket.java deleted file mode 100644 index 4cbfd9608..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/NoPermissionPacket.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.util.SecurityToastHelper; - -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; - -public class NoPermissionPacket implements ClientPlayNetworking.PlayChannelHandler { - @Override - public void receive(final Minecraft client, - final ClientPacketListener handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final Component message = buf.readComponent(); - client.execute(() -> SecurityToastHelper.addNoPermissionToast(message)); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/ResourceSlotUpdatePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/ResourceSlotUpdatePacket.java deleted file mode 100644 index 19569352a..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/ResourceSlotUpdatePacket.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; - -import java.util.function.Consumer; - -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; - -public class ResourceSlotUpdatePacket implements ClientPlayNetworking.PlayChannelHandler { - @Override - public void receive(final Minecraft client, - final ClientPacketListener handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final int slotIndex = buf.readInt(); - final boolean present = buf.readBoolean(); - if (present) { - final ResourceLocation id = buf.readResourceLocation(); - PlatformApi.INSTANCE.getResourceTypeRegistry().get(id).ifPresent( - type -> handle(type, buf, client, slotIndex) - ); - } else { - handle(client, containerMenu -> containerMenu.handleResourceSlotUpdate(slotIndex, null)); - } - } - - private void handle(final ResourceType type, - final FriendlyByteBuf buf, - final Minecraft client, - final int slotIndex) { - final ResourceKey resource = type.fromBuffer(buf); - final long amount = buf.readLong(); - handle(client, containerMenu -> containerMenu.handleResourceSlotUpdate(slotIndex, new ResourceAmount( - resource, - amount - ))); - } - - private void handle(final Minecraft client, - final Consumer containerMenuConsumer) { - client.execute(() -> { - if (client.player.containerMenu instanceof AbstractResourceContainerMenu containerMenu) { - containerMenuConsumer.accept(containerMenu); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/ServerToClientCommunicationsImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/ServerToClientCommunicationsImpl.java deleted file mode 100644 index 610a440f2..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/ServerToClientCommunicationsImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterStatus; -import com.refinedmods.refinedstorage2.platform.common.support.ServerToClientCommunications; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; -import com.refinedmods.refinedstorage2.platform.common.util.PacketUtil; - -import java.util.UUID; -import java.util.function.Consumer; -import javax.annotation.Nullable; - -import io.netty.buffer.Unpooled; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; - -public class ServerToClientCommunicationsImpl implements ServerToClientCommunications { - @Override - public void sendEnergyInfo(final ServerPlayer player, final long stored, final long capacity) { - sendToPlayer(player, PacketIds.ENERGY_INFO, buf -> { - buf.writeLong(stored); - buf.writeLong(capacity); - }); - } - - @Override - public void sendWirelessTransmitterRange(final ServerPlayer player, final int range) { - sendToPlayer(player, PacketIds.WIRELESS_TRANSMITTER_RANGE, buf -> buf.writeInt(range)); - } - - @Override - public void sendGridActiveness(final ServerPlayer player, final boolean active) { - sendToPlayer(player, PacketIds.GRID_ACTIVE, buf -> buf.writeBoolean(active)); - } - - @Override - public void sendGridUpdate(final ServerPlayer player, - final PlatformResourceKey resource, - final long change, - @Nullable final TrackedResource trackedResource) { - final ResourceType resourceType = resource.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresent(id -> sendToPlayer( - player, - PacketIds.GRID_UPDATE, - buf -> { - buf.writeResourceLocation(id); - resource.toBuffer(buf); - buf.writeLong(change); - PacketUtil.writeTrackedResource(buf, trackedResource); - } - )); - } - - @Override - public void sendGridClear(final ServerPlayer player) { - sendToPlayer(player, PacketIds.GRID_CLEAR, buf -> { - }); - } - - @Override - public void sendResourceSlotUpdate(final ServerPlayer player, - @Nullable final ResourceAmount resourceAmount, - final int slotIndex) { - sendToPlayer(player, PacketIds.RESOURCE_SLOT_UPDATE, buf -> { - buf.writeInt(slotIndex); - if (resourceAmount != null - && resourceAmount.getResource() instanceof PlatformResourceKey platformResource) { - sendResourceSlotUpdate(platformResource, resourceAmount.getAmount(), buf); - } else { - buf.writeBoolean(false); - } - }); - } - - private void sendResourceSlotUpdate(final PlatformResourceKey resource, - final long amount, - final FriendlyByteBuf buf) { - final ResourceType resourceType = resource.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresentOrElse(id -> { - buf.writeBoolean(true); - buf.writeResourceLocation(id); - resource.toBuffer(buf); - buf.writeLong(amount); - }, () -> buf.writeBoolean(false)); - } - - @Override - public void sendStorageInfoResponse(final ServerPlayer player, final UUID id, final StorageInfo storageInfo) { - sendToPlayer(player, PacketIds.STORAGE_INFO_RESPONSE, bufToSend -> { - bufToSend.writeUUID(id); - bufToSend.writeLong(storageInfo.stored()); - bufToSend.writeLong(storageInfo.capacity()); - }); - } - - @Override - public void sendNetworkTransmitterStatus(final ServerPlayer player, final NetworkTransmitterStatus status) { - sendToPlayer(player, PacketIds.NETWORK_TRANSMITTER_STATUS, buf -> { - buf.writeBoolean(status.error()); - buf.writeComponent(status.message()); - }); - } - - @Override - public void sendNoPermission(final ServerPlayer player, final Component message) { - sendToPlayer(player, PacketIds.NO_PERMISSION, buf -> buf.writeComponent(message)); - } - - private static void sendToPlayer(final ServerPlayer playerEntity, - final ResourceLocation id, - final Consumer bufConsumer) { - final FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer()); - bufConsumer.accept(buf); - ServerPlayNetworking.send(playerEntity, id, buf); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/StorageInfoResponsePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/StorageInfoResponsePacket.java deleted file mode 100644 index a1e9f1558..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/StorageInfoResponsePacket.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.common.storage.ClientStorageRepository; - -import java.util.UUID; - -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; - -public class StorageInfoResponsePacket implements ClientPlayNetworking.PlayChannelHandler { - @Override - public void receive(final Minecraft client, - final ClientPacketListener handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final UUID id = buf.readUUID(); - final long stored = buf.readLong(); - final long capacity = buf.readLong(); - - if (client.level == null) { - return; - } - - client.execute(() -> ((ClientStorageRepository) PlatformApi.INSTANCE.getStorageRepository(client.level)) - .setInfo(id, stored, capacity)); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/WirelessTransmitterRangePacket.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/WirelessTransmitterRangePacket.java deleted file mode 100644 index 8cba5a42d..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/packet/s2c/WirelessTransmitterRangePacket.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; - -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; - -public class WirelessTransmitterRangePacket implements ClientPlayNetworking.PlayChannelHandler { - @Override - public void receive(final Minecraft client, - final ClientPacketListener handler, - final FriendlyByteBuf buf, - final PacketSender responseSender) { - final int range = buf.readInt(); - - client.execute(() -> { - if (client.player.containerMenu instanceof WirelessTransmitterContainerMenu containerMenu) { - containerMenu.setRange(range); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/AbstractDiskContainerBakedModel.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/AbstractDiskContainerBakedModel.java index 1294a3911..fe8b8f3dc 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/AbstractDiskContainerBakedModel.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/AbstractDiskContainerBakedModel.java @@ -11,14 +11,16 @@ import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; +import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.core.component.DataComponents; import net.minecraft.util.RandomSource; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; public abstract class AbstractDiskContainerBakedModel extends ForwardingBakedModel { @@ -52,15 +54,21 @@ public void emitBlockQuads(final BlockAndTintGetter blockView, } @Override + @SuppressWarnings("deprecation") public void emitItemQuads(final ItemStack stack, final Supplier randomSupplier, final RenderContext context) { - final CompoundTag tag = BlockItem.getBlockEntityData(stack); - if (tag == null) { + final Level level = Minecraft.getInstance().level; + final CustomData customData = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (customData == null || level == null) { return; } for (int i = 0; i < diskTranslations.length; ++i) { - final Item diskItem = AbstractDiskContainerBlockEntity.getDisk(tag, i); + final Item diskItem = AbstractDiskContainerBlockEntity.getDisk( + customData.getUnsafe(), + i, + level.registryAccess() + ); emitDiskQuads(stack, randomSupplier, context, diskItem, i); } } diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java index fb99ff660..1d8cec172 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java @@ -55,8 +55,7 @@ public void resolveParents(final Function modelG @Override public BakedModel bake(final ModelBaker baker, final Function spriteGetter, - final ModelState state, - final ResourceLocation location) { + final ModelState state) { final Map diskModels = PlatformApi.INSTANCE.getStorageContainerItemHelper() .getDiskModelsByItem() .entrySet() diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java index e319153c1..1c08114cc 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java @@ -62,8 +62,7 @@ public void resolveParents(final Function modelG @Override public BakedModel bake(final ModelBaker baker, final Function spriteGetter, - final ModelState state, - final ResourceLocation location) { + final ModelState state) { final Map diskModels = PlatformApi.INSTANCE.getStorageContainerItemHelper() .getDiskModelsByItem() .entrySet() diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java index 8923d57d2..461457103 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java @@ -56,8 +56,7 @@ public void resolveParents(final Function modelG @Override public BakedModel bake(final ModelBaker baker, final Function spriteGetter, - final ModelState state, - final ResourceLocation location) { + final ModelState state) { final Map diskModels = PlatformApi.INSTANCE.getStorageContainerItemHelper() .getDiskModelsByItem() .entrySet() diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/FabricExtendedMenuProviderAdapter.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/FabricExtendedMenuProviderAdapter.java deleted file mode 100644 index 5b4cb22d7..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/FabricExtendedMenuProviderAdapter.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.containermenu; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; - -import javax.annotation.Nullable; - -import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; - -class FabricExtendedMenuProviderAdapter implements ExtendedScreenHandlerFactory { - private final ExtendedMenuProvider extendedMenuProvider; - - FabricExtendedMenuProviderAdapter(final ExtendedMenuProvider extendedMenuProvider) { - this.extendedMenuProvider = extendedMenuProvider; - } - - @Override - public void writeScreenOpeningData(final ServerPlayer player, final FriendlyByteBuf buf) { - extendedMenuProvider.writeScreenOpeningData(player, buf); - } - - @Override - public Component getDisplayName() { - return extendedMenuProvider.getDisplayName(); - } - - @Nullable - @Override - public AbstractContainerMenu createMenu(final int syncId, final Inventory inventory, final Player player) { - return extendedMenuProvider.createMenu(syncId, inventory, player); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/MenuOpenerImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/MenuOpenerImpl.java index 0f4c5f790..be74c51d1 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/MenuOpenerImpl.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/MenuOpenerImpl.java @@ -3,16 +3,43 @@ import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; +import javax.annotation.Nullable; + +import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; public class MenuOpenerImpl implements MenuOpener { @Override public void openMenu(final ServerPlayer player, final MenuProvider menuProvider) { - if (menuProvider instanceof ExtendedMenuProvider extendedMenuProvider) { - player.openMenu(new FabricExtendedMenuProviderAdapter(extendedMenuProvider)); + if (menuProvider instanceof ExtendedMenuProvider extendedMenuProvider) { + openExtendedMenu(player, extendedMenuProvider); } else { player.openMenu(menuProvider); } } + + private void openExtendedMenu(final ServerPlayer player, final ExtendedMenuProvider extendedMenuProvider) { + player.openMenu(new ExtendedScreenHandlerFactory() { + @Nullable + @Override + public AbstractContainerMenu createMenu(final int syncId, final Inventory inventory, final Player player) { + return extendedMenuProvider.createMenu(syncId, inventory, player); + } + + @Override + public Component getDisplayName() { + return extendedMenuProvider.getDisplayName(); + } + + @Override + public T getScreenOpeningData(final ServerPlayer player) { + return extendedMenuProvider.getMenuData(); + } + }); + } } diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveModelRegistry.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveModelRegistry.java index 8350779ba..7f0c25660 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveModelRegistry.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveModelRegistry.java @@ -8,7 +8,6 @@ import javax.annotation.Nullable; import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.resources.ResourceLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,13 +23,7 @@ private EmissiveModelRegistry() { } @Nullable - public BakedModel makeEmissive(final ResourceLocation model, final BakedModel bakedModel) { - if (model instanceof ModelResourceLocation modelResourceLocation) { - return makeEmissive( - new ResourceLocation(modelResourceLocation.getNamespace(), modelResourceLocation.getPath()), - bakedModel - ); - } + public BakedModel tryWrapAsEmissiveModel(final ResourceLocation model, final BakedModel bakedModel) { final Function wrapper = factories.get(model); if (wrapper != null) { LOGGER.debug("Made {} an emissive model", model); diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/VariantUtil.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/VariantUtil.java index fa5c3b2f9..5e241963c 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/VariantUtil.java +++ b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/VariantUtil.java @@ -11,18 +11,18 @@ private VariantUtil() { } public static ItemVariant toItemVariant(final ItemResource itemResource) { - return ItemVariant.of(itemResource.item(), itemResource.tag()); + return ItemVariant.of(itemResource.item(), itemResource.components()); } public static ItemResource ofItemVariant(final ItemVariant itemVariant) { - return new ItemResource(itemVariant.getItem(), itemVariant.getNbt()); + return new ItemResource(itemVariant.getItem(), itemVariant.getComponents()); } public static FluidVariant toFluidVariant(final FluidResource fluidResource) { - return FluidVariant.of(fluidResource.fluid(), fluidResource.tag()); + return FluidVariant.of(fluidResource.fluid(), fluidResource.components()); } public static FluidResource ofFluidVariant(final FluidVariant fluidVariant) { - return new FluidResource(fluidVariant.getFluid(), fluidVariant.getNbt()); + return new FluidResource(fluidVariant.getFluid(), fluidVariant.getComponents()); } } diff --git a/refinedstorage2-platform-fabric/src/main/resources/data/c/tags/items/wrenches.json b/refinedstorage2-platform-fabric/src/main/resources/data/c/tags/items/wrenches.json deleted file mode 100644 index fb58fc806..000000000 --- a/refinedstorage2-platform-fabric/src/main/resources/data/c/tags/items/wrenches.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "refinedstorage2:wrench" - ] -} diff --git a/refinedstorage2-platform-fabric/src/main/resources/fabric.mod.json b/refinedstorage2-platform-fabric/src/main/resources/fabric.mod.json index a2c72f825..8605de5cc 100644 --- a/refinedstorage2-platform-fabric/src/main/resources/fabric.mod.json +++ b/refinedstorage2-platform-fabric/src/main/resources/fabric.mod.json @@ -39,8 +39,8 @@ "depends": { "fabricloader": ">=0.14.6", "fabric-api": "*", - "minecraft": "1.20.4", - "java": ">=17", + "minecraft": "1.21", + "java": ">=21", "cloth-config2": "*", "team_reborn_energy": "*" }, diff --git a/refinedstorage2-platform-forge/build.gradle b/refinedstorage2-platform-forge/build.gradle index 02fc5d3fe..ee02459f4 100644 --- a/refinedstorage2-platform-forge/build.gradle +++ b/refinedstorage2-platform-forge/build.gradle @@ -3,3 +3,5 @@ forgeProject("refinedstorage2", project(":refinedstorage2-platform-common"), api archivesBaseName = 'refinedstorage2-platform-forge' enablePublishing() + +test.onlyIf { false } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java index f9a3477ed..d0d02ebba 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java @@ -438,7 +438,7 @@ public Optional getSynchronizer() { if (synchronizer == null || synchronizer.get().trim().isBlank()) { return Optional.empty(); } - return Optional.of(synchronizer.get()).map(ResourceLocation::new); + return Optional.of(synchronizer.get()).map(ResourceLocation::tryParse); } @Override @@ -476,7 +476,7 @@ public Optional getResourceTypeId() { if (resourceType == null || resourceType.get().trim().isBlank()) { return Optional.empty(); } - return Optional.of(resourceType.get()).map(ResourceLocation::new); + return Optional.of(resourceType.get()).map(ResourceLocation::tryParse); } @Override diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java index d2893a554..af7c0c18f 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java @@ -10,6 +10,7 @@ import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; import com.refinedmods.refinedstorage2.platform.common.content.CreativeModeTabItems; import com.refinedmods.refinedstorage2.platform.common.content.DirectRegistryCallback; +import com.refinedmods.refinedstorage2.platform.common.content.ExtendedMenuTypeFactory; import com.refinedmods.refinedstorage2.platform.common.content.Items; import com.refinedmods.refinedstorage2.platform.common.content.MenuTypeFactory; import com.refinedmods.refinedstorage2.platform.common.content.RegistryCallback; @@ -21,7 +22,30 @@ import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItem; import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType; import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; +import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.CraftingGridClearPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.CraftingGridRecipeTransferPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridExtractPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridInsertPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridScrollPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.PropertyChangePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceSlotAmountChangePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceSlotChangePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardBoundPlayerPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardPermissionPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardResetPermissionPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SingleAmountChangePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.StorageInfoRequestPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.UseNetworkBoundItemPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.EnergyInfoPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridActivePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridClearPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridUpdatePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NoPermissionPacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.StorageInfoResponsePacket; +import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeItem; import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; import com.refinedmods.refinedstorage2.platform.common.util.ServerEventQueue; @@ -40,41 +64,22 @@ import com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid.ForgePortableGridBlockEntity; import com.refinedmods.refinedstorage2.platform.forge.support.energy.EnergyStorageAdapter; import com.refinedmods.refinedstorage2.platform.forge.support.inventory.InsertExtractItemHandler; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.CraftingGridClearPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.CraftingGridRecipeTransferPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.GridExtractPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.GridInsertPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.GridScrollPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.PropertyChangePacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.ResourceFilterSlotChangePacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.ResourceSlotAmountChangePacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.ResourceSlotChangePacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.SecurityCardBoundPlayerPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.SecurityCardPermissionPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.SecurityCardResetPermissionPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.SingleAmountChangePacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.StorageInfoRequestPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.UseNetworkBoundItemPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.EnergyInfoPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.GridActivePacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.GridClearPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.GridUpdatePacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.NetworkTransmitterStatusPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.NoPermissionPacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.ResourceSlotUpdatePacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.StorageInfoResponsePacket; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.WirelessTransmitterRangePacket; import com.refinedmods.refinedstorage2.platform.forge.support.resource.ResourceContainerFluidHandlerAdapter; import java.util.Arrays; import java.util.HashSet; import java.util.function.Supplier; +import net.minecraft.core.component.DataComponentType; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.CreativeModeTab; @@ -89,6 +94,7 @@ import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; import net.neoforged.fml.loading.FMLEnvironment; @@ -96,13 +102,14 @@ import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; -import net.neoforged.neoforge.event.TickEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.event.level.BlockEvent; +import net.neoforged.neoforge.event.tick.ServerTickEvent; import net.neoforged.neoforge.items.wrapper.InvWrapper; import net.neoforged.neoforge.items.wrapper.RangedWrapper; -import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent; -import net.neoforged.neoforge.network.registration.IPayloadRegistrar; +import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; +import net.neoforged.neoforge.network.handling.IPayloadHandler; +import net.neoforged.neoforge.network.registration.PayloadRegistrar; import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.RegisterEvent; @@ -131,9 +138,11 @@ public class ModInitializer extends AbstractModInitializer { DeferredRegister.create(BuiltInRegistries.SOUND_EVENT, IdentifierUtil.MOD_ID); private final DeferredRegister> recipeSerializerRegistry = DeferredRegister.create(BuiltInRegistries.RECIPE_SERIALIZER, IdentifierUtil.MOD_ID); + private final DeferredRegister> dataComponentTypeRegistry = + DeferredRegister.create(BuiltInRegistries.DATA_COMPONENT_TYPE, IdentifierUtil.MOD_ID); - public ModInitializer(final IEventBus eventBus) { - PlatformProxy.loadPlatform(new PlatformImpl()); + public ModInitializer(final IEventBus eventBus, final ModContainer modContainer) { + PlatformProxy.loadPlatform(new PlatformImpl(modContainer)); initializePlatformApi(); registerAdditionalGridInsertionStrategyFactories(); registerGridExtractionStrategyFactories(); @@ -211,6 +220,7 @@ private void registerContent(final IEventBus eventBus) { registerItems(eventBus); registerBlockEntities(eventBus); registerMenus(eventBus); + registerDataComponents(eventBus); } private void registerBlocks(final IEventBus eventBus) { @@ -239,7 +249,7 @@ private void registerCustomItems(final RegistryCallback callback) { public boolean shouldCauseReequipAnimation(final ItemStack oldStack, final ItemStack newStack, final boolean slotChanged) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } })); Items.INSTANCE.setWirelessGrid(callback.register(WIRELESS_GRID, () -> new WirelessGridItem() { @@ -247,7 +257,7 @@ public boolean shouldCauseReequipAnimation(final ItemStack oldStack, public boolean shouldCauseReequipAnimation(final ItemStack oldStack, final ItemStack newStack, final boolean slotChanged) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } })); Items.INSTANCE.setCreativeWirelessGrid(callback.register( @@ -257,7 +267,7 @@ public boolean shouldCauseReequipAnimation(final ItemStack oldStack, public boolean shouldCauseReequipAnimation(final ItemStack oldStack, final ItemStack newStack, final boolean slotChanged) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } } )); @@ -268,7 +278,7 @@ public boolean shouldCauseReequipAnimation(final ItemStack oldStack, public boolean shouldCauseReequipAnimation(final ItemStack oldStack, final ItemStack newStack, final boolean slotChanged) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } })); Items.INSTANCE.setCreativePortableGrid(callback.register( @@ -278,7 +288,7 @@ public boolean shouldCauseReequipAnimation(final ItemStack oldStack, public boolean shouldCauseReequipAnimation(final ItemStack oldStack, final ItemStack newStack, final boolean slotChanged) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } } )); @@ -287,7 +297,7 @@ public boolean shouldCauseReequipAnimation(final ItemStack oldStack, public boolean shouldCauseReequipAnimation(final ItemStack oldStack, final ItemStack newStack, final boolean slotChanged) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } })); Items.INSTANCE.setFallbackSecurityCard(callback.register( @@ -297,7 +307,7 @@ public boolean shouldCauseReequipAnimation(final ItemStack oldStack, public boolean shouldCauseReequipAnimation(final ItemStack oldStack, final ItemStack newStack, final boolean slotChanged) { - return AbstractModInitializer.allowNbtUpdateAnimation(oldStack, newStack); + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); } } )); @@ -325,12 +335,28 @@ private void registerMenus(final IEventBus eventBus) { registerMenus(new ForgeRegistryCallback<>(menuTypeRegistry), new MenuTypeFactory() { @Override public MenuType create(final MenuSupplier supplier) { - return IMenuTypeExtension.create(supplier::create); + return new MenuType<>(supplier::create, FeatureFlags.DEFAULT_FLAGS); + } + }, new ExtendedMenuTypeFactory() { + @Override + public MenuType create(final MenuSupplier supplier, + final StreamCodec + streamCodec) { + return IMenuTypeExtension.create((syncId, inventory, buf) -> { + final D data = streamCodec.decode(buf); + return supplier.create(syncId, inventory, data); + }); } }); menuTypeRegistry.register(eventBus); } + private void registerDataComponents(final IEventBus eventBus) { + final RegistryCallback> callback = new ForgeRegistryCallback<>(dataComponentTypeRegistry); + registerDataComponents(callback); + dataComponentTypeRegistry.register(eventBus); + } + private void registerCapabilities(final RegisterCapabilitiesEvent event) { event.registerBlockEntity( Capabilities.ItemHandler.BLOCK, @@ -462,143 +488,140 @@ public void registerSecurityBlockBreakEvent(final BlockEvent.BreakEvent e) { } @SubscribeEvent - public void registerNetworkPackets(final RegisterPayloadHandlerEvent event) { - final IPayloadRegistrar registrar = event.registrar(MOD_ID); + public void registerNetworkPackets(final RegisterPayloadHandlersEvent event) { + final PayloadRegistrar registrar = event.registrar(MOD_ID); registerServerToClientPackets(registrar); registerClientToServerPackets(registrar); } - private static void registerServerToClientPackets(final IPayloadRegistrar registrar) { - registrar.play( - PacketIds.ENERGY_INFO, - EnergyInfoPacket::decode, - handler -> handler.client(EnergyInfoPacket::handle) - ); - registrar.play( - PacketIds.GRID_ACTIVE, - GridActivePacket::decode, - handler -> handler.client(GridActivePacket::handle) - ); - registrar.play( - PacketIds.GRID_CLEAR, - buf -> new GridClearPacket(), - handler -> handler.client((packet, ctx) -> GridClearPacket.handle(ctx)) - ); - registrar.play( - PacketIds.GRID_UPDATE, - GridUpdatePacket::decode, - handler -> handler.client(GridUpdatePacket::handle) - ); - registrar.play( - PacketIds.NETWORK_TRANSMITTER_STATUS, - NetworkTransmitterStatusPacket::decode, - handler -> handler.client(NetworkTransmitterStatusPacket::handle) - ); - registrar.play( - PacketIds.RESOURCE_SLOT_UPDATE, - ResourceSlotUpdatePacket::decode, - handler -> handler.client(ResourceSlotUpdatePacket::handle) - ); - registrar.play( - PacketIds.STORAGE_INFO_RESPONSE, - StorageInfoResponsePacket::decode, - handler -> handler.client(StorageInfoResponsePacket::handle) - ); - registrar.play( - PacketIds.WIRELESS_TRANSMITTER_RANGE, - WirelessTransmitterRangePacket::decode, - handler -> handler.client(WirelessTransmitterRangePacket::handle) - ); - registrar.play( - PacketIds.NO_PERMISSION, - NoPermissionPacket::decode, - handler -> handler.client(NoPermissionPacket::handle) + private static void registerServerToClientPackets(final PayloadRegistrar registrar) { + registrar.playToClient( + EnergyInfoPacket.PACKET_TYPE, + EnergyInfoPacket.STREAM_CODEC, + wrapHandler(EnergyInfoPacket::handle) + ); + registrar.playToClient( + GridActivePacket.PACKET_TYPE, + GridActivePacket.STREAM_CODEC, + wrapHandler(GridActivePacket::handle) + ); + registrar.playToClient( + GridClearPacket.PACKET_TYPE, + GridClearPacket.STREAM_CODEC, + wrapHandler((packet, ctx) -> GridClearPacket.handle(ctx)) + ); + registrar.playToClient( + GridUpdatePacket.PACKET_TYPE, + GridUpdatePacket.STREAM_CODEC, + wrapHandler(GridUpdatePacket::handle) + ); + registrar.playToClient( + NetworkTransmitterStatusPacket.PACKET_TYPE, + NetworkTransmitterStatusPacket.STREAM_CODEC, + wrapHandler(NetworkTransmitterStatusPacket::handle) + ); + registrar.playToClient( + ResourceSlotUpdatePacket.PACKET_TYPE, + ResourceSlotUpdatePacket.STREAM_CODEC, + wrapHandler(ResourceSlotUpdatePacket::handle) + ); + registrar.playToClient( + StorageInfoResponsePacket.PACKET_TYPE, + StorageInfoResponsePacket.STREAM_CODEC, + wrapHandler((packet, ctx) -> StorageInfoResponsePacket.handle(packet)) + ); + registrar.playToClient( + WirelessTransmitterRangePacket.PACKET_TYPE, + WirelessTransmitterRangePacket.STREAM_CODEC, + wrapHandler(WirelessTransmitterRangePacket::handle) + ); + registrar.playToClient( + NoPermissionPacket.PACKET_TYPE, + NoPermissionPacket.STREAM_CODEC, + wrapHandler((packet, ctx) -> NoPermissionPacket.handle(packet)) ); } - private static void registerClientToServerPackets(final IPayloadRegistrar registrar) { - registrar.play( - PacketIds.CRAFTING_GRID_CLEAR, - CraftingGridClearPacket::decode, - handler -> handler.server(CraftingGridClearPacket::handle) - ); - registrar.play( - PacketIds.CRAFTING_GRID_RECIPE_TRANSFER, - CraftingGridRecipeTransferPacket::decode, - handler -> handler.server(CraftingGridRecipeTransferPacket::handle) - ); - registrar.play( - PacketIds.GRID_EXTRACT, - GridExtractPacket::decode, - handler -> handler.server(GridExtractPacket::handle) - ); - registrar.play( - PacketIds.GRID_INSERT, - GridInsertPacket::decode, - handler -> handler.server(GridInsertPacket::handle) - ); - registrar.play( - PacketIds.GRID_SCROLL, - GridScrollPacket::decode, - handler -> handler.server(GridScrollPacket::handle) - ); - registrar.play( - PacketIds.PROPERTY_CHANGE, - PropertyChangePacket::decode, - handler -> handler.server(PropertyChangePacket::handle) - ); - registrar.play( - PacketIds.RESOURCE_FILTER_SLOT_CHANGE, - ResourceFilterSlotChangePacket::decode, - handler -> handler.server(ResourceFilterSlotChangePacket::handle) - ); - registrar.play( - PacketIds.RESOURCE_SLOT_AMOUNT_CHANGE, - ResourceSlotAmountChangePacket::decode, - handler -> handler.server(ResourceSlotAmountChangePacket::handle) - ); - registrar.play( - PacketIds.RESOURCE_SLOT_CHANGE, - ResourceSlotChangePacket::decode, - handler -> handler.server(ResourceSlotChangePacket::handle) - ); - registrar.play( - PacketIds.SINGLE_AMOUNT_CHANGE, - SingleAmountChangePacket::decode, - handler -> handler.server(SingleAmountChangePacket::handle) - ); - registrar.play( - PacketIds.STORAGE_INFO_REQUEST, - StorageInfoRequestPacket::decode, - handler -> handler.server(StorageInfoRequestPacket::handle) - ); - registrar.play( - PacketIds.USE_NETWORK_BOUND_ITEM, - UseNetworkBoundItemPacket::decode, - handler -> handler.server(UseNetworkBoundItemPacket::handle) - ); - registrar.play( - PacketIds.SECURITY_CARD_PERMISSION, - SecurityCardPermissionPacket::decode, - handler -> handler.server(SecurityCardPermissionPacket::handle) - ); - registrar.play( - PacketIds.SECURITY_CARD_RESET_PERMISSION, - SecurityCardResetPermissionPacket::decode, - handler -> handler.server(SecurityCardResetPermissionPacket::handle) - ); - registrar.play( - PacketIds.SECURITY_CARD_BOUND_PLAYER, - SecurityCardBoundPlayerPacket::decode, - handler -> handler.server(SecurityCardBoundPlayerPacket::handle) + private static void registerClientToServerPackets(final PayloadRegistrar registrar) { + registrar.playToServer( + CraftingGridClearPacket.PACKET_TYPE, + CraftingGridClearPacket.STREAM_CODEC, + wrapHandler(CraftingGridClearPacket::handle) + ); + registrar.playToServer( + CraftingGridRecipeTransferPacket.PACKET_TYPE, + CraftingGridRecipeTransferPacket.STREAM_CODEC, + wrapHandler(CraftingGridRecipeTransferPacket::handle) + ); + registrar.playToServer( + GridExtractPacket.PACKET_TYPE, + GridExtractPacket.STREAM_CODEC, + wrapHandler(GridExtractPacket::handle) + ); + registrar.playToServer( + GridInsertPacket.PACKET_TYPE, + GridInsertPacket.STREAM_CODEC, + wrapHandler(GridInsertPacket::handle) + ); + registrar.playToServer( + GridScrollPacket.PACKET_TYPE, + GridScrollPacket.STREAM_CODEC, + wrapHandler(GridScrollPacket::handle) + ); + registrar.playToServer( + PropertyChangePacket.PACKET_TYPE, + PropertyChangePacket.STREAM_CODEC, + wrapHandler(PropertyChangePacket::handle) + ); + registrar.playToServer( + ResourceSlotAmountChangePacket.PACKET_TYPE, + ResourceSlotAmountChangePacket.STREAM_CODEC, + wrapHandler(ResourceSlotAmountChangePacket::handle) + ); + registrar.playToServer( + ResourceSlotChangePacket.PACKET_TYPE, + ResourceSlotChangePacket.STREAM_CODEC, + wrapHandler(ResourceSlotChangePacket::handle) + ); + registrar.playToServer( + SingleAmountChangePacket.PACKET_TYPE, + SingleAmountChangePacket.STREAM_CODEC, + wrapHandler(SingleAmountChangePacket::handle) + ); + registrar.playToServer( + StorageInfoRequestPacket.PACKET_TYPE, + StorageInfoRequestPacket.STREAM_CODEC, + wrapHandler(StorageInfoRequestPacket::handle) + ); + registrar.playToServer( + UseNetworkBoundItemPacket.PACKET_TYPE, + UseNetworkBoundItemPacket.STREAM_CODEC, + wrapHandler(UseNetworkBoundItemPacket::handle) + ); + registrar.playToServer( + SecurityCardPermissionPacket.PACKET_TYPE, + SecurityCardPermissionPacket.STREAM_CODEC, + wrapHandler(SecurityCardPermissionPacket::handle) + ); + registrar.playToServer( + SecurityCardResetPermissionPacket.PACKET_TYPE, + SecurityCardResetPermissionPacket.STREAM_CODEC, + wrapHandler(SecurityCardResetPermissionPacket::handle) + ); + registrar.playToServer( + SecurityCardBoundPlayerPacket.PACKET_TYPE, + SecurityCardBoundPlayerPacket.STREAM_CODEC, + wrapHandler(SecurityCardBoundPlayerPacket::handle) ); } + private static IPayloadHandler wrapHandler(final PacketHandler handler) { + return (packet, ctx) -> handler.handle(packet, ctx::player); + } + @SubscribeEvent - public void onServerTick(final TickEvent.ServerTickEvent e) { - if (e.phase == TickEvent.Phase.START) { - ServerEventQueue.runQueuedActions(); - } + public void onServerTick(final ServerTickEvent.Pre e) { + ServerEventQueue.runQueuedActions(); } private record ForgeRegistryCallback(DeferredRegister registry) implements RegistryCallback { diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/PlatformImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/PlatformImpl.java index f5a354da3..e994685ab 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/PlatformImpl.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/PlatformImpl.java @@ -15,8 +15,6 @@ import com.refinedmods.refinedstorage2.platform.forge.support.containermenu.ContainerTransferDestination; import com.refinedmods.refinedstorage2.platform.forge.support.containermenu.MenuOpenerImpl; import com.refinedmods.refinedstorage2.platform.forge.support.energy.EnergyStorageAdapter; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s.ClientToServerCommunicationsImpl; -import com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c.ServerToClientCommunicationsImpl; import com.refinedmods.refinedstorage2.platform.forge.support.render.FluidStackFluidRenderer; import java.util.ArrayList; @@ -35,12 +33,11 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; -import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; -import net.minecraft.tags.TagKey; import net.minecraft.world.Container; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -48,10 +45,10 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; @@ -60,7 +57,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import net.neoforged.fml.ModLoadingContext; +import net.neoforged.fml.ModContainer; import net.neoforged.fml.config.ModConfig; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.client.ClientHooks; @@ -77,27 +74,17 @@ import net.neoforged.neoforge.fluids.capability.templates.FluidTank; import net.neoforged.neoforge.items.ItemHandlerHelper; import net.neoforged.neoforge.items.wrapper.InvWrapper; +import net.neoforged.neoforge.network.PacketDistributor; import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.ofFluidStack; import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidStack; public final class PlatformImpl extends AbstractPlatform { - private static final TagKey WRENCH_TAG = TagKey.create( - Registries.ITEM, - new ResourceLocation("forge", "tools/wrench") - ); - private final ConfigImpl config = new ConfigImpl(); - public PlatformImpl() { - super( - new ServerToClientCommunicationsImpl(), - new ClientToServerCommunicationsImpl(), - new MenuOpenerImpl(), - new FluidStackFluidRenderer(), - ItemGridInsertionStrategy::new - ); - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, config.getSpec()); + public PlatformImpl(final ModContainer modContainer) { + super(new MenuOpenerImpl(), new FluidStackFluidRenderer(), ItemGridInsertionStrategy::new); + modContainer.registerConfig(ModConfig.Type.COMMON, config.getSpec()); } @Override @@ -105,11 +92,6 @@ public long getBucketAmount() { return FluidType.BUCKET_VOLUME; } - @Override - public TagKey getWrenchTag() { - return WRENCH_TAG; - } - @Override public Config getConfig() { return config; @@ -200,9 +182,9 @@ public ItemStack getCloneItemStack(final BlockState state, @SuppressWarnings("DataFlowIssue") // NeoForge allows null public NonNullList getRemainingCraftingItems(final Player player, final CraftingRecipe craftingRecipe, - final CraftingContainer container) { + final CraftingInput input) { CommonHooks.setCraftingPlayer(player); - final NonNullList remainingItems = craftingRecipe.getRemainingItems(container); + final NonNullList remainingItems = craftingRecipe.getRemainingItems(input); CommonHooks.setCraftingPlayer(null); return remainingItems; } @@ -330,4 +312,14 @@ public Optional getEnergyStorage(final ItemStack stack) { .map(EnergyStorageAdapter.class::cast) .map(EnergyStorageAdapter::getEnergyStorage); } + + @Override + public void sendPacketToServer(final T packet) { + PacketDistributor.sendToServer(packet); + } + + @Override + public void sendPacketToClient(final ServerPlayer player, final T packet) { + PacketDistributor.sendToPlayer(player, packet); + } } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java index a4f33facc..cca30f1ff 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java @@ -11,7 +11,7 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator.PackGenerator; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod.EventBusSubscriber; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.data.event.GatherDataEvent; @@ -23,17 +23,13 @@ private DataGenerators() { } @SubscribeEvent - public static void onGatherData(final GatherDataEvent dataEvent) { - registerBlockModelProviders(dataEvent.getGenerator(), dataEvent.getExistingFileHelper()); - registerItemModelProviders(dataEvent.getGenerator(), dataEvent.getExistingFileHelper()); - registerBlockStateProviders(dataEvent.getGenerator(), dataEvent.getExistingFileHelper()); - registerLootTableProviders(dataEvent.getGenerator()); - registerRecipeProviders(dataEvent.getGenerator()); - registerTagProviders( - dataEvent.getGenerator(), - dataEvent.getLookupProvider(), - dataEvent.getExistingFileHelper() - ); + public static void onGatherData(final GatherDataEvent e) { + registerBlockModelProviders(e.getGenerator(), e.getExistingFileHelper()); + registerItemModelProviders(e.getGenerator(), e.getExistingFileHelper()); + registerBlockStateProviders(e.getGenerator(), e.getExistingFileHelper()); + registerLootTableProviders(e.getGenerator(), e.getLookupProvider()); + registerRecipeProviders(e.getGenerator(), e.getLookupProvider()); + registerTagProviders(e.getGenerator(), e.getLookupProvider(), e.getExistingFileHelper()); } // this function has to happen after the models, since the jsons refer to files generated there @@ -55,14 +51,16 @@ private static void registerItemModelProviders(final DataGenerator generator, mainPack.addProvider(output -> new ItemModelProviderImpl(output, existingFileHelper)); } - private static void registerLootTableProviders(final DataGenerator generator) { + private static void registerLootTableProviders(final DataGenerator generator, + final CompletableFuture provider) { final PackGenerator mainPack = generator.getVanillaPack(true); - mainPack.addProvider(LootTableProviderImpl::new); + mainPack.addProvider(output -> new LootTableProviderImpl(output, provider)); } - private static void registerRecipeProviders(final DataGenerator generator) { + private static void registerRecipeProviders(final DataGenerator generator, + final CompletableFuture provider) { final PackGenerator mainPack = generator.getVanillaPack(true); - mainPack.addProvider(RecoloringRecipeProvider::new); + mainPack.addProvider(output -> new RecoloringRecipeProvider(output, provider)); } private static void registerTagProviders( diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/ItemModelProviderImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/ItemModelProviderImpl.java index 51f836178..c002fb409 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/ItemModelProviderImpl.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/ItemModelProviderImpl.java @@ -77,7 +77,7 @@ private void registerExternalStorages() { } private void registerControllers() { - final ResourceLocation base = new ResourceLocation("item/generated"); + final ResourceLocation base = ResourceLocation.withDefaultNamespace("item/generated"); final ResourceLocation off = createIdentifier("block/controller/off"); final ResourceLocation nearlyOff = createIdentifier("block/controller/nearly_off"); final ResourceLocation nearlyOn = createIdentifier("block/controller/nearly_on"); diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java index 68ccaf7cf..00647bfaa 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java @@ -7,13 +7,14 @@ import java.util.List; import java.util.Set; +import net.minecraft.core.HolderLookup; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.level.block.Block; public class BlockDropProvider extends BlockLootSubProvider { - public BlockDropProvider() { - super(Set.of(), FeatureFlags.REGISTRY.allFlags()); + public BlockDropProvider(final HolderLookup.Provider provider) { + super(Set.of(), FeatureFlags.REGISTRY.allFlags(), provider); } @Override diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/LootTableProviderImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/LootTableProviderImpl.java index 6db6ee1c8..515e5c71d 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/LootTableProviderImpl.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/LootTableProviderImpl.java @@ -2,16 +2,18 @@ import java.util.List; import java.util.Set; +import java.util.concurrent.CompletableFuture; +import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.loot.LootTableProvider; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; public class LootTableProviderImpl extends LootTableProvider { - public LootTableProviderImpl(final PackOutput output) { + public LootTableProviderImpl(final PackOutput output, final CompletableFuture provider) { super(output, Set.of(), List.of(new SubProviderEntry( BlockDropProvider::new, LootContextParamSets.BLOCK - ))); + )), provider); } } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java index 5049b81da..6649aa3a8 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java @@ -3,6 +3,9 @@ import com.refinedmods.refinedstorage2.platform.common.content.Blocks; import com.refinedmods.refinedstorage2.platform.common.content.Tags; +import java.util.concurrent.CompletableFuture; + +import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.RecipeOutput; @@ -17,8 +20,9 @@ import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; public class RecoloringRecipeProvider extends RecipeProvider { - public RecoloringRecipeProvider(final PackOutput output) { - super(output); + public RecoloringRecipeProvider(final PackOutput output, + final CompletableFuture registries) { + super(output, registries); } @Override diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/CursorItemHandler.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/CursorItemHandler.java index e9a6f9690..40d9f77d0 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/CursorItemHandler.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/CursorItemHandler.java @@ -5,7 +5,6 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.items.IItemHandler; -import net.neoforged.neoforge.items.ItemHandlerHelper; class CursorItemHandler implements IItemHandler { private final AbstractContainerMenu containerMenu; @@ -57,7 +56,7 @@ private ItemStack insertIntoCursorWithExistingContent(final ItemStack itemStack, if (!simulate) { containerMenu.getCarried().grow(toInsert); } - return ItemHandlerHelper.copyStackWithSize(itemStack, remainder); + return itemStack.copyWithCount(remainder); } @Override @@ -70,7 +69,7 @@ public ItemStack extractItem(final int slot, final int amount, final boolean sim return ItemStack.EMPTY; } final int extracted = Math.min(containerMenu.getCarried().getCount(), amount); - final ItemStack extractedStack = ItemHandlerHelper.copyStackWithSize(containerMenu.getCarried(), extracted); + final ItemStack extractedStack = containerMenu.getCarried().copyWithCount(extracted); if (!simulate) { containerMenu.getCarried().shrink(extracted); } @@ -88,6 +87,6 @@ public boolean isItemValid(final int slot, @Nonnull final ItemStack stack) { } private boolean isSame(final ItemStack a, final ItemStack b) { - return ItemStack.isSameItemSameTags(a, b); + return ItemStack.isSameItemSameComponents(a, b); } } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridExtractionStrategy.java index dfcea5ddd..7ceb604d2 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridExtractionStrategy.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridExtractionStrategy.java @@ -29,7 +29,7 @@ import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidStack; public class FluidGridExtractionStrategy implements GridExtractionStrategy { - private static final ItemResource BUCKET_ITEM_RESOURCE = new ItemResource(Items.BUCKET, null); + private static final ItemResource BUCKET_ITEM_RESOURCE = new ItemResource(Items.BUCKET); private final AbstractContainerMenu menu; private final GridOperations gridOperations; @@ -148,6 +148,6 @@ private void insertBucket(final IItemHandler destination) { } private boolean isSame(final ItemStack a, final ItemStack b) { - return ItemStack.isSameItemSameTags(a, b); + return ItemStack.isSameItemSameComponents(a, b); } } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridInsertionStrategy.java index 326f7836d..567c5180e 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridInsertionStrategy.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridInsertionStrategy.java @@ -38,7 +38,7 @@ public boolean onInsert(final GridInsertMode insertMode, final boolean tryAltern if (carried.isEmpty()) { return false; } - final ItemResource itemResource = new ItemResource(carried.getItem(), carried.getTag()); + final ItemResource itemResource = ItemResource.ofItemStack(carried); gridOperations.insert( itemResource, insertMode, diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeFluidGridResourceFactory.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeFluidGridResourceFactory.java index 1ab14c5d6..b2e5f8ac1 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeFluidGridResourceFactory.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeFluidGridResourceFactory.java @@ -25,6 +25,6 @@ protected String getModName(final String modId) { @Override protected String getName(final FluidResource fluidResource) { - return toFluidStack(fluidResource, FluidType.BUCKET_VOLUME).getDisplayName().getString(); + return toFluidStack(fluidResource, FluidType.BUCKET_VOLUME).getHoverName().getString(); } } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/DiskContainerItemOverrides.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/DiskContainerItemOverrides.java index f08602694..0bc957c53 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/DiskContainerItemOverrides.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/DiskContainerItemOverrides.java @@ -19,11 +19,11 @@ import net.minecraft.client.renderer.block.model.ItemOverrides; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.core.component.DataComponents; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; import org.joml.Vector3f; public class DiskContainerItemOverrides extends ItemOverrides { @@ -56,18 +56,23 @@ public DiskContainerItemOverrides(final LoadingCache> blockCa @Nullable @Override + @SuppressWarnings("deprecation") public BakedModel resolve(final BakedModel bakedModel, final ItemStack stack, @Nullable final ClientLevel level, @Nullable final LivingEntity entity, final int seed) { - final CompoundTag tag = BlockItem.getBlockEntityData(stack); - if (tag == null) { + final CustomData customData = stack.get(DataComponents.BLOCK_ENTITY_DATA); + if (customData == null || level == null) { return originalModel.getOverrides().resolve(bakedModel, stack, level, entity, seed); } final Disk[] disks = new Disk[diskTranslations.length]; for (int i = 0; i < diskTranslations.length; ++i) { - final Item diskItem = AbstractDiskContainerBlockEntity.getDisk(tag, i); + final Item diskItem = AbstractDiskContainerBlockEntity.getDisk( + customData.getUnsafe(), + i, + level.registryAccess() + ); disks[i] = new Disk(diskItem, diskItem == null ? StorageState.NONE : StorageState.INACTIVE); } return cache.getUnchecked(cacheKeyFactory.apply(disks)); diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ForgeHandlerUtil.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ForgeHandlerUtil.java index 3b0b27fb3..648cab491 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ForgeHandlerUtil.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ForgeHandlerUtil.java @@ -17,7 +17,7 @@ static long getCurrentAmount(final IItemHandler itemHandler, final ItemStack sta long amount = 0; for (int i = 0; i < itemHandler.getSlots(); ++i) { final ItemStack slot = itemHandler.getStackInSlot(i); - if (ItemStack.isSameItemSameTags(slot, stack)) { + if (ItemStack.isSameItemSameComponents(slot, stack)) { amount += slot.getCount(); } } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerExtractableStorage.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerExtractableStorage.java index 41756c205..9ffc1d0ad 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerExtractableStorage.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerExtractableStorage.java @@ -45,7 +45,10 @@ private long doExtract(final long amount, final ItemStack toExtractStack) { long extracted = 0; for (int slot = 0; slot < itemHandler.getSlots(); ++slot) { - final boolean relevant = ItemStack.isSameItemSameTags(itemHandler.getStackInSlot(slot), toExtractStack); + final boolean relevant = ItemStack.isSameItemSameComponents( + itemHandler.getStackInSlot(slot), + toExtractStack + ); if (!relevant) { continue; } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveUnbakedGeometry.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveUnbakedGeometry.java index 1a394efc8..31668973c 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveUnbakedGeometry.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveUnbakedGeometry.java @@ -42,8 +42,7 @@ public BakedModel bake(final IGeometryBakingContext context, final ModelBaker baker, final Function spriteGetter, final ModelState modelState, - final ItemOverrides overrides, - final ResourceLocation modelLocation) { + final ItemOverrides overrides) { return new DiskDriveBakedModel( requireNonNull(baker.bake(BASE_MODEL, modelState, spriteGetter)), new RotationTranslationModelBaker(modelState, baker, spriteGetter, BASE_MODEL), diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java index 8e5065ed3..9b51c3e2f 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java @@ -47,8 +47,7 @@ public BakedModel bake(final IGeometryBakingContext context, final ModelBaker baker, final Function spriteGetter, final ModelState modelState, - final ItemOverrides overrides, - final ResourceLocation modelLocation) { + final ItemOverrides overrides) { return new DiskInterfaceBakedModel( requireNonNull(baker.bake(baseModel, modelState, spriteGetter)), new RotationTranslationModelBaker(modelState, baker, spriteGetter, INACTIVE_MODEL), diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java index 5c259bb6e..79365c6a3 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java @@ -117,6 +117,9 @@ public BakedModel resolve(final BakedModel bakedModel, @Nullable final ClientLevel level, @Nullable final LivingEntity entity, final int seed) { + if (level == null) { + return null; + } final PortableGridBlockItemRenderInfo renderInfo = PortableGridBlockItem.getRenderInfo(stack, level); return itemCache.getUnchecked(new CacheKey( null, diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridUnbakedGeometry.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridUnbakedGeometry.java index e30b9a1a8..9463fb525 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridUnbakedGeometry.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridUnbakedGeometry.java @@ -50,8 +50,7 @@ public BakedModel bake(final IGeometryBakingContext context, final ModelBaker baker, final Function spriteGetter, final ModelState modelState, - final ItemOverrides overrides, - final ResourceLocation modelLocation) { + final ItemOverrides overrides) { return new PortableGridBakedModel( requireNonNull(baker.bake(INACTIVE_MODEL, modelState, spriteGetter)), new RotationTranslationModelBaker(modelState, baker, spriteGetter, ACTIVE_MODEL), diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/MenuOpenerImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/MenuOpenerImpl.java index 0dfef840c..c4c5ef686 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/MenuOpenerImpl.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/MenuOpenerImpl.java @@ -9,10 +9,18 @@ public class MenuOpenerImpl implements MenuOpener { @Override public void openMenu(final ServerPlayer player, final MenuProvider menuProvider) { - if (menuProvider instanceof ExtendedMenuProvider extendedMenuProvider) { - player.openMenu(menuProvider, buf -> extendedMenuProvider.writeScreenOpeningData(player, buf)); + if (menuProvider instanceof ExtendedMenuProvider extendedMenuProvider) { + openExtendedMenu(player, extendedMenuProvider); } else { player.openMenu(menuProvider); } } + + private static void openExtendedMenu(final ServerPlayer player, + final ExtendedMenuProvider extendedMenuProvider) { + player.openMenu( + extendedMenuProvider, + buf -> extendedMenuProvider.getMenuCodec().encode(buf, extendedMenuProvider.getMenuData()) + ); + } } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ClientToServerCommunicationsImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ClientToServerCommunicationsImpl.java deleted file mode 100644 index d5944e233..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ClientToServerCommunicationsImpl.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.support.ClientToServerCommunications; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; - -import java.util.List; -import java.util.UUID; - -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.neoforged.neoforge.network.PacketDistributor; - -public class ClientToServerCommunicationsImpl implements ClientToServerCommunications { - private void sendToServer(final CustomPacketPayload packet) { - PacketDistributor.SERVER.noArg().send(packet); - } - - @Override - public void sendGridExtract(final PlatformResourceKey resource, - final GridExtractMode mode, - final boolean cursor) { - final ResourceType resourceType = resource.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresent(id -> sendToServer( - new GridExtractPacket(resourceType, id, resource, mode, cursor) - )); - } - - @Override - public void sendGridScroll(final PlatformResourceKey resource, - final GridScrollMode mode, - final int slotIndex) { - final ResourceType resourceType = resource.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresent(id -> sendToServer( - new GridScrollPacket(resourceType, id, resource, mode, slotIndex) - )); - } - - @Override - public void sendGridInsert(final GridInsertMode mode, final boolean tryAlternatives) { - sendToServer(new GridInsertPacket(mode == GridInsertMode.SINGLE_RESOURCE, tryAlternatives)); - } - - @Override - public void sendCraftingGridClear(final boolean toPlayerInventory) { - sendToServer(new CraftingGridClearPacket(toPlayerInventory)); - } - - @Override - public void sendCraftingGridRecipeTransfer(final List> recipe) { - sendToServer(new CraftingGridRecipeTransferPacket(recipe)); - } - - @Override - public void sendPropertyChange(final PropertyType type, final T value) { - sendToServer(new PropertyChangePacket(type.id(), type.serializer().apply(value))); - } - - @Override - public void sendStorageInfoRequest(final UUID storageId) { - sendToServer(new StorageInfoRequestPacket(storageId)); - } - - @Override - public void sendResourceSlotChange(final int slotIndex, final boolean tryAlternatives) { - sendToServer(new ResourceSlotChangePacket(slotIndex, tryAlternatives)); - } - - @Override - public void sendResourceFilterSlotChange(final PlatformResourceKey resource, final int slotIndex) { - final ResourceType resourceType = resource.getResourceType(); - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resourceType).ifPresent(id -> sendToServer( - new ResourceFilterSlotChangePacket(slotIndex, resource, resourceType, id) - )); - } - - @Override - public void sendResourceSlotAmountChange(final int slotIndex, final long amount) { - sendToServer(new ResourceSlotAmountChangePacket(slotIndex, amount)); - } - - @Override - public void sendSingleAmountChange(final double amount) { - sendToServer(new SingleAmountChangePacket(amount)); - } - - @Override - public void sendUseNetworkBoundItem(final SlotReference slotReference) { - sendToServer(new UseNetworkBoundItemPacket(slotReference)); - } - - @Override - public void sendSecurityCardPermission(final PlatformPermission permission, final boolean allowed) { - PlatformApi.INSTANCE.getPermissionRegistry().getId(permission).ifPresent(id -> sendToServer( - new SecurityCardPermissionPacket(id, allowed) - )); - } - - @Override - public void sendSecurityCardResetPermission(final PlatformPermission permission) { - PlatformApi.INSTANCE.getPermissionRegistry().getId(permission).ifPresent(id -> sendToServer( - new SecurityCardResetPermissionPacket(id) - )); - } - - @Override - public void sendSecurityCardBoundPlayer(final UUID playerId) { - sendToServer(new SecurityCardBoundPlayerPacket(playerId)); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/CraftingGridClearPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/CraftingGridClearPacket.java deleted file mode 100644 index 1f856b6fc..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/CraftingGridClearPacket.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record CraftingGridClearPacket(boolean toPlayerInventory) implements CustomPacketPayload { - public static CraftingGridClearPacket decode(final FriendlyByteBuf buf) { - return new CraftingGridClearPacket(buf.readBoolean()); - } - - public static void handle(final CraftingGridClearPacket packet, final PlayPayloadContext context) { - context.player().ifPresent(player -> context.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof CraftingGridContainerMenu craftingGridContainerMenu) { - craftingGridContainerMenu.clear(packet.toPlayerInventory()); - } - })); - } - - @Override - public void write(final FriendlyByteBuf friendlyByteBuf) { - friendlyByteBuf.writeBoolean(toPlayerInventory); - } - - @Override - public ResourceLocation id() { - return PacketIds.CRAFTING_GRID_CLEAR; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/CraftingGridRecipeTransferPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/CraftingGridRecipeTransferPacket.java deleted file mode 100644 index 6fcd9799b..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/CraftingGridRecipeTransferPacket.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.util.PacketUtil; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record CraftingGridRecipeTransferPacket(List> recipe) implements CustomPacketPayload { - public static CraftingGridRecipeTransferPacket decode(final FriendlyByteBuf buf) { - final int slots = buf.readInt(); - final List> recipe = new ArrayList<>(slots); - for (int i = 0; i < slots; ++i) { - final int slotPossibilityCount = buf.readInt(); - final List slotPossibilities = new ArrayList<>(slotPossibilityCount); - for (int j = 0; j < slotPossibilityCount; ++j) { - slotPossibilities.add(PacketUtil.readItemResource(buf)); - } - recipe.add(slotPossibilities); - } - return new CraftingGridRecipeTransferPacket(recipe); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeInt(recipe.size()); - for (final List slotPossibilities : recipe) { - buf.writeInt(slotPossibilities.size()); - for (final ItemResource slotPossibility : slotPossibilities) { - slotPossibility.toBuffer(buf); - } - } - } - - public static void handle(final CraftingGridRecipeTransferPacket packet, final PlayPayloadContext context) { - context.player().ifPresent(player -> context.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof CraftingGridContainerMenu craftingGridContainerMenu) { - craftingGridContainerMenu.transferRecipe(packet.recipe()); - } - })); - } - - @Override - public ResourceLocation id() { - return PacketIds.CRAFTING_GRID_RECIPE_TRANSFER; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridExtractPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridExtractPacket.java deleted file mode 100644 index 7bee58044..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridExtractPacket.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record GridExtractPacket( - ResourceType resourceType, - ResourceLocation resourceTypeId, - PlatformResourceKey resource, - GridExtractMode mode, - boolean cursor -) implements CustomPacketPayload { - public static GridExtractPacket decode(final FriendlyByteBuf buf) { - final ResourceLocation resourceTypeId = buf.readResourceLocation(); - final ResourceType resourceType = PlatformApi.INSTANCE - .getResourceTypeRegistry() - .get(resourceTypeId) - .orElseThrow(); - final GridExtractMode mode = getMode(buf.readByte()); - final boolean cursor = buf.readBoolean(); - final PlatformResourceKey resource = resourceType.fromBuffer(buf); - return new GridExtractPacket( - resourceType, - resourceTypeId, - resource, - mode, - cursor - ); - } - - public static void handle(final GridExtractPacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof GridExtractionStrategy strategy) { - strategy.onExtract(packet.resource, packet.mode, packet.cursor); - } - })); - } - - private static GridExtractMode getMode(final byte mode) { - if (mode == 0) { - return GridExtractMode.ENTIRE_RESOURCE; - } - return GridExtractMode.HALF_RESOURCE; - } - - public static void writeMode(final FriendlyByteBuf buf, final GridExtractMode mode) { - if (mode == GridExtractMode.ENTIRE_RESOURCE) { - buf.writeByte(0); - } else { - buf.writeByte(1); - } - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeResourceLocation(resourceTypeId); - writeMode(buf, mode); - buf.writeBoolean(cursor); - resource.toBuffer(buf); - } - - @Override - public ResourceLocation id() { - return PacketIds.GRID_EXTRACT; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridInsertPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridInsertPacket.java deleted file mode 100644 index 11dd710b7..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridInsertPacket.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record GridInsertPacket(boolean single, boolean tryAlternatives) implements CustomPacketPayload { - public static GridInsertPacket decode(final FriendlyByteBuf buf) { - return new GridInsertPacket(buf.readBoolean(), buf.readBoolean()); - } - - public static void handle(final GridInsertPacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof GridInsertionStrategy strategy) { - final GridInsertMode mode = packet.single - ? GridInsertMode.SINGLE_RESOURCE - : GridInsertMode.ENTIRE_RESOURCE; - strategy.onInsert(mode, packet.tryAlternatives); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeBoolean(single); - buf.writeBoolean(tryAlternatives); - } - - @Override - public ResourceLocation id() { - return PacketIds.GRID_INSERT; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridScrollPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridScrollPacket.java deleted file mode 100644 index 5c4ee0e9a..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/GridScrollPacket.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record GridScrollPacket( - ResourceType resourceType, - ResourceLocation resourceTypeId, - PlatformResourceKey resource, - GridScrollMode mode, - int slotIndex -) implements CustomPacketPayload { - public static GridScrollPacket decode(final FriendlyByteBuf buf) { - final ResourceLocation resourceTypeId = buf.readResourceLocation(); - final ResourceType resourceType = PlatformApi.INSTANCE - .getResourceTypeRegistry() - .get(resourceTypeId) - .orElseThrow(); - final GridScrollMode mode = getMode(buf.readByte()); - final int slotIndex = buf.readInt(); - final PlatformResourceKey resource = resourceType.fromBuffer(buf); - return new GridScrollPacket( - resourceType, - resourceTypeId, - resource, - mode, - slotIndex - ); - } - - public static void handle(final GridScrollPacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof GridScrollingStrategy strategy) { - strategy.onScroll(packet.resource, packet.mode, packet.slotIndex); - } - })); - } - - private static GridScrollMode getMode(final byte mode) { - if (mode == 0) { - return GridScrollMode.GRID_TO_INVENTORY; - } else if (mode == 1) { - return GridScrollMode.GRID_TO_CURSOR; - } - return GridScrollMode.INVENTORY_TO_GRID; - } - - private static void writeMode(final FriendlyByteBuf buf, final GridScrollMode mode) { - switch (mode) { - case GRID_TO_INVENTORY -> buf.writeByte(0); - case GRID_TO_CURSOR -> buf.writeByte(1); - case INVENTORY_TO_GRID -> buf.writeByte(2); - } - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeResourceLocation(resourceTypeId); - writeMode(buf, mode); - buf.writeInt(slotIndex); - resource.toBuffer(buf); - } - - @Override - public ResourceLocation id() { - return PacketIds.GRID_SCROLL; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/PropertyChangePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/PropertyChangePacket.java deleted file mode 100644 index c2beb3d1a..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/PropertyChangePacket.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record PropertyChangePacket(ResourceLocation propertyId, int value) implements CustomPacketPayload { - public static PropertyChangePacket decode(final FriendlyByteBuf buf) { - return new PropertyChangePacket(buf.readResourceLocation(), buf.readInt()); - } - - public static void handle(final PropertyChangePacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof AbstractBaseContainerMenu menu) { - menu.receivePropertyChangeFromClient(packet.propertyId, packet.value); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeResourceLocation(propertyId); - buf.writeInt(value); - } - - @Override - public ResourceLocation id() { - return PacketIds.PROPERTY_CHANGE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceFilterSlotChangePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceFilterSlotChangePacket.java deleted file mode 100644 index fc73cf246..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceFilterSlotChangePacket.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import javax.annotation.Nullable; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -import static java.util.Objects.requireNonNull; - -public record ResourceFilterSlotChangePacket( - int slotIndex, - @Nullable - PlatformResourceKey resource, - @Nullable - ResourceType resourceType, - @Nullable - ResourceLocation resourceTypeId -) implements CustomPacketPayload { - public static ResourceFilterSlotChangePacket decode(final FriendlyByteBuf buf) { - final int slotIndex = buf.readInt(); - final ResourceLocation resourceTypeId = buf.readResourceLocation(); - return PlatformApi.INSTANCE.getResourceTypeRegistry().get(resourceTypeId) - .map(resourceType -> decode(buf, slotIndex, resourceType, resourceTypeId)) - .orElseGet(() -> new ResourceFilterSlotChangePacket(slotIndex, null, null, resourceTypeId)); - } - - private static ResourceFilterSlotChangePacket decode(final FriendlyByteBuf buf, - final int slotIndex, - final ResourceType type, - final ResourceLocation typeId) { - final PlatformResourceKey resource = type.fromBuffer(buf); - return new ResourceFilterSlotChangePacket(slotIndex, resource, type, typeId); - } - - public static void handle(final ResourceFilterSlotChangePacket packet, - final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof AbstractResourceContainerMenu containerMenu) { - containerMenu.handleResourceFilterSlotUpdate(packet.slotIndex, requireNonNull(packet.resource)); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeInt(slotIndex); - buf.writeResourceLocation(requireNonNull(resourceTypeId)); - requireNonNull(resource).toBuffer(buf); - } - - @Override - public ResourceLocation id() { - return PacketIds.RESOURCE_FILTER_SLOT_CHANGE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceSlotAmountChangePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceSlotAmountChangePacket.java deleted file mode 100644 index 2f73419a7..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceSlotAmountChangePacket.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record ResourceSlotAmountChangePacket(int slotIndex, long amount) implements CustomPacketPayload { - public static ResourceSlotAmountChangePacket decode(final FriendlyByteBuf buf) { - return new ResourceSlotAmountChangePacket(buf.readInt(), buf.readLong()); - } - - public static void handle(final ResourceSlotAmountChangePacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof AbstractResourceContainerMenu containerMenu) { - containerMenu.handleResourceSlotAmountChange(packet.slotIndex, packet.amount); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeInt(slotIndex); - buf.writeLong(amount); - } - - @Override - public ResourceLocation id() { - return PacketIds.RESOURCE_SLOT_AMOUNT_CHANGE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceSlotChangePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceSlotChangePacket.java deleted file mode 100644 index 9c03ffeea..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/ResourceSlotChangePacket.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record ResourceSlotChangePacket(int slotIndex, boolean tryAlternatives) implements CustomPacketPayload { - public static ResourceSlotChangePacket decode(final FriendlyByteBuf buf) { - return new ResourceSlotChangePacket(buf.readInt(), buf.readBoolean()); - } - - public static void handle(final ResourceSlotChangePacket packet, - final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof AbstractResourceContainerMenu containerMenu) { - containerMenu.handleResourceSlotChange(packet.slotIndex, packet.tryAlternatives); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeInt(slotIndex); - buf.writeBoolean(tryAlternatives); - } - - @Override - public ResourceLocation id() { - return PacketIds.RESOURCE_SLOT_CHANGE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardBoundPlayerPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardBoundPlayerPacket.java deleted file mode 100644 index 686cec4c5..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardBoundPlayerPacket.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import java.util.UUID; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record SecurityCardBoundPlayerPacket(UUID playerId) implements CustomPacketPayload { - public static SecurityCardBoundPlayerPacket decode(final FriendlyByteBuf buf) { - return new SecurityCardBoundPlayerPacket(buf.readUUID()); - } - - public static void handle(final SecurityCardBoundPlayerPacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.getServer() == null) { - return; - } - if (player.containerMenu instanceof SecurityCardContainerMenu securityCardContainerMenu) { - securityCardContainerMenu.setBoundPlayer(player.getServer(), packet.playerId); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeUUID(playerId); - } - - @Override - public ResourceLocation id() { - return PacketIds.SECURITY_CARD_BOUND_PLAYER; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardPermissionPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardPermissionPacket.java deleted file mode 100644 index 16a8f5353..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardPermissionPacket.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.security.AbstractSecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record SecurityCardPermissionPacket(ResourceLocation permissionId, boolean allowed) - implements CustomPacketPayload { - public static SecurityCardPermissionPacket decode(final FriendlyByteBuf buf) { - return new SecurityCardPermissionPacket(buf.readResourceLocation(), buf.readBoolean()); - } - - public static void handle(final SecurityCardPermissionPacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { - securityCardContainerMenu.setPermission(packet.permissionId, packet.allowed); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeResourceLocation(permissionId); - buf.writeBoolean(allowed); - } - - @Override - public ResourceLocation id() { - return PacketIds.SECURITY_CARD_PERMISSION; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardResetPermissionPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardResetPermissionPacket.java deleted file mode 100644 index 1831a87a1..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SecurityCardResetPermissionPacket.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.security.AbstractSecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record SecurityCardResetPermissionPacket(ResourceLocation permissionId) implements CustomPacketPayload { - public static SecurityCardResetPermissionPacket decode(final FriendlyByteBuf buf) { - return new SecurityCardResetPermissionPacket(buf.readResourceLocation()); - } - - public static void handle(final SecurityCardResetPermissionPacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { - securityCardContainerMenu.resetPermission(packet.permissionId); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeResourceLocation(permissionId); - } - - @Override - public ResourceLocation id() { - return PacketIds.SECURITY_CARD_RESET_PERMISSION; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SingleAmountChangePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SingleAmountChangePacket.java deleted file mode 100644 index 52e6e3213..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/SingleAmountChangePacket.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record SingleAmountChangePacket(double amount) implements CustomPacketPayload { - public static SingleAmountChangePacket decode(final FriendlyByteBuf buf) { - return new SingleAmountChangePacket(buf.readDouble()); - } - - public static void handle(final SingleAmountChangePacket packet, final PlayPayloadContext context) { - context.player().ifPresent(player -> context.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof AbstractSingleAmountContainerMenu singleAmountContainerMenu) { - singleAmountContainerMenu.changeAmountOnServer(packet.amount()); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeDouble(amount); - } - - @Override - public ResourceLocation id() { - return PacketIds.SINGLE_AMOUNT_CHANGE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/StorageInfoRequestPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/StorageInfoRequestPacket.java deleted file mode 100644 index a19cd1f10..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/c2s/StorageInfoRequestPacket.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import java.util.UUID; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerPlayer; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record StorageInfoRequestPacket(UUID storageId) implements CustomPacketPayload { - public static StorageInfoRequestPacket decode(final FriendlyByteBuf buf) { - return new StorageInfoRequestPacket(buf.readUUID()); - } - - public static void handle(final StorageInfoRequestPacket packet, final PlayPayloadContext context) { - context.player().ifPresent(player -> context.workHandler().submitAsync(() -> { - final StorageInfo info = PlatformApi.INSTANCE - .getStorageRepository(player.getCommandSenderWorld()) - .getInfo(packet.storageId()); - Platform.INSTANCE.getServerToClientCommunications().sendStorageInfoResponse( - (ServerPlayer) player, - packet.storageId(), - info - ); - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeUUID(storageId); - } - - @Override - public ResourceLocation id() { - return PacketIds.STORAGE_INFO_REQUEST; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/EnergyInfoPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/EnergyInfoPacket.java deleted file mode 100644 index 9fa311980..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/EnergyInfoPacket.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record EnergyInfoPacket(long stored, long capacity) implements CustomPacketPayload { - public static EnergyInfoPacket decode(final FriendlyByteBuf buf) { - return new EnergyInfoPacket(buf.readLong(), buf.readLong()); - } - - public static void handle(final EnergyInfoPacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof EnergyContainerMenu energy) { - energy.getEnergyInfo().setEnergy(packet.stored, packet.capacity); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeLong(stored); - buf.writeLong(capacity); - } - - @Override - public ResourceLocation id() { - return PacketIds.ENERGY_INFO; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridActivePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridActivePacket.java deleted file mode 100644 index 9be4a20b0..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridActivePacket.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record GridActivePacket(boolean active) implements CustomPacketPayload { - public static GridActivePacket decode(final FriendlyByteBuf buf) { - return new GridActivePacket(buf.readBoolean()); - } - - public static void handle(final GridActivePacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof GridWatcher gridWatcher) { - gridWatcher.onActiveChanged(packet.active); - } - })); - } - - @Override - public void write(final FriendlyByteBuf friendlyByteBuf) { - friendlyByteBuf.writeBoolean(active); - } - - @Override - public ResourceLocation id() { - return PacketIds.GRID_ACTIVE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridClearPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridClearPacket.java deleted file mode 100644 index 5728cbaff..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridClearPacket.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public class GridClearPacket implements CustomPacketPayload { - public static void handle(final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof AbstractGridContainerMenu grid) { - grid.onClear(); - } - })); - } - - @Override - public void write(final FriendlyByteBuf friendlyByteBuf) { - // no op - } - - @Override - public ResourceLocation id() { - return PacketIds.GRID_CLEAR; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridUpdatePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridUpdatePacket.java deleted file mode 100644 index 95257c1fd..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/GridUpdatePacket.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; -import com.refinedmods.refinedstorage2.platform.common.util.PacketUtil; - -import javax.annotation.Nullable; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record GridUpdatePacket( - ResourceLocation resourceTypeId, - PlatformResourceKey resource, - long amount, - @Nullable TrackedResource trackedResource -) implements CustomPacketPayload { - public static GridUpdatePacket decode(final FriendlyByteBuf buf) { - final ResourceLocation resourceTypeId = buf.readResourceLocation(); - final ResourceType resourceType = PlatformApi.INSTANCE - .getResourceTypeRegistry() - .get(resourceTypeId) - .orElseThrow(); - final PlatformResourceKey resource = resourceType.fromBuffer(buf); - final long amount = buf.readLong(); - final TrackedResource trackedResource = PacketUtil.readTrackedResource(buf); - return new GridUpdatePacket( - resourceTypeId, - resource, - amount, - trackedResource - ); - } - - public static void handle(final GridUpdatePacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof AbstractGridContainerMenu containerMenu) { - containerMenu.onResourceUpdate(packet.resource, packet.amount, packet.trackedResource); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeResourceLocation(resourceTypeId); - resource.toBuffer(buf); - buf.writeLong(amount); - PacketUtil.writeTrackedResource(buf, trackedResource); - } - - @Override - public ResourceLocation id() { - return PacketIds.GRID_UPDATE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/NetworkTransmitterStatusPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/NetworkTransmitterStatusPacket.java deleted file mode 100644 index ace9ee7f7..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/NetworkTransmitterStatusPacket.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterStatus; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record NetworkTransmitterStatusPacket(boolean error, Component message) implements CustomPacketPayload { - public static NetworkTransmitterStatusPacket decode(final FriendlyByteBuf buf) { - return new NetworkTransmitterStatusPacket(buf.readBoolean(), buf.readComponent()); - } - - public static void handle(final NetworkTransmitterStatusPacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - final AbstractContainerMenu menu = player.containerMenu; - if (menu instanceof NetworkTransmitterContainerMenu containerMenu) { - containerMenu.setStatus(new NetworkTransmitterStatus(packet.error, packet.message)); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeBoolean(error); - buf.writeComponent(message); - } - - @Override - public ResourceLocation id() { - return PacketIds.NETWORK_TRANSMITTER_STATUS; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/NoPermissionPacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/NoPermissionPacket.java deleted file mode 100644 index b0afbb025..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/NoPermissionPacket.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; -import com.refinedmods.refinedstorage2.platform.common.util.SecurityToastHelper; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record NoPermissionPacket(Component component) implements CustomPacketPayload { - public static NoPermissionPacket decode(final FriendlyByteBuf buf) { - return new NoPermissionPacket(buf.readComponent()); - } - - public static void handle(final NoPermissionPacket packet, final PlayPayloadContext ctx) { - ctx.workHandler().submitAsync(() -> SecurityToastHelper.addNoPermissionToast(packet.component)); - } - - @Override - public void write(final FriendlyByteBuf friendlyByteBuf) { - friendlyByteBuf.writeComponent(component); - } - - @Override - public ResourceLocation id() { - return PacketIds.NO_PERMISSION; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/ResourceSlotUpdatePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/ResourceSlotUpdatePacket.java deleted file mode 100644 index be78e9d68..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/ResourceSlotUpdatePacket.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import javax.annotation.Nullable; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record ResourceSlotUpdatePacket( - int slotIndex, - @Nullable ResourceAmount resourceAmount, - @Nullable ResourceLocation resourceTypeId -) implements CustomPacketPayload { - public static ResourceSlotUpdatePacket decode(final FriendlyByteBuf buf) { - final int slotIndex = buf.readInt(); - final boolean present = buf.readBoolean(); - if (!present) { - return new ResourceSlotUpdatePacket(slotIndex, null, null); - } - final ResourceLocation resourceTypeId = buf.readResourceLocation(); - return PlatformApi.INSTANCE.getResourceTypeRegistry().get(resourceTypeId).map( - resourceType -> decode(buf, slotIndex, resourceType) - ).orElseGet(() -> new ResourceSlotUpdatePacket(slotIndex, null, null)); - } - - private static ResourceSlotUpdatePacket decode(final FriendlyByteBuf buf, - final int slotIndex, - final ResourceType type) { - final PlatformResourceKey resource = type.fromBuffer(buf); - final long amount = buf.readLong(); - return new ResourceSlotUpdatePacket(slotIndex, new ResourceAmount(resource, amount), null); - } - - public static void handle(final ResourceSlotUpdatePacket packet, - final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof AbstractResourceContainerMenu containerMenu) { - containerMenu.handleResourceSlotUpdate(packet.slotIndex, packet.resourceAmount); - } - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeInt(slotIndex); - final boolean present = resourceAmount != null && resourceTypeId != null; - buf.writeBoolean(present); - if (present) { - buf.writeResourceLocation(resourceTypeId); - ((PlatformResourceKey) resourceAmount.getResource()).toBuffer(buf); - buf.writeLong(resourceAmount.getAmount()); - } - } - - @Override - public ResourceLocation id() { - return PacketIds.RESOURCE_SLOT_UPDATE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/ServerToClientCommunicationsImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/ServerToClientCommunicationsImpl.java deleted file mode 100644 index a57560624..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/ServerToClientCommunicationsImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterStatus; -import com.refinedmods.refinedstorage2.platform.common.support.ServerToClientCommunications; - -import java.util.UUID; -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.server.level.ServerPlayer; -import net.neoforged.neoforge.network.PacketDistributor; - -public class ServerToClientCommunicationsImpl implements ServerToClientCommunications { - private void sendToPlayer(final ServerPlayer player, final CustomPacketPayload packet) { - PacketDistributor.PLAYER.with(player).send(packet); - } - - @Override - public void sendEnergyInfo(final ServerPlayer player, final long stored, final long capacity) { - sendToPlayer(player, new EnergyInfoPacket(stored, capacity)); - } - - @Override - public void sendWirelessTransmitterRange(final ServerPlayer player, final int range) { - sendToPlayer(player, new WirelessTransmitterRangePacket(range)); - } - - @Override - public void sendGridActiveness(final ServerPlayer player, final boolean active) { - sendToPlayer(player, new GridActivePacket(active)); - } - - @Override - public void sendGridUpdate(final ServerPlayer player, - final PlatformResourceKey resource, - final long change, - @Nullable final TrackedResource trackedResource) { - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(resource.getResourceType()) - .ifPresent(id -> sendToPlayer(player, new GridUpdatePacket( - id, - resource, - change, - trackedResource - ))); - } - - @Override - public void sendGridClear(final ServerPlayer player) { - sendToPlayer(player, new GridClearPacket()); - } - - @Override - public void sendResourceSlotUpdate(final ServerPlayer player, - @Nullable final ResourceAmount resourceAmount, - final int slotIndex) { - if (resourceAmount != null && resourceAmount.getResource() instanceof PlatformResourceKey platformResource) { - PlatformApi.INSTANCE.getResourceTypeRegistry().getId(platformResource.getResourceType()) - .ifPresent(id -> sendToPlayer(player, new ResourceSlotUpdatePacket( - slotIndex, - resourceAmount, - id - ))); - } else { - sendToPlayer(player, new ResourceSlotUpdatePacket( - slotIndex, - null, - null - )); - } - } - - @Override - public void sendStorageInfoResponse(final ServerPlayer player, - final UUID id, - final StorageInfo storageInfo) { - sendToPlayer(player, new StorageInfoResponsePacket(id, storageInfo.stored(), storageInfo.capacity())); - } - - @Override - public void sendNetworkTransmitterStatus(final ServerPlayer player, final NetworkTransmitterStatus status) { - sendToPlayer(player, new NetworkTransmitterStatusPacket(status.error(), status.message())); - } - - @Override - public void sendNoPermission(final ServerPlayer player, final Component message) { - sendToPlayer(player, new NoPermissionPacket(message)); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/StorageInfoResponsePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/StorageInfoResponsePacket.java deleted file mode 100644 index b3c195102..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/StorageInfoResponsePacket.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.common.storage.ClientStorageRepository; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; - -import java.util.UUID; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record StorageInfoResponsePacket(UUID storageId, long stored, long capacity) implements CustomPacketPayload { - public static StorageInfoResponsePacket decode(final FriendlyByteBuf buf) { - return new StorageInfoResponsePacket(buf.readUUID(), buf.readLong(), buf.readLong()); - } - - public static void handle(final StorageInfoResponsePacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - final ClientStorageRepository storageRepository = (ClientStorageRepository) - PlatformApi.INSTANCE.getStorageRepository(player.level()); - storageRepository.setInfo(packet.storageId, packet.stored, packet.capacity); - })); - } - - @Override - public void write(final FriendlyByteBuf buf) { - buf.writeUUID(storageId); - buf.writeLong(stored); - buf.writeLong(capacity); - } - - @Override - public ResourceLocation id() { - return PacketIds.STORAGE_INFO_RESPONSE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/WirelessTransmitterRangePacket.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/WirelessTransmitterRangePacket.java deleted file mode 100644 index 82c9264b5..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/WirelessTransmitterRangePacket.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketIds; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.network.handling.PlayPayloadContext; - -public record WirelessTransmitterRangePacket(int range) implements CustomPacketPayload { - public static WirelessTransmitterRangePacket decode(final FriendlyByteBuf buf) { - return new WirelessTransmitterRangePacket(buf.readInt()); - } - - public static void handle(final WirelessTransmitterRangePacket packet, final PlayPayloadContext ctx) { - ctx.player().ifPresent(player -> ctx.workHandler().submitAsync(() -> { - if (player.containerMenu instanceof WirelessTransmitterContainerMenu containerMenu) { - containerMenu.setRange(packet.range); - } - })); - } - - @Override - public void write(final FriendlyByteBuf friendlyByteBuf) { - friendlyByteBuf.writeInt(range); - } - - @Override - public ResourceLocation id() { - return PacketIds.WIRELESS_TRANSMITTER_RANGE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/package-info.java deleted file mode 100644 index 26a5ccdc9..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/packet/s2c/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.support.packet.s2c; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/FluidStackFluidRenderer.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/FluidStackFluidRenderer.java index 84df21784..e02d22965 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/FluidStackFluidRenderer.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/FluidStackFluidRenderer.java @@ -23,10 +23,15 @@ public class FluidStackFluidRenderer extends AbstractFluidRenderer { private final Map stackCache = new HashMap<>(); + @SuppressWarnings("deprecation") private FluidStack getFluidStackFromCache(final FluidResource fluidResource) { return stackCache.computeIfAbsent( fluidResource, - r -> new FluidStack(r.fluid(), FluidType.BUCKET_VOLUME, r.tag()) + r -> new FluidStack( + r.fluid().builtInRegistryHolder(), + FluidType.BUCKET_VOLUME, + r.components() + ) ); } @@ -73,6 +78,6 @@ private TextureAtlasSprite getStillFluidSprite(final IClientFluidTypeExtensions @Override public List getTooltip(final FluidResource fluidResource) { - return Collections.singletonList(getFluidStackFromCache(fluidResource).getDisplayName()); + return Collections.singletonList(getFluidStackFromCache(fluidResource).getHoverName()); } } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/VariantUtil.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/VariantUtil.java index 27367bae7..bc880fd65 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/VariantUtil.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/VariantUtil.java @@ -17,18 +17,26 @@ private VariantUtil() { } public static boolean isSame(final FluidResource resource, final FluidStack stack) { - return resource.fluid() == stack.getFluid() && Objects.equals(resource.tag(), stack.getTag()); + return resource.fluid() == stack.getFluid() && Objects.equals( + resource.components(), + stack.getComponents().asPatch() + ); } public static FluidResource ofFluidStack(final FluidStack fluidStack) { - return new FluidResource(fluidStack.getFluid(), fluidStack.getTag()); + return new FluidResource(fluidStack.getFluid(), fluidStack.getComponents().asPatch()); } + @SuppressWarnings("deprecation") public static FluidStack toFluidStack(final FluidResource fluidResource, final long amount) { if (amount > Integer.MAX_VALUE) { LOGGER.warn("Truncating too large amount for {} to fit into FluidStack {}", fluidResource, amount); } - return new FluidStack(fluidResource.fluid(), (int) amount, fluidResource.tag()); + return new FluidStack( + fluidResource.fluid().builtInRegistryHolder(), + (int) amount, + fluidResource.components() + ); } public static Action toAction(final IFluidHandler.FluidAction action) { diff --git a/refinedstorage2-platform-forge/src/main/resources/META-INF/mods.toml b/refinedstorage2-platform-forge/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from refinedstorage2-platform-forge/src/main/resources/META-INF/mods.toml rename to refinedstorage2-platform-forge/src/main/resources/META-INF/neoforge.mods.toml diff --git a/refinedstorage2-platform-forge/src/main/resources/pack.mcmeta b/refinedstorage2-platform-forge/src/main/resources/pack.mcmeta index 08cce3f92..42ed61f71 100644 --- a/refinedstorage2-platform-forge/src/main/resources/pack.mcmeta +++ b/refinedstorage2-platform-forge/src/main/resources/pack.mcmeta @@ -1,8 +1,8 @@ { "pack": { "description": { - "text": "Refined Storage 2 resources" + "text": "Refined Storage resources" }, - "pack_format": 18 + "pack_format": 34 } } diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/forge/GameTestUtil.java b/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/forge/GameTestUtil.java index bdc9b4fe5..bd05d0bef 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/forge/GameTestUtil.java +++ b/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/forge/GameTestUtil.java @@ -61,14 +61,14 @@ public static void insert(final GameTestHelper helper, final Network network, final Item resource, final long amount) { - insert(helper, network, new ItemResource(resource, null), amount); + insert(helper, network, new ItemResource(resource), amount); } public static void insert(final GameTestHelper helper, final Network network, final Fluid resource, final long amount) { - insert(helper, network, new FluidResource(resource, null), amount); + insert(helper, network, new FluidResource(resource), amount); } public static void insert(final GameTestHelper helper, @@ -117,22 +117,22 @@ public static Runnable containerContainsExactly(final GameTestHelper helper, return () -> { for (final ResourceAmount expectedStack : expected) { final boolean contains = IntStream.range(0, containerBlockEntity.getContainerSize()) - .mapToObj(containerBlockEntity::getItem) - .anyMatch(inContainer -> asResource(inContainer).equals(expectedStack.getResource()) - && inContainer.getCount() == expectedStack.getAmount()); + .mapToObj(containerBlockEntity::getItem) + .anyMatch(inContainer -> asResource(inContainer).equals(expectedStack.getResource()) + && inContainer.getCount() == expectedStack.getAmount()); helper.assertTrue(contains, "Expected resource is missing from storage: " - + expectedStack + " with count: " + expectedStack.getAmount()); + + expectedStack + " with count: " + expectedStack.getAmount()); } for (int i = 0; i < containerBlockEntity.getContainerSize(); i++) { final ItemStack inContainer = containerBlockEntity.getItem(i); if (inContainer.getItem() != Items.AIR) { final boolean wasExpected = Arrays.stream(expected).anyMatch( - expectedStack -> expectedStack.getResource().equals(asResource(inContainer)) - && expectedStack.getAmount() == inContainer.getCount() + expectedStack -> expectedStack.getResource().equals(asResource(inContainer)) + && expectedStack.getAmount() == inContainer.getCount() ); helper.assertTrue(wasExpected, "Unexpected resource found in storage: " - + inContainer.getDescriptionId() + " with count: " + inContainer.getCount()); + + inContainer.getDescriptionId() + " with count: " + inContainer.getCount()); } } }; @@ -161,14 +161,14 @@ public static Runnable storageContainsExactly(final GameTestHelper helper, } public static ItemResource asResource(final Item item) { - return new ItemResource(item, null); + return new ItemResource(item); } public static ItemResource asResource(final ItemStack itemStack) { - return new ItemResource(itemStack.getItem(), itemStack.getTag()); + return ItemResource.ofItemStack(itemStack); } public static FluidResource asResource(final Fluid fluid) { - return new FluidResource(fluid, null); + return new FluidResource(fluid); } } diff --git a/refinedstorage2-platform-forge/src/test/resources/data/refinedstorage2/structures/empty_15x15.nbt b/refinedstorage2-platform-forge/src/test/resources/data/refinedstorage2/structure/empty_15x15.nbt similarity index 100% rename from refinedstorage2-platform-forge/src/test/resources/data/refinedstorage2/structures/empty_15x15.nbt rename to refinedstorage2-platform-forge/src/test/resources/data/refinedstorage2/structure/empty_15x15.nbt diff --git a/settings.gradle b/settings.gradle index 6a50b6863..77b7e05d5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -gradle.ext.refinedArchitectVersion = "0.13.4" +gradle.ext.refinedArchitectVersion = "0.14.3" dependencyResolutionManagement { repositories { From 1bceb44fa64726294cc32c33591c5ffb729eaccf Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 3 Jul 2024 21:14:56 +0200 Subject: [PATCH 2/9] feat: use common tag conventions --- CHANGELOG.md | 1 + .../recipe/coloring/black_cable.json | 2 +- .../recipe/coloring/black_constructor.json | 2 +- .../recipe/coloring/black_controller.json | 2 +- .../recipe/coloring/black_crafting_grid.json | 2 +- .../recipe/coloring/black_destructor.json | 2 +- .../recipe/coloring/black_detector.json | 2 +- .../recipe/coloring/black_disk_interface.json | 2 +- .../recipe/coloring/black_exporter.json | 2 +- .../coloring/black_external_storage.json | 2 +- .../recipe/coloring/black_grid.json | 2 +- .../recipe/coloring/black_importer.json | 2 +- .../coloring/black_network_receiver.json | 2 +- .../coloring/black_network_transmitter.json | 2 +- .../recipe/coloring/black_relay.json | 2 +- .../coloring/black_security_manager.json | 2 +- .../coloring/black_wireless_transmitter.json | 2 +- .../recipe/coloring/blue_cable.json | 2 +- .../recipe/coloring/blue_constructor.json | 2 +- .../recipe/coloring/blue_controller.json | 2 +- .../recipe/coloring/blue_crafting_grid.json | 2 +- .../recipe/coloring/blue_destructor.json | 2 +- .../recipe/coloring/blue_detector.json | 2 +- .../recipe/coloring/blue_disk_interface.json | 2 +- .../recipe/coloring/blue_exporter.json | 2 +- .../coloring/blue_external_storage.json | 2 +- .../recipe/coloring/blue_grid.json | 2 +- .../recipe/coloring/blue_importer.json | 2 +- .../coloring/blue_network_receiver.json | 2 +- .../coloring/blue_network_transmitter.json | 2 +- .../recipe/coloring/blue_relay.json | 2 +- .../coloring/blue_security_manager.json | 2 +- .../coloring/blue_wireless_transmitter.json | 2 +- .../recipe/coloring/brown_cable.json | 2 +- .../recipe/coloring/brown_constructor.json | 2 +- .../recipe/coloring/brown_controller.json | 2 +- .../recipe/coloring/brown_crafting_grid.json | 2 +- .../recipe/coloring/brown_destructor.json | 2 +- .../recipe/coloring/brown_detector.json | 2 +- .../recipe/coloring/brown_disk_interface.json | 2 +- .../recipe/coloring/brown_exporter.json | 2 +- .../coloring/brown_external_storage.json | 2 +- .../recipe/coloring/brown_grid.json | 2 +- .../recipe/coloring/brown_importer.json | 2 +- .../coloring/brown_network_receiver.json | 2 +- .../coloring/brown_network_transmitter.json | 2 +- .../recipe/coloring/brown_relay.json | 2 +- .../coloring/brown_security_manager.json | 2 +- .../coloring/brown_wireless_transmitter.json | 2 +- .../recipe/coloring/cyan_cable.json | 2 +- .../recipe/coloring/cyan_constructor.json | 2 +- .../recipe/coloring/cyan_controller.json | 2 +- .../recipe/coloring/cyan_crafting_grid.json | 2 +- .../recipe/coloring/cyan_destructor.json | 2 +- .../recipe/coloring/cyan_detector.json | 2 +- .../recipe/coloring/cyan_disk_interface.json | 2 +- .../recipe/coloring/cyan_exporter.json | 2 +- .../coloring/cyan_external_storage.json | 2 +- .../recipe/coloring/cyan_grid.json | 2 +- .../recipe/coloring/cyan_importer.json | 2 +- .../coloring/cyan_network_receiver.json | 2 +- .../coloring/cyan_network_transmitter.json | 2 +- .../recipe/coloring/cyan_relay.json | 2 +- .../coloring/cyan_security_manager.json | 2 +- .../coloring/cyan_wireless_transmitter.json | 2 +- .../recipe/coloring/gray_cable.json | 2 +- .../recipe/coloring/gray_constructor.json | 2 +- .../recipe/coloring/gray_controller.json | 2 +- .../recipe/coloring/gray_crafting_grid.json | 2 +- .../recipe/coloring/gray_destructor.json | 2 +- .../recipe/coloring/gray_detector.json | 2 +- .../recipe/coloring/gray_disk_interface.json | 2 +- .../recipe/coloring/gray_exporter.json | 2 +- .../coloring/gray_external_storage.json | 2 +- .../recipe/coloring/gray_grid.json | 2 +- .../recipe/coloring/gray_importer.json | 2 +- .../coloring/gray_network_receiver.json | 2 +- .../coloring/gray_network_transmitter.json | 2 +- .../recipe/coloring/gray_relay.json | 2 +- .../coloring/gray_security_manager.json | 2 +- .../coloring/gray_wireless_transmitter.json | 2 +- .../recipe/coloring/green_cable.json | 2 +- .../recipe/coloring/green_constructor.json | 2 +- .../recipe/coloring/green_controller.json | 2 +- .../recipe/coloring/green_crafting_grid.json | 2 +- .../recipe/coloring/green_destructor.json | 2 +- .../recipe/coloring/green_detector.json | 2 +- .../recipe/coloring/green_disk_interface.json | 2 +- .../recipe/coloring/green_exporter.json | 2 +- .../coloring/green_external_storage.json | 2 +- .../recipe/coloring/green_grid.json | 2 +- .../recipe/coloring/green_importer.json | 2 +- .../coloring/green_network_receiver.json | 2 +- .../coloring/green_network_transmitter.json | 2 +- .../recipe/coloring/green_relay.json | 2 +- .../coloring/green_security_manager.json | 2 +- .../coloring/green_wireless_transmitter.json | 2 +- .../recipe/coloring/light_blue_cable.json | 2 +- .../coloring/light_blue_constructor.json | 2 +- .../coloring/light_blue_controller.json | 2 +- .../coloring/light_blue_crafting_grid.json | 2 +- .../coloring/light_blue_destructor.json | 2 +- .../recipe/coloring/light_blue_detector.json | 2 +- .../coloring/light_blue_disk_interface.json | 2 +- .../recipe/coloring/light_blue_exporter.json | 2 +- .../coloring/light_blue_external_storage.json | 2 +- .../recipe/coloring/light_blue_grid.json | 2 +- .../recipe/coloring/light_blue_importer.json | 2 +- .../coloring/light_blue_network_receiver.json | 2 +- .../light_blue_network_transmitter.json | 2 +- .../recipe/coloring/light_blue_relay.json | 2 +- .../coloring/light_blue_security_manager.json | 2 +- .../light_blue_wireless_transmitter.json | 2 +- .../recipe/coloring/light_gray_cable.json | 2 +- .../coloring/light_gray_constructor.json | 2 +- .../coloring/light_gray_controller.json | 2 +- .../coloring/light_gray_crafting_grid.json | 2 +- .../coloring/light_gray_destructor.json | 2 +- .../recipe/coloring/light_gray_detector.json | 2 +- .../coloring/light_gray_disk_interface.json | 2 +- .../recipe/coloring/light_gray_exporter.json | 2 +- .../coloring/light_gray_external_storage.json | 2 +- .../recipe/coloring/light_gray_grid.json | 2 +- .../recipe/coloring/light_gray_importer.json | 2 +- .../coloring/light_gray_network_receiver.json | 2 +- .../light_gray_network_transmitter.json | 2 +- .../recipe/coloring/light_gray_relay.json | 2 +- .../coloring/light_gray_security_manager.json | 2 +- .../light_gray_wireless_transmitter.json | 2 +- .../recipe/coloring/lime_cable.json | 2 +- .../recipe/coloring/lime_constructor.json | 2 +- .../recipe/coloring/lime_controller.json | 2 +- .../recipe/coloring/lime_crafting_grid.json | 2 +- .../recipe/coloring/lime_destructor.json | 2 +- .../recipe/coloring/lime_detector.json | 2 +- .../recipe/coloring/lime_disk_interface.json | 2 +- .../recipe/coloring/lime_exporter.json | 2 +- .../coloring/lime_external_storage.json | 2 +- .../recipe/coloring/lime_grid.json | 2 +- .../recipe/coloring/lime_importer.json | 2 +- .../coloring/lime_network_receiver.json | 2 +- .../coloring/lime_network_transmitter.json | 2 +- .../recipe/coloring/lime_relay.json | 2 +- .../coloring/lime_security_manager.json | 2 +- .../coloring/lime_wireless_transmitter.json | 2 +- .../recipe/coloring/magenta_cable.json | 2 +- .../recipe/coloring/magenta_constructor.json | 2 +- .../recipe/coloring/magenta_controller.json | 2 +- .../coloring/magenta_crafting_grid.json | 2 +- .../recipe/coloring/magenta_destructor.json | 2 +- .../recipe/coloring/magenta_detector.json | 2 +- .../coloring/magenta_disk_interface.json | 2 +- .../recipe/coloring/magenta_exporter.json | 2 +- .../coloring/magenta_external_storage.json | 2 +- .../recipe/coloring/magenta_grid.json | 2 +- .../recipe/coloring/magenta_importer.json | 2 +- .../coloring/magenta_network_receiver.json | 2 +- .../coloring/magenta_network_transmitter.json | 2 +- .../recipe/coloring/magenta_relay.json | 2 +- .../coloring/magenta_security_manager.json | 2 +- .../magenta_wireless_transmitter.json | 2 +- .../recipe/coloring/orange_cable.json | 2 +- .../recipe/coloring/orange_constructor.json | 2 +- .../recipe/coloring/orange_controller.json | 2 +- .../recipe/coloring/orange_crafting_grid.json | 2 +- .../recipe/coloring/orange_destructor.json | 2 +- .../recipe/coloring/orange_detector.json | 2 +- .../coloring/orange_disk_interface.json | 2 +- .../recipe/coloring/orange_exporter.json | 2 +- .../coloring/orange_external_storage.json | 2 +- .../recipe/coloring/orange_grid.json | 2 +- .../recipe/coloring/orange_importer.json | 2 +- .../coloring/orange_network_receiver.json | 2 +- .../coloring/orange_network_transmitter.json | 2 +- .../recipe/coloring/orange_relay.json | 2 +- .../coloring/orange_security_manager.json | 2 +- .../coloring/orange_wireless_transmitter.json | 2 +- .../recipe/coloring/pink_cable.json | 2 +- .../recipe/coloring/pink_constructor.json | 2 +- .../recipe/coloring/pink_controller.json | 2 +- .../recipe/coloring/pink_crafting_grid.json | 2 +- .../recipe/coloring/pink_destructor.json | 2 +- .../recipe/coloring/pink_detector.json | 2 +- .../recipe/coloring/pink_disk_interface.json | 2 +- .../recipe/coloring/pink_exporter.json | 2 +- .../coloring/pink_external_storage.json | 2 +- .../recipe/coloring/pink_grid.json | 2 +- .../recipe/coloring/pink_importer.json | 2 +- .../coloring/pink_network_receiver.json | 2 +- .../coloring/pink_network_transmitter.json | 2 +- .../recipe/coloring/pink_relay.json | 2 +- .../coloring/pink_security_manager.json | 2 +- .../coloring/pink_wireless_transmitter.json | 2 +- .../recipe/coloring/purple_cable.json | 2 +- .../recipe/coloring/purple_constructor.json | 2 +- .../recipe/coloring/purple_controller.json | 2 +- .../recipe/coloring/purple_crafting_grid.json | 2 +- .../recipe/coloring/purple_destructor.json | 2 +- .../recipe/coloring/purple_detector.json | 2 +- .../coloring/purple_disk_interface.json | 2 +- .../recipe/coloring/purple_exporter.json | 2 +- .../coloring/purple_external_storage.json | 2 +- .../recipe/coloring/purple_grid.json | 2 +- .../recipe/coloring/purple_importer.json | 2 +- .../coloring/purple_network_receiver.json | 2 +- .../coloring/purple_network_transmitter.json | 2 +- .../recipe/coloring/purple_relay.json | 2 +- .../coloring/purple_security_manager.json | 2 +- .../coloring/purple_wireless_transmitter.json | 2 +- .../recipe/coloring/red_cable.json | 2 +- .../recipe/coloring/red_constructor.json | 2 +- .../recipe/coloring/red_controller.json | 2 +- .../recipe/coloring/red_crafting_grid.json | 2 +- .../recipe/coloring/red_destructor.json | 2 +- .../recipe/coloring/red_detector.json | 2 +- .../recipe/coloring/red_disk_interface.json | 2 +- .../recipe/coloring/red_exporter.json | 2 +- .../recipe/coloring/red_external_storage.json | 2 +- .../recipe/coloring/red_grid.json | 2 +- .../recipe/coloring/red_importer.json | 2 +- .../recipe/coloring/red_network_receiver.json | 2 +- .../coloring/red_network_transmitter.json | 2 +- .../recipe/coloring/red_relay.json | 2 +- .../recipe/coloring/red_security_manager.json | 2 +- .../coloring/red_wireless_transmitter.json | 2 +- .../recipe/coloring/white_cable.json | 2 +- .../recipe/coloring/white_constructor.json | 2 +- .../recipe/coloring/white_controller.json | 2 +- .../recipe/coloring/white_crafting_grid.json | 2 +- .../recipe/coloring/white_destructor.json | 2 +- .../recipe/coloring/white_detector.json | 2 +- .../recipe/coloring/white_disk_interface.json | 2 +- .../recipe/coloring/white_exporter.json | 2 +- .../coloring/white_external_storage.json | 2 +- .../recipe/coloring/white_grid.json | 2 +- .../recipe/coloring/white_importer.json | 2 +- .../coloring/white_network_receiver.json | 2 +- .../coloring/white_network_transmitter.json | 2 +- .../recipe/coloring/white_relay.json | 2 +- .../coloring/white_security_manager.json | 2 +- .../coloring/white_wireless_transmitter.json | 2 +- .../recipe/coloring/yellow_cable.json | 2 +- .../recipe/coloring/yellow_constructor.json | 2 +- .../recipe/coloring/yellow_controller.json | 2 +- .../recipe/coloring/yellow_crafting_grid.json | 2 +- .../recipe/coloring/yellow_destructor.json | 2 +- .../recipe/coloring/yellow_detector.json | 2 +- .../coloring/yellow_disk_interface.json | 2 +- .../recipe/coloring/yellow_exporter.json | 2 +- .../coloring/yellow_external_storage.json | 2 +- .../recipe/coloring/yellow_grid.json | 2 +- .../recipe/coloring/yellow_importer.json | 2 +- .../coloring/yellow_network_receiver.json | 2 +- .../coloring/yellow_network_transmitter.json | 2 +- .../recipe/coloring/yellow_relay.json | 2 +- .../coloring/yellow_security_manager.json | 2 +- .../coloring/yellow_wireless_transmitter.json | 2 +- .../recipe/1024b_fluid_storage_block.json | 2 +- .../recipe/1024b_fluid_storage_disk.json | 4 +- .../recipe/1024b_fluid_storage_part.json | 2 +- .../recipe/16k_storage_block.json | 2 +- .../recipe/16k_storage_disk.json | 4 +- .../recipe/16k_storage_part.json | 2 +- .../recipe/1k_storage_block.json | 2 +- .../recipe/1k_storage_disk.json | 4 +- .../recipe/1k_storage_part.json | 4 +- .../recipe/256b_fluid_storage_block.json | 2 +- .../recipe/256b_fluid_storage_disk.json | 4 +- .../recipe/256b_fluid_storage_part.json | 2 +- .../recipe/4096b_fluid_storage_block.json | 2 +- .../recipe/4096b_fluid_storage_disk.json | 4 +- .../recipe/4096b_fluid_storage_part.json | 2 +- .../recipe/4k_storage_block.json | 2 +- .../recipe/4k_storage_disk.json | 4 +- .../recipe/4k_storage_part.json | 2 +- .../recipe/64b_fluid_storage_block.json | 2 +- .../recipe/64b_fluid_storage_disk.json | 4 +- .../recipe/64b_fluid_storage_part.json | 4 +- .../recipe/64k_storage_block.json | 2 +- .../recipe/64k_storage_disk.json | 4 +- .../recipe/64k_storage_part.json | 2 +- .../data/refinedstorage2/recipe/cable.json | 4 +- .../recipe/construction_core.json | 2 +- .../refinedstorage2/recipe/constructor.json | 2 +- .../refinedstorage2/recipe/crafting_grid.json | 2 +- .../recipe/destruction_core.json | 2 +- .../refinedstorage2/recipe/destructor.json | 2 +- .../refinedstorage2/recipe/disk_drive.json | 2 +- .../recipe/external_storage.json | 2 +- .../data/refinedstorage2/recipe/grid.json | 2 +- .../refinedstorage2/recipe/interface.json | 2 +- .../recipe/machine_casing.json | 2 +- .../recipe/network_receiver.json | 4 +- .../recipe/network_transmitter.json | 4 +- .../recipe/processor_binding.json | 4 +- .../recipe/quartz_enriched_iron.json | 4 +- .../refinedstorage2/recipe/range_upgrade.json | 2 +- .../recipe/raw_advanced_processor.json | 4 +- .../recipe/raw_basic_processor.json | 4 +- .../recipe/raw_improved_processor.json | 4 +- .../recipe/regulator_upgrade.json | 2 +- .../recipe/security_manager.json | 2 +- .../data/refinedstorage2/recipe/silicon.json | 2 +- .../recipe/storage_housing.json | 4 +- .../recipe/storage_monitor.json | 2 +- .../data/refinedstorage2/recipe/upgrade.json | 2 +- .../refinedstorage2/recipe/wireless_grid.json | 2 +- .../recipe/wireless_transmitter.json | 2 +- .../recipe/RecoloringRecipeProvider.java | 37 +++++++++---------- 309 files changed, 345 insertions(+), 345 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35a292131..e68e12290 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Changed - Internal data format for storages. Storages from milestone 3 are incompatible and will not be transferred. +- Recipes now use common tag conventions from NeoForge and Fabric. ## [2.0.0-milestone.3.14] - 2024-06-28 diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json index debc2df42..03e63bbb9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json index 3719b7e52..32ca15707 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json index 85e3a1837..da70cba63 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json index 5b283fdfc..beebf8557 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json index c2ba2f622..c744936ec 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json index 4d6daa81a..7db11ead0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json index 5100d0bd4..5836010d7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json index dc9924a00..04b64328c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json index 967be6d4f..e36270d58 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json index 6c3045d1c..649e749e6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json index 1f790c440..b7cc4b41f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json index e0db45771..b45f4de42 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json index e2420a424..820d0ce10 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json index f643ad840..e7abfb22b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json index a63defcdd..50d5ca6d6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json index 4a53eb0b4..0535acd01 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:black_dye" + "tag": "c:dyes/black" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json index cad915b22..4ae2d05b2 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json index 9c6961cc3..d687c2af0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json index 1ef6c3497..d320cae3e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json index e38c5b73c..d3a196264 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json index 00494d4f5..a708e4ad6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json index 1451a8c5d..0e138060c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json index 75eae19c0..d299123ff 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json index af84484fa..20bd87294 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json index 5da2f6a0a..6c921bf61 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json index 2076c0799..115cd6c74 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json index 1e4656b26..2ea50f408 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json index 375ded113..403bc7375 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json index db0de7a2b..8be4d4e60 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json index 66272954a..bb4eb773a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json index 3bb08baf4..9e87cc46d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json index c6cd74473..44e3613f6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:blue_dye" + "tag": "c:dyes/blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json index cc3b0bbd1..ad32527e8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json index 08c3a7a40..f20534db3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json index 5a39d4537..8409658e4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json index f73036219..f56d1b876 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json index 2b3ac8808..99f5e9be9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json index 7b9cfc921..27f6a510d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json index 33a0641cd..dd296db52 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json index cde41172a..4b07d1027 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json index be411530b..0cc0d22d7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json index a2814ed09..e516ebe7d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json index 96f172768..4cb69c75f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json index 4f39a2970..c4730baf1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json index e8c807129..232cd88da 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json index eeb0f5ee0..c2badda03 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json index 219f7a4cd..5be1302c6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json index f4601cd51..d8e395648 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:brown_dye" + "tag": "c:dyes/brown" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json index becb2d0f9..d228b7c61 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json index 7d0896f2d..00dfa3c23 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json index b18c29934..60d8cc2c7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json index 3cf596d12..c700f3db9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json index 2b9cae809..34256882d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json index 30349d1dd..2ab2214fe 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json index a814de3a0..5ebcdb864 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json index 1593d8cd3..89cab1c9d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json index e1c1c22ce..c3180f0f9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json index 800cbf692..d8daa1078 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json index 3ba0319e7..18c77399e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json index f03b423d0..ec8d2f1ac 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json index 5da50b678..f269d67a9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json index 1e60588ac..8ab6ba19b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json index c8a809c6f..9b6da20a4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json index a1c5240be..4462764fd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:cyan_dye" + "tag": "c:dyes/cyan" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json index b6a840240..9191ca1a9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json index a1ef435fb..5747968ec 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json index dc3255814..31ede6bfc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json index 728e1ce4c..fab3c0f6b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json index 323148a5f..f064ea824 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json index edb298397..f33bf5e21 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json index d71c83ac4..ffbfd9158 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json index 541aa2c0f..3747bf611 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json index 880c0c76e..0c2217f9f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json index 0beabdc7a..5ec6e0de2 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json index 9c8f1effb..5368c7193 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json index ea58cb43c..deec3b4ae 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json index c19d4aaec..2793c6e3e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json index 458fb3b20..3aac0399f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json index c017fb0a0..61b687fd9 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json index 5721dbc0c..ef92e5275 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:gray_dye" + "tag": "c:dyes/gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json index 7e92262ed..351d302d7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json index 9c75aed07..e80c19944 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json index 2a17c68e3..cea91ce3f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json index 6ad997e96..ad74e4cee 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json index e9163f9a3..4c49d4811 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json index 347a76744..9cfb98f44 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json index ecb2bb6ce..c109912e8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json index 22e9fdbdf..ae15a5428 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json index 39143546b..2003f9ad0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json index 2e96f705d..3eb975e80 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json index 89391617c..cd60a7b22 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json index d9f4cce95..f2c3d2ffb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json index 2fbac9138..ba28a1cbc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json index b1889301c..a5e2d01ef 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json index 394b6d4b8..7402ab676 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json index 1bd8abe1e..daf4a1d28 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:green_dye" + "tag": "c:dyes/green" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json index 63d51c903..c28060e32 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json index 5281c40c1..70c835907 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json index 57886944c..49260c7c1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json index 8c2d9cbdc..16f83b36f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json index 89de9a4ca..f151debf7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json index 8485463d8..e947ad6a0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json index a6ba20645..2ac76a396 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json index 758408a81..822bd2733 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json index 2fde5246b..abdbb3e49 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json index a82c84a29..67034f6df 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json index 7171cb87f..8eb130eff 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json index dd30e6c77..9dad64ea6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json index 2981dfbf1..d7ff88b12 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json index 8fea0cc22..20fdd3cce 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json index 756cd8e90..cd369f2aa 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json index 9be26bf2a..e2dc65581 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:light_blue_dye" + "tag": "c:dyes/light_blue" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json index a44074eab..038cc58d8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json index 8f174256d..5572f094b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json index 9836d6e50..0c16764b6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json index d5cf86ce5..d79d44673 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json index e71d00cc3..e71784736 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json index bd0cd7dfb..ddc394cac 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json index db53c5d81..101704f98 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json index 2da35dc8d..918455fcc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json index 8c2e70b04..e49fcd37b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json index d029f7b20..700d8ca6b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json index 5fd210c8c..26b0fcd1c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json index 925ecbd89..686fb392e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json index f7892de62..c73d67956 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json index 6656c82eb..7f9f60966 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json index 1ba063e22..1c4fe7e35 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json index ec11cdb61..ed3483bdd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:light_gray_dye" + "tag": "c:dyes/light_gray" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json index f128fe7e8..4d0bbd578 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json index e935ea868..6c1c1db2e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json index 76550f2de..8494d1c01 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json index 19602be94..6d7191376 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json index 43536e5f5..4da64644c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json index c7b1321c7..7c9c8f534 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json index af1d95983..bfba3cf95 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json index 8959d5d8c..f1b6baafb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json index 2ac30b7ce..1af110c21 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json index 709e73500..0a5523b41 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json index 302330b5e..be9b64557 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json index a254ce162..66225b228 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json index 3a5bb7601..b231fb27c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json index 513f8abb3..3e2d61dff 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json index 6cfc79411..a72be5501 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json index 42baf0e99..26c826265 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:lime_dye" + "tag": "c:dyes/lime" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json index a88690261..39b48880d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json index 3e5a1f16f..7312efd0e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json index 0069aea35..95927d1b4 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json index 53fafb8f3..79ceecc32 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json index 9237499b0..021be5dde 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json index f1cf2d692..ac6efb24c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json index 52d78334c..4929305ae 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json index 36a901e09..199b014c6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json index 2790f4b12..faf220f63 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json index 150e3b9cd..3631d11d5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json index 3194f4e55..3f3a035bc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json index c37424607..df94c0295 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json index fcb235352..076a0199f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json index e3ff2ff05..1ad3cc52f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json index a75604191..a5234e733 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json index f0cdd7cdc..8d491194b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:magenta_dye" + "tag": "c:dyes/magenta" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json index ba3f2662b..c2f9e2281 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json index a45f61fc2..4580106fb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json index 26e0c3af1..5bf7cffb0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json index d1676f5d1..cee1f00c0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json index 9131135f6..936ff6cc5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json index 7e914e39c..42735138d 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json index afe8f7eb2..d50062231 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json index a710e27d8..981491e1e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json index e3d617223..1f5f81924 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json index baed3c065..eab9ee8f8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json index f961bcef6..920512f37 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json index d2160a4a3..7ab6a1346 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json index 1c13bc247..24c7e0248 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json index 27dcb242a..51d41b545 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json index 82e953060..02f331278 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json index 847b99400..6b6a067d3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:orange_dye" + "tag": "c:dyes/orange" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json index 6125d7f16..79ac356cd 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json index 1832b4279..37f7d3de6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json index 898edec5c..ec9d3e00c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json index bd8ec135c..302885632 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json index f65615431..9611e0bd8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json index ad7314bec..6b1a9e8ac 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json index deba0cd09..5d350f306 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json index 8c6f003eb..99a57b0bc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json index c2b362925..8dfba1125 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json index 3cd54a98e..bdb00cccc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json index e267982f1..4cec37e64 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json index 935162fa3..9f32b0cf5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json index 7b5b3ab2f..1a76a0d82 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json index c30fa6ccb..6ab94dffe 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json index 802f8f711..2ddcec9d7 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json index b47b60bed..0e53e3dac 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:pink_dye" + "tag": "c:dyes/pink" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json index 6902a76dc..6c0c818bb 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json index 8be003cb6..bca5a1c26 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json index 725fb84a7..8915e8fcc 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json index 1b20618ea..57b47b8c2 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json index 7a8271d38..49df2b52a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json index 5a5b4809f..e82d56f35 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json index 990eae42f..942fb28ca 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json index 41b8b407b..8cf35b908 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json index b2b68d492..222a63d8b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json index da0703769..4a6c9bb16 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json index 3e437907b..28a750486 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json index 22a889f04..4493794d2 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json index 1c8978139..a19991ff6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json index 602b86204..77ffef0ae 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json index ddbf99df3..66f08e2a1 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json index a2ddf6b85..c4c28d2b6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:purple_dye" + "tag": "c:dyes/purple" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json index 10348f9c5..3c595e399 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json index e304c5334..867a8073c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json index 9054c8584..624f9ca5a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json index 3d64b32ad..310ff4b23 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json index cae7b16b9..3fa2e0982 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json index 8c375bc69..b19baad29 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json index d420da852..3e598ef9a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json index 1b8f2acba..3c8f027c6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json index e7d51a577..e42e88032 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json index 5f9dec672..73eeb353c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json index cbd7b4e82..d3749a94f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json index b5de717f3..7d1da161f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json index 0759f926b..ef76fe58f 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json index 94403f52b..d9be3b246 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json index d5ad1443b..4699b22c8 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json index a2abdf06a..a66fc9903 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:red_dye" + "tag": "c:dyes/red" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json index 3f58a1530..74ac95c7c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json index 4492c9cc4..1e4cc1ba3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json index a8a708824..8521f80b6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json index 7176b64d4..4a88a4d36 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json index d7ab63ab9..ac1d8325a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json index 41ef43891..06598ed37 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json index 952443656..4b041fdc0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json index f8a9ee929..5bb0df589 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json index 1e85f0544..27e26f93e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json index 5c844c592..7f7901742 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json index d30d2c9a3..a170e35df 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json index 74495545d..8d1b35613 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json index c89918fd9..46c76fb40 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json index b33a77203..71402133e 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json index 128eedae6..ba4fe7bda 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json index 55eedeaee..261f9645b 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:white_dye" + "tag": "c:dyes/white" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json index 8d18120c5..57e468397 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:cables" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json index a8e9ab438..906cd1eb0 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:constructors" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json index 6cc0cc417..6c1d944f5 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:controllers" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json index 629286c35..d2119e22a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:crafting_grids" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json index 8f7bdcb54..297b1b7c3 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:destructors" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json index 542d1ebb1..22724bc42 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:detectors" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json index 44e7e1c7a..70a92d231 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:disk_interfaces" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json index 335b86a12..7bb3e4cca 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:exporters" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json index 384a7d77d..3f7443f85 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:external_storages" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json index 954976753..990dc6415 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:grids" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json index f6e0f055f..93e502a29 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:importers" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json index 5fb8b5e35..65d144ce6 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_receivers" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json index 55b07054a..5ca74e14a 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:network_transmitters" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json index 1af3c9fbc..bf30a7b7c 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:relays" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json index 11488de4b..e2c8d8553 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:security_managers" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json index 0c0aee654..fef7a2054 100644 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json @@ -6,7 +6,7 @@ "tag": "refinedstorage2:wireless_transmitters" }, { - "item": "minecraft:yellow_dye" + "tag": "c:dyes/yellow" } ], "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json index 7e362b8f6..bfafc5385 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:machine_casing" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:1024b_fluid_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json index 18712aace..43e0e27cc 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json @@ -7,10 +7,10 @@ ], "key": { "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:1024b_fluid_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json index 1823b49cc..0e2e281a5 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json @@ -16,7 +16,7 @@ "item": "refinedstorage2:256b_fluid_storage_part" }, "R": { - "item": "minecraft:bucket" + "tag": "c:buckets/empty" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json index a712ee859..cfb778753 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:machine_casing" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:16k_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json index 1d188c6b9..a08cf0f9b 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json @@ -7,10 +7,10 @@ ], "key": { "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:16k_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json index bbd1cf544..bc2135419 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json @@ -16,7 +16,7 @@ "item": "refinedstorage2:4k_storage_part" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json index 8e1ec2004..7b642b87f 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:machine_casing" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:1k_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json index 0d17bdfb5..208c7fdcc 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json @@ -7,10 +7,10 @@ ], "key": { "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:1k_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json index ba196934a..ca4ab2bec 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json @@ -13,10 +13,10 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json index 7e5a22a69..e92b7a468 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:machine_casing" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:256b_fluid_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json index 13e7f5996..73e9922a3 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json @@ -7,10 +7,10 @@ ], "key": { "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:256b_fluid_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json index da37d01c4..424fab265 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json @@ -16,7 +16,7 @@ "item": "refinedstorage2:64b_fluid_storage_part" }, "R": { - "item": "minecraft:bucket" + "tag": "c:buckets/empty" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json index 7ef712cf1..25929f72a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:machine_casing" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:4096b_fluid_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json index b2870ee62..9eb76c566 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json @@ -7,10 +7,10 @@ ], "key": { "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:4096b_fluid_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json index b9aca1764..d846efb17 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json @@ -16,7 +16,7 @@ "item": "refinedstorage2:1024b_fluid_storage_part" }, "R": { - "item": "minecraft:bucket" + "tag": "c:buckets/empty" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json index 984e4597f..70e208606 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:machine_casing" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:4k_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json index d4cc70522..86de1904f 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json @@ -7,10 +7,10 @@ ], "key": { "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:4k_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json index 9596b9e89..e6ebf2356 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json @@ -16,7 +16,7 @@ "item": "refinedstorage2:1k_storage_part" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json index b2ca56ee1..355ac3b75 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:machine_casing" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:64b_fluid_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json index 319cc703a..90632dd7f 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json @@ -7,10 +7,10 @@ ], "key": { "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:64b_fluid_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json index f4f51a16c..6b65d2f22 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json @@ -13,10 +13,10 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:bucket" + "tag": "c:buckets/empty" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json index 790c3a54c..dbb9b5984 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:machine_casing" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:64k_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json index a4aef390f..9b80bc34d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json @@ -7,10 +7,10 @@ ], "key": { "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "P": { "item": "refinedstorage2:64k_storage_part" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json index 4adcd2287..1a3c5bc58 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json @@ -16,7 +16,7 @@ "item": "refinedstorage2:16k_storage_part" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json index c330e24e3..9c829b423 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json @@ -10,10 +10,10 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json index edd4e5a56..adde926d3 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json @@ -5,7 +5,7 @@ "item": "refinedstorage2:basic_processor" }, { - "item": "minecraft:glowstone_dust" + "tag": "c:dusts/glowstone" } ], "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json index 6e3599d87..63c906d9d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json @@ -13,7 +13,7 @@ "item": "refinedstorage2:construction_core" }, "R": { - "item": "minecraft:diamond" + "tag": "c:gems/diamond" }, "M": { "item": "refinedstorage2:cable" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json index 5189ebaae..423aa277c 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json @@ -8,7 +8,7 @@ "item": "refinedstorage2:advanced_processor" }, { - "item": "minecraft:crafting_table" + "tag": "c:player_workstations/crafting_tables" } ], "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json index ed7432e90..12cc19936 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json @@ -5,7 +5,7 @@ "item": "refinedstorage2:basic_processor" }, { - "item": "minecraft:quartz" + "tag": "c:gems/quartz" } ], "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json index 3e405636f..23a0c7f12 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json @@ -13,7 +13,7 @@ "item": "refinedstorage2:destruction_core" }, "I": { - "item": "minecraft:diamond" + "tag": "c:gems/diamond" }, "C": { "item": "refinedstorage2:cable" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json index 089d74b60..b4208945d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "C": { - "item": "minecraft:chest" + "tag": "c:chests" }, "M": { "item": "refinedstorage2:machine_casing" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json index 28a994ee0..b8f39a71b 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json @@ -16,7 +16,7 @@ "item": "refinedstorage2:destruction_core" }, "H": { - "item": "minecraft:chest" + "tag": "c:chests" }, "M": { "item": "refinedstorage2:cable" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json index ca1f283fe..182efc170 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json @@ -13,7 +13,7 @@ "item": "refinedstorage2:construction_core" }, "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "E": { "item": "refinedstorage2:quartz_enriched_iron" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json index 7a4d89334..5645b8120 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json @@ -16,7 +16,7 @@ "item": "refinedstorage2:machine_casing" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "U": { "item": "refinedstorage2:quartz_enriched_iron" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json index 792e1ce36..4d3408f7d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "S": { - "item": "minecraft:stone" + "tag": "c:stones" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json index 308f80013..316046bb5 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json @@ -7,7 +7,7 @@ ], "key": { "E": { - "item": "minecraft:ender_pearl" + "tag": "c:ender_pearls" }, "C": { "item": "refinedstorage2:construction_core" @@ -22,7 +22,7 @@ "item": "refinedstorage2:advanced_processor" }, "N": { - "item": "minecraft:netherite_ingot" + "tag": "c:ingots/netherite" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json index 7b991111f..5bf2b0afa 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json @@ -7,7 +7,7 @@ ], "key": { "E": { - "item": "minecraft:ender_pearl" + "tag": "c:ender_pearls" }, "C": { "item": "refinedstorage2:construction_core" @@ -22,7 +22,7 @@ "item": "refinedstorage2:advanced_processor" }, "N": { - "item": "minecraft:netherite_ingot" + "tag": "c:ingots/netherite" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json index 1db4a0b38..1479ce7c6 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json @@ -7,10 +7,10 @@ ], "key": { "S": { - "item": "minecraft:string" + "tag": "c:strings" }, "L": { - "item": "minecraft:slime_ball" + "tag": "c:slimeballs" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json index 1343282f0..2517595d6 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json @@ -6,10 +6,10 @@ ], "key": { "I": { - "item": "minecraft:iron_ingot" + "tag": "c:ingots/iron" }, "Q": { - "item": "minecraft:quartz" + "tag": "c:gems/quartz" } }, "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json index 9951c8846..918b3f77d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "P": { - "item": "minecraft:ender_pearl" + "tag": "c:ender_pearls" }, "U": { "item": "refinedstorage2:upgrade" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json index a21670708..c4d68f7c2 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json @@ -5,13 +5,13 @@ "item": "refinedstorage2:processor_binding" }, { - "item": "minecraft:diamond" + "tag": "c:gems/diamond" }, { "item": "refinedstorage2:silicon" }, { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" } ], "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json index 695dc20e9..74ef94451 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json @@ -5,13 +5,13 @@ "item": "refinedstorage2:processor_binding" }, { - "item": "minecraft:iron_ingot" + "tag": "c:ingots/iron" }, { "item": "refinedstorage2:silicon" }, { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" } ], "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json index 3c1c64185..7b5e17ec1 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json @@ -5,13 +5,13 @@ "item": "refinedstorage2:processor_binding" }, { - "item": "minecraft:gold_ingot" + "tag": "c:ingots/gold" }, { "item": "refinedstorage2:silicon" }, { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" } ], "result": { diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json index d786978d5..960bd9476 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "C": { "item": "minecraft:comparator" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json index 40dd7549d..db245cec5 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "C": { - "item": "minecraft:chest" + "tag": "c:chests" }, "S": { "item": "refinedstorage2:security_card" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json index 3f10f5355..a7c3be756 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "minecraft:quartz" + "tag": "c:gems/quartz" }, "result": { "id": "refinedstorage2:silicon" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json index d209a9c5d..9c6abb7c7 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json @@ -7,10 +7,10 @@ ], "key": { "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "R": { - "item": "minecraft:redstone" + "tag": "c:dusts/redstone" }, "E": { "item": "refinedstorage2:quartz_enriched_iron" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json index ade910ce1..a5cfdfc50 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json @@ -13,7 +13,7 @@ "item": "refinedstorage2:construction_core" }, "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "E": { "item": "refinedstorage2:quartz_enriched_iron" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json index 05a6422d7..31e0a41ea 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "G": { - "item": "minecraft:glass" + "tag": "c:glass_blocks" }, "P": { "item": "refinedstorage2:improved_processor" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json index 3811adf5b..2debdf366 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json @@ -10,7 +10,7 @@ "item": "refinedstorage2:quartz_enriched_iron" }, "P": { - "item": "minecraft:ender_pearl" + "tag": "c:ender_pearls" }, "G": { "tag": "refinedstorage2:grids" diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json index 3bd6b834a..6b14b0a3c 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json @@ -16,7 +16,7 @@ "item": "refinedstorage2:machine_casing" }, "P": { - "item": "minecraft:ender_pearl" + "tag": "c:ender_pearls" } }, "result": { diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java index 6649aa3a8..be60b1b30 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java @@ -15,7 +15,6 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; @@ -84,28 +83,28 @@ private ResourceLocation recipeId(final DyeColor color, final String suffix) { private ShapelessRecipeBuilder recipe(final TagKey dyeable, final Item result, final DyeColor color) { return ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, result) .requires(dyeable) - .requires(getDyeItem(color)) + .requires(getDyeTag(color)) .unlockedBy("has_" + dyeable.location().getPath(), has(dyeable)); } - private static Item getDyeItem(final DyeColor color) { + private static TagKey getDyeTag(final DyeColor color) { return switch (color) { - case RED -> Items.RED_DYE; - case WHITE -> Items.WHITE_DYE; - case ORANGE -> Items.ORANGE_DYE; - case MAGENTA -> Items.MAGENTA_DYE; - case LIGHT_BLUE -> Items.LIGHT_BLUE_DYE; - case YELLOW -> Items.YELLOW_DYE; - case LIME -> Items.LIME_DYE; - case PINK -> Items.PINK_DYE; - case GRAY -> Items.GRAY_DYE; - case LIGHT_GRAY -> Items.LIGHT_GRAY_DYE; - case CYAN -> Items.CYAN_DYE; - case PURPLE -> Items.PURPLE_DYE; - case BLUE -> Items.BLUE_DYE; - case BROWN -> Items.BROWN_DYE; - case GREEN -> Items.GREEN_DYE; - case BLACK -> Items.BLACK_DYE; + case RED -> net.neoforged.neoforge.common.Tags.Items.DYES_RED; + case WHITE -> net.neoforged.neoforge.common.Tags.Items.DYES_WHITE; + case ORANGE -> net.neoforged.neoforge.common.Tags.Items.DYES_ORANGE; + case MAGENTA -> net.neoforged.neoforge.common.Tags.Items.DYES_MAGENTA; + case LIGHT_BLUE -> net.neoforged.neoforge.common.Tags.Items.DYES_LIGHT_BLUE; + case YELLOW -> net.neoforged.neoforge.common.Tags.Items.DYES_YELLOW; + case LIME -> net.neoforged.neoforge.common.Tags.Items.DYES_LIME; + case PINK -> net.neoforged.neoforge.common.Tags.Items.DYES_PINK; + case GRAY -> net.neoforged.neoforge.common.Tags.Items.DYES_GRAY; + case LIGHT_GRAY -> net.neoforged.neoforge.common.Tags.Items.DYES_LIGHT_GRAY; + case CYAN -> net.neoforged.neoforge.common.Tags.Items.DYES_CYAN; + case PURPLE -> net.neoforged.neoforge.common.Tags.Items.DYES_PURPLE; + case BLUE -> net.neoforged.neoforge.common.Tags.Items.DYES_BLUE; + case BROWN -> net.neoforged.neoforge.common.Tags.Items.DYES_BROWN; + case GREEN -> net.neoforged.neoforge.common.Tags.Items.DYES_GREEN; + case BLACK -> net.neoforged.neoforge.common.Tags.Items.DYES_BLACK; }; } } From 029c0fd5c5b84ddbeea1c3caddbcc1644cb8dcda Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 3 Jul 2024 21:32:08 +0200 Subject: [PATCH 3/9] fix: empty controllers not showing their true colors --- .../node/exporter/RoundRobinExporterNetworkNodeTest.java | 1 + .../controller/ControllerModelPredicateProvider.java | 7 ++++++- refinedstorage2-platform-forge/build.gradle | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java index d09f2cc24..2df0a9909 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java +++ b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java @@ -29,6 +29,7 @@ class RoundRobinExporterNetworkNodeTest extends AbstractExporterNetworkNodeTest { private Runnable listener; + @Override @BeforeEach void setUp() { listener = mock(Runnable.class); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java index 17cf86750..81ba9cffa 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java @@ -16,7 +16,12 @@ public float unclampedCall(final ItemStack stack, @Nullable final LivingEntity entity, final int seed) { return PlatformApi.INSTANCE.getEnergyStorage(stack) - .map(energyStorage -> (float) energyStorage.getStored() / (float) energyStorage.getCapacity()) + .map(energyStorage -> { + if (energyStorage.getStored() == 0) { + return 1F; + } + return (float) energyStorage.getStored() / (float) energyStorage.getCapacity(); + }) .orElse(1F); } } diff --git a/refinedstorage2-platform-forge/build.gradle b/refinedstorage2-platform-forge/build.gradle index ee02459f4..957d6e3f9 100644 --- a/refinedstorage2-platform-forge/build.gradle +++ b/refinedstorage2-platform-forge/build.gradle @@ -4,4 +4,7 @@ archivesBaseName = 'refinedstorage2-platform-forge' enablePublishing() +// This avoids a build failure when running the "test" task, because there is no JUnit engine +// in this subproject. +// The test source set in this subproject is used for Minecraft game tests, not for JUnit tests. test.onlyIf { false } From 2b213100bbaadea9f7624ae88067b8e8b2909913 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 3 Jul 2024 23:34:04 +0200 Subject: [PATCH 4/9] feat: quartz enriched copper and block variant A new usage for copper in cables. --- CHANGELOG.md | 2 ++ .../common/AbstractModInitializer.java | 8 ++++++++ .../platform/common/content/Blocks.java | 10 +++++++++ .../platform/common/content/ContentIds.java | 4 ++++ .../common/content/CreativeModeTabItems.java | 2 ++ .../platform/common/content/Items.java | 10 +++++++++ ...va => ControllerItemPropertyFunction.java} | 16 +++++++-------- .../quartz_enriched_copper_block.json | 7 +++++++ .../assets/refinedstorage2/lang/en_us.json | 2 ++ .../block/quartz_enriched_copper_block.json | 6 ++++++ .../models/item/quartz_enriched_copper.json | 6 ++++++ .../item/quartz_enriched_copper_block.json | 3 +++ .../block/quartz_enriched_copper_block.png | Bin 0 -> 685 bytes .../textures/item/quartz_enriched_copper.png | Bin 0 -> 508 bytes .../data/refinedstorage2/recipe/cable.json | 2 +- .../recipe/quartz_enriched_copper.json | 19 ++++++++++++++++++ .../recipe/quartz_enriched_copper_block.json | 16 +++++++++++++++ .../quartz_enriched_copper_from_block.json | 12 +++++++++++ ...n.json => quartz_enriched_iron_block.json} | 0 .../fabric/ClientModInitializerImpl.java | 4 ++-- .../platform/forge/ClientModInitializer.java | 4 ++-- 21 files changed, 119 insertions(+), 14 deletions(-) rename refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/{ControllerModelPredicateProvider.java => ControllerItemPropertyFunction.java} (60%) create mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_copper_block.json create mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_copper_block.json create mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper.json create mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper_block.json create mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/quartz_enriched_copper_block.png create mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/quartz_enriched_copper.png create mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper.json create mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_block.json create mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_from_block.json rename refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/{block_of_quartz_enriched_iron.json => quartz_enriched_iron_block.json} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e68e12290..9f665072b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Ported to Minecraft 1.21. - More help information for items. +- Quartz Enriched Copper, used to craft cables. +- Block of Quartz Enriched Copper ### Fixed diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java index 9b8a74e48..0eff45581 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java @@ -185,6 +185,8 @@ import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.NETWORK_TRANSMITTER; import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PORTABLE_GRID; import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PROCESSOR_BINDING; +import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER; +import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER_BLOCK; import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON; import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON_BLOCK; import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.REGULATOR_UPGRADE; @@ -323,6 +325,7 @@ protected final void registerBlocks( final BiFunction diskInterfaceBlockEntityFactory ) { Blocks.INSTANCE.setQuartzEnrichedIronBlock(callback.register(QUARTZ_ENRICHED_IRON_BLOCK, SimpleBlock::new)); + Blocks.INSTANCE.setQuartzEnrichedCopperBlock(callback.register(QUARTZ_ENRICHED_COPPER_BLOCK, SimpleBlock::new)); Blocks.INSTANCE.setDiskDrive( callback.register(DISK_DRIVE, () -> new DiskDriveBlock(diskDriveBlockEntityFactory)) ); @@ -393,10 +396,15 @@ protected final void registerItems(final RegistryCallback callback) { private void registerSimpleItems(final RegistryCallback callback) { Items.INSTANCE.setQuartzEnrichedIron(callback.register(QUARTZ_ENRICHED_IRON, SimpleItem::new)); + Items.INSTANCE.setQuartzEnrichedCopper(callback.register(QUARTZ_ENRICHED_COPPER, SimpleItem::new)); callback.register( QUARTZ_ENRICHED_IRON_BLOCK, () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedIronBlock()) ); + callback.register( + QUARTZ_ENRICHED_COPPER_BLOCK, + () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedCopperBlock()) + ); Items.INSTANCE.setSilicon(callback.register(SILICON, SimpleItem::new)); Items.INSTANCE.setProcessorBinding(callback.register(PROCESSOR_BINDING, SimpleItem::new)); callback.register(DISK_DRIVE, () -> Blocks.INSTANCE.getDiskDrive().createBlockItem()); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java index 2a70dbc4d..893e9cf95 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java @@ -162,6 +162,8 @@ public final class Blocks { @Nullable private Supplier quartzEnrichedIronBlock; @Nullable + private Supplier quartzEnrichedCopperBlock; + @Nullable private Supplier diskDrive; @Nullable private Supplier machineCasing; @@ -189,6 +191,10 @@ public SimpleBlock getQuartzEnrichedIronBlock() { return requireNonNull(quartzEnrichedIronBlock).get(); } + public SimpleBlock getQuartzEnrichedCopperBlock() { + return requireNonNull(quartzEnrichedCopperBlock).get(); + } + public DiskDriveBlock getDiskDrive() { return requireNonNull(diskDrive).get(); } @@ -219,6 +225,10 @@ public void setQuartzEnrichedIronBlock(final Supplier quartzEnriche this.quartzEnrichedIronBlock = quartzEnrichedIronBlockSupplier; } + public void setQuartzEnrichedCopperBlock(final Supplier quartzEnrichedCopperBlockSupplier) { + this.quartzEnrichedCopperBlock = quartzEnrichedCopperBlockSupplier; + } + public void setDiskDrive(final Supplier diskDriveSupplier) { this.diskDrive = diskDriveSupplier; } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java index e8b55f15f..9e344f9bd 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java @@ -13,7 +13,11 @@ public final class ContentIds { public static final ResourceLocation MACHINE_CASING = createIdentifier("machine_casing"); public static final ResourceLocation CABLE = createIdentifier("cable"); public static final ResourceLocation QUARTZ_ENRICHED_IRON_BLOCK = createIdentifier("quartz_enriched_iron_block"); + public static final ResourceLocation QUARTZ_ENRICHED_COPPER_BLOCK = createIdentifier( + "quartz_enriched_copper_block" + ); public static final ResourceLocation QUARTZ_ENRICHED_IRON = createIdentifier("quartz_enriched_iron"); + public static final ResourceLocation QUARTZ_ENRICHED_COPPER = createIdentifier("quartz_enriched_copper"); public static final ResourceLocation SILICON = createIdentifier("silicon"); public static final ResourceLocation PROCESSOR_BINDING = createIdentifier("processor_binding"); public static final ResourceLocation WRENCH = createIdentifier("wrench"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java index 97c2159a3..5594bd87c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java @@ -50,6 +50,7 @@ private static void appendBlocks(final Consumer consumer) { )); itemConsumer.accept(Blocks.INSTANCE.getMachineCasing()); itemConsumer.accept(Blocks.INSTANCE.getQuartzEnrichedIronBlock()); + itemConsumer.accept(Blocks.INSTANCE.getQuartzEnrichedCopperBlock()); itemConsumer.accept(Blocks.INSTANCE.getStorageMonitor()); Items.INSTANCE.getNetworkTransmitters().stream().map(Supplier::get).forEach(itemConsumer); Items.INSTANCE.getNetworkReceivers().stream().map(Supplier::get).forEach(itemConsumer); @@ -65,6 +66,7 @@ private static void appendBlockColors(final Consumer consumer, final private static void appendItems(final Consumer consumer) { final Consumer itemConsumer = item -> consumer.accept(new ItemStack(item)); itemConsumer.accept(Items.INSTANCE.getQuartzEnrichedIron()); + itemConsumer.accept(Items.INSTANCE.getQuartzEnrichedCopper()); itemConsumer.accept(Items.INSTANCE.getSilicon()); itemConsumer.accept(Items.INSTANCE.getProcessorBinding()); itemConsumer.accept(Items.INSTANCE.getWrench()); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java index ace5950df..98cfbeeff 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java @@ -53,6 +53,8 @@ public final class Items { @Nullable private Supplier quartzEnrichedIron; @Nullable + private Supplier quartzEnrichedCopper; + @Nullable private Supplier silicon; @Nullable private Supplier processorBinding; @@ -145,6 +147,14 @@ public Item getQuartzEnrichedIron() { return requireNonNull(quartzEnrichedIron).get(); } + public void setQuartzEnrichedCopper(final Supplier supplier) { + this.quartzEnrichedCopper = supplier; + } + + public Item getQuartzEnrichedCopper() { + return requireNonNull(quartzEnrichedCopper).get(); + } + public void setSilicon(final Supplier supplier) { this.silicon = supplier; } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerItemPropertyFunction.java similarity index 60% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java rename to refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerItemPropertyFunction.java index 81ba9cffa..98b9f66e4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerItemPropertyFunction.java @@ -9,19 +9,17 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -public class ControllerModelPredicateProvider implements ClampedItemPropertyFunction { +public class ControllerItemPropertyFunction implements ClampedItemPropertyFunction { @Override public float unclampedCall(final ItemStack stack, @Nullable final ClientLevel level, @Nullable final LivingEntity entity, final int seed) { - return PlatformApi.INSTANCE.getEnergyStorage(stack) - .map(energyStorage -> { - if (energyStorage.getStored() == 0) { - return 1F; - } - return (float) energyStorage.getStored() / (float) energyStorage.getCapacity(); - }) - .orElse(1F); + return PlatformApi.INSTANCE.getEnergyStorage(stack).map(energyStorage -> { + if (energyStorage.getStored() == 0) { + return 1F; + } + return (float) energyStorage.getStored() / (float) energyStorage.getCapacity(); + }).orElse(1F); } } diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_copper_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_copper_block.json new file mode 100644 index 000000000..a659cb284 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_copper_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage2:block/quartz_enriched_copper_block" + } + } +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json index 61725cbc3..33e2cc97c 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json @@ -2,6 +2,7 @@ "mod.refinedstorage2": "Refined Storage 2", "block.refinedstorage2.cable": "Cable", "block.refinedstorage2.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", + "block.refinedstorage2.quartz_enriched_copper_block": "Block of Quartz Enriched Copper", "block.refinedstorage2.disk_drive": "Disk Drive", "block.refinedstorage2.machine_casing": "Machine Casing", "block.refinedstorage2.grid": "Grid", @@ -178,6 +179,7 @@ "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage2.quartz_enriched_copper": "Quartz Enriched Copper", "item.refinedstorage2.processor_binding": "Processor Binding", "item.refinedstorage2.silicon": "Silicon", "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_copper_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_copper_block.json new file mode 100644 index 000000000..e5b9fcbf9 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_copper_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage2:block/quartz_enriched_copper_block" + } +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper.json new file mode 100644 index 000000000..12e96de59 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage2:item/quartz_enriched_copper" + } +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper_block.json new file mode 100644 index 000000000..ecbc9afa2 --- /dev/null +++ b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage2:block/quartz_enriched_copper_block" +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/quartz_enriched_copper_block.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/quartz_enriched_copper_block.png new file mode 100644 index 0000000000000000000000000000000000000000..fb59478b5152335567163dbc44816dc724b13aa4 GIT binary patch literal 685 zcmV;e0#f~nP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zyedK~y+T9a6h) z6fqPXzs8=~Wj7EKL6A@=kSHi9_y{QZ4SK$WhJub7J^>^?fr^MCh@eE9ea?($#&2^5 z7nW?_dtTS%{i}zZvy@U%6ha8fsH#;8$y!VPFV4Al9{0hA>4>`5Z{LY};Z4tFE#^nq zUAL!PCU5-E`av@;ST*;<;rpi#l#l||7hk`O`&G_4TI1TCT%7uTM|erNkjrCd^{;QA z$K5K%NR?80{rBwIi|X!!B841Wkz;UOefk*Wxro8^Le^)`Uq)vbr4*=8Cg#g>c0{N^ zP4Lbh*0$L~UXf`EHb*a)C$y|lOr??peT@6Dr5zmQgAUP zidRCg2T+@KLkR~3RN)4WZM#Je5Y1tWhKWJzo|Os=IE1lv`XCp_h$xsbrxc9tZZ4sg zS9OsyJW=n%uwN0%;h0y839Q*rQL<7@GGZW%>D3?jLGKL7hgiD2PKQszaa85V_wbeWD6m-fpMIXH}x&Z`@F@>QI9@%Bn ztf^372T5`+*bxwFeoV^}xsC098XUAi*2G{nCN}P_gB>7}t15ZludkSt?vk&Xbi?Qn_1}xVdjvk!@(l)y=_E2aJx2A2z zb{o9|cDK1cIe$98cOU5FNS%LgT0X`wF)1CRJJM+$P;+yL!d}TrL9Cv{yr?U5c~obHQzd}{N{dzVjihHlL=y1#ecrFr?A zl65wv>Tb(6et2m4_2sp9woX1bIeB}I$<92pgVoMw`s2?{Nx8Fa%Hc-uBaObDrYr|* z-FM`f9;|jfKQ*<-g00_@eMg>Imnn0%ImnrXDic+JlvzoTU+{l&0K>w5KSQ7ioCO|{ z#S9F5he4R}c>anMpx{DJ7sn8d;M()Ig_;xu*b=toT)(u$$Z9_G+9R7fzSnPcNS}4A z`yY4P|JjK*QnyX5Kd`{=_3o_~Ua~b#mtv^$NR;1ea6Q36 ItemPropertiesAccessor.register( controllerBlockItem.get(), createIdentifier("stored_in_controller"), - new ControllerModelPredicateProvider() + new ControllerItemPropertyFunction() )); } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java index 4c2983c95..c19b1bc47 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java +++ b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java @@ -10,7 +10,7 @@ import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; import com.refinedmods.refinedstorage2.platform.common.content.Items; import com.refinedmods.refinedstorage2.platform.common.content.KeyMappings; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerModelPredicateProvider; +import com.refinedmods.refinedstorage2.platform.common.controller.ControllerItemPropertyFunction; import com.refinedmods.refinedstorage2.platform.common.networking.NetworkCardItemPropertyFunction; import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardItemPropertyFunction; import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntityRenderer; @@ -79,7 +79,7 @@ private static void registerModelPredicates() { Items.INSTANCE.getControllers().forEach(controllerBlockItem -> ItemProperties.register( controllerBlockItem.get(), createIdentifier("stored_in_controller"), - new ControllerModelPredicateProvider() + new ControllerItemPropertyFunction() )); } From 7a66bd720eb2b687f2f68cc2aaf6f4029fdac616 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 4 Jul 2024 01:47:05 +0200 Subject: [PATCH 5/9] fix: advancements all being granted at once --- .../refinedstorage2/advancement/better_than_a_barrel.json | 4 +--- .../refinedstorage2/advancement/conditional_connecting.json | 2 +- .../data/refinedstorage2/advancement/connecting.json | 2 +- .../data/refinedstorage2/advancement/construction.json | 2 +- .../data/refinedstorage2/advancement/destruction.json | 2 +- .../resources/data/refinedstorage2/advancement/detecting.json | 2 +- .../resources/data/refinedstorage2/advancement/drives.json | 4 +--- .../resources/data/refinedstorage2/advancement/exporting.json | 2 +- .../resources/data/refinedstorage2/advancement/importing.json | 2 +- .../refinedstorage2/advancement/interface_to_the_world.json | 4 +--- .../refinedstorage2/advancement/interfacing_with_disks.json | 2 +- .../data/refinedstorage2/advancement/no_cables_required.json | 4 ++-- .../data/refinedstorage2/advancement/portable_storage.json | 4 +--- .../main/resources/data/refinedstorage2/advancement/root.json | 2 +- .../resources/data/refinedstorage2/advancement/security.json | 2 +- .../data/refinedstorage2/advancement/storing_externally.json | 2 +- .../data/refinedstorage2/advancement/storing_fluids.json | 2 +- .../data/refinedstorage2/advancement/storing_items.json | 2 +- .../resources/data/refinedstorage2/advancement/upgrading.json | 4 +--- .../data/refinedstorage2/advancement/upgrading_your_grid.json | 2 +- .../refinedstorage2/advancement/viewing_your_storage.json | 2 +- .../resources/data/refinedstorage2/advancement/wireless.json | 2 +- 22 files changed, 23 insertions(+), 33 deletions(-) diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json index 03253a45a..2f8996f9e 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json @@ -17,9 +17,7 @@ "conditions": { "items": [ { - "items": [ - "refinedstorage2:storage_monitor" - ] + "items": "refinedstorage2:storage_monitor" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json index 17159acfe..ec124a069 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:relays" + "items": "#refinedstorage2:relays" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json index a08cf5f8a..bb3f46ade 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:cables" + "items": "#refinedstorage2:cables" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json index 48755e5cc..d6a402d5a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:constructors" + "items": "#refinedstorage2:constructors" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json index 08de8e294..d9fd6ce6d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:destructors" + "items": "#refinedstorage2:destructors" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json index 702a43d40..96196ca44 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:detectors" + "items": "#refinedstorage2:detectors" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json index f12739870..a1743d3ce 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json @@ -17,9 +17,7 @@ "conditions": { "items": [ { - "items": [ - "refinedstorage2:disk_drive" - ] + "items": "refinedstorage2:disk_drive" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json index 962d92ac0..7bb7965f1 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:exporters" + "items": "#refinedstorage2:exporters" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json index 7f23c03c4..9389a400a 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:importers" + "items": "#refinedstorage2:importers" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json index f040af3a4..e5664bd7c 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json @@ -17,9 +17,7 @@ "conditions": { "items": [ { - "items": [ - "refinedstorage2:interface" - ] + "items": "refinedstorage2:interface" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json index f809a5327..7d722236f 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:disk_interfaces" + "items": "#refinedstorage2:disk_interfaces" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json index 98474fccb..dabb94af8 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json @@ -17,10 +17,10 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:network_transmitters" + "items": "#refinedstorage2:network_transmitters" }, { - "tag": "refinedstorage2:network_receivers" + "items": "#refinedstorage2:network_receivers" }, { "items": [ diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json index d83cb8aa3..617582b73 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json @@ -17,9 +17,7 @@ "conditions": { "items": [ { - "items": [ - "refinedstorage2:portable_grid" - ] + "items": "refinedstorage2:portable_grid" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json index fefc5a07b..26b21795c 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:controllers" + "items": "#refinedstorage2:controllers" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json index ec7457e90..27df538be 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:security_managers" + "items": "#refinedstorage2:security_managers" }, { "items": [ diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json index 3d665d23a..2cc72ae10 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:external_storages" + "items": "#refinedstorage2:external_storages" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json index a7138e468..9f41b83dd 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:fluid_storage_disks" + "items": "#refinedstorage2:fluid_storage_disks" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json index 1b7b25e79..9f62b0e61 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:storage_disks" + "items": "#refinedstorage2:storage_disks" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json index 9423e8a44..9b27f995d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json @@ -17,9 +17,7 @@ "conditions": { "items": [ { - "items": [ - "refinedstorage2:upgrade" - ] + "items": "refinedstorage2:upgrade" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json index e48fe5f81..0126fde2d 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:crafting_grids" + "items": "#refinedstorage2:crafting_grids" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json index 51a627f81..a1726a4c4 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json @@ -17,7 +17,7 @@ "conditions": { "items": [ { - "tag": "refinedstorage2:grids" + "items": "#refinedstorage2:grids" } ] } diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json index 713477748..5d2536dc1 100644 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json +++ b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json @@ -22,7 +22,7 @@ ] }, { - "tag": "refinedstorage2:wireless_transmitters" + "items": "#refinedstorage2:wireless_transmitters" } ] } From 3c1e5d8ea57c45dfb470ba038d2f7745601f4662 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 4 Jul 2024 12:47:37 +0200 Subject: [PATCH 6/9] refactor: remove refinedstorage2-platform-test module It's not necessary as we will mostly rely on gametests in the platform layer. For the other tests, just move the SetupMinecraft callback to platform-common. --- .github/CONTRIBUTING.md | 1 - refinedstorage2-platform-api/build.gradle | 1 - refinedstorage2-platform-common/build.gradle | 1 - .../common/support/widget/History.java | 2 +- .../platform/common/SetupMinecraft.java | 5 +++-- .../platform/common/SimpleListener.java | 18 ------------------ .../common/grid/GridSortingTypesTest.java | 5 +++-- .../list/FuzzyResourceListImplTest.java | 5 +++-- refinedstorage2-platform-test/build.gradle | 10 ---------- .../platform/test/SetupMinecraft.java | 14 -------------- .../platform/test/TagHelper.java | 18 ------------------ settings.gradle | 1 - 12 files changed, 10 insertions(+), 71 deletions(-) rename refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/SetupMinecraftCallback.java => refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SetupMinecraft.java (74%) delete mode 100644 refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SimpleListener.java delete mode 100644 refinedstorage2-platform-test/build.gradle delete mode 100644 refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/SetupMinecraft.java delete mode 100644 refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/TagHelper.java diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 86611e2dd..df8672e38 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -274,7 +274,6 @@ with `refinedstorage2-platform-*` have dependencies on Minecraft. | `refinedstorage2-resource-api` | ✔️ | Contains API for handling resources. | | `refinedstorage2-storage-api` | ✔️ | Contains storage related functionality. | | `refinedstorage2-platform-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. | -| `refinedstorage2-platform-test` | ✔️ | This module is used in platform tests for various Minecraft related helpers. | | `refinedstorage2-platform-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. | | `refinedstorage2-platform-forge` | ❌ | The platform module for Forge. This module contains Forge specific code and the integration tests. | | `refinedstorage2-platform-common` | ❌ | Common mod code. Most gameplay code is in here. | diff --git a/refinedstorage2-platform-api/build.gradle b/refinedstorage2-platform-api/build.gradle index dcec82b8e..89d14ae0c 100644 --- a/refinedstorage2-platform-api/build.gradle +++ b/refinedstorage2-platform-api/build.gradle @@ -17,7 +17,6 @@ dependencies { testImplementation libs.junit.params testRuntimeOnly libs.junit.engine testImplementation libs.assertj - testImplementation project(':refinedstorage2-platform-test') testImplementation libs.equalsverifier } diff --git a/refinedstorage2-platform-common/build.gradle b/refinedstorage2-platform-common/build.gradle index 12bcfbff5..5ff7533e6 100644 --- a/refinedstorage2-platform-common/build.gradle +++ b/refinedstorage2-platform-common/build.gradle @@ -19,7 +19,6 @@ dependencies { testImplementation libs.junit.params testRuntimeOnly libs.junit.engine testImplementation libs.assertj - testImplementation project(':refinedstorage2-platform-test') testImplementation libs.equalsverifier } diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/History.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/History.java index e6225f837..bea9f3d1a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/History.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/History.java @@ -42,7 +42,7 @@ public boolean save(final String value) { if (value.trim().isEmpty()) { return false; } - if (!items.isEmpty() && items.get(items.size() - 1).equals(value)) { + if (!items.isEmpty() && items.getLast().equals(value)) { return false; } items.add(value); diff --git a/refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/SetupMinecraftCallback.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SetupMinecraft.java similarity index 74% rename from refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/SetupMinecraftCallback.java rename to refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SetupMinecraft.java index 82a1e8d99..0ccc45f97 100644 --- a/refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/SetupMinecraftCallback.java +++ b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SetupMinecraft.java @@ -1,14 +1,15 @@ -package com.refinedmods.refinedstorage2.platform.test; +package com.refinedmods.refinedstorage2.platform.common; import net.minecraft.SharedConstants; import net.minecraft.server.Bootstrap; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; -public class SetupMinecraftCallback implements BeforeAllCallback { +public class SetupMinecraft implements BeforeAllCallback { @Override public void beforeAll(final ExtensionContext context) { SharedConstants.tryDetectVersion(); Bootstrap.bootStrap(); } } + diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SimpleListener.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SimpleListener.java deleted file mode 100644 index 3e2a1888a..000000000 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SimpleListener.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common; - -public class SimpleListener implements Runnable { - private int changes; - - @Override - public void run() { - changes++; - } - - public boolean isChanged() { - return changes > 0; - } - - public int getChanges() { - return changes; - } -} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java index ac8e04280..83d298742 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java +++ b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java @@ -7,9 +7,9 @@ import com.refinedmods.refinedstorage2.api.grid.view.GridViewBuilder; import com.refinedmods.refinedstorage2.api.grid.view.GridViewBuilderImpl; import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage2.platform.common.SetupMinecraft; import com.refinedmods.refinedstorage2.platform.common.grid.view.AbstractItemGridResourceFactory; import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.test.SetupMinecraft; import java.util.Comparator; import java.util.Optional; @@ -18,13 +18,14 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.fail; -@SetupMinecraft +@ExtendWith(SetupMinecraft.class) class GridSortingTypesTest { private static final GridResourceFactory FACTORY = new AbstractItemGridResourceFactory() { @Override diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java index c2821c349..dd2a21cfc 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java +++ b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java @@ -3,8 +3,8 @@ import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; import com.refinedmods.refinedstorage2.platform.api.support.resource.list.FuzzyResourceList; +import com.refinedmods.refinedstorage2.platform.common.SetupMinecraft; import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.test.SetupMinecraft; import java.util.Collection; import java.util.Optional; @@ -15,10 +15,11 @@ import net.minecraft.world.item.Items; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import static org.assertj.core.api.Assertions.assertThat; -@SetupMinecraft +@ExtendWith(SetupMinecraft.class) class FuzzyResourceListImplTest { private static final ItemResource DUMMY_A = new ItemResource(Items.DIRT, DataComponentPatch.EMPTY); private static final ItemResource DUMMY_B = new ItemResource(Items.DIRT, DataComponentPatch.builder() diff --git a/refinedstorage2-platform-test/build.gradle b/refinedstorage2-platform-test/build.gradle deleted file mode 100644 index d16fb9d3d..000000000 --- a/refinedstorage2-platform-test/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -archivesBaseName = 'refinedstorage2-platform-test' - -commonProject() - -dependencies { - implementation libs.junit.api -} - -enableJavadoc() -enablePublishing() diff --git a/refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/SetupMinecraft.java b/refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/SetupMinecraft.java deleted file mode 100644 index 58a05ea0c..000000000 --- a/refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/SetupMinecraft.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.test; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.junit.jupiter.api.extension.ExtendWith; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -@ExtendWith(SetupMinecraftCallback.class) -public @interface SetupMinecraft { -} diff --git a/refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/TagHelper.java b/refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/TagHelper.java deleted file mode 100644 index 24ef3580b..000000000 --- a/refinedstorage2-platform-test/src/main/java/com/refinedmods/refinedstorage2/platform/test/TagHelper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.test; - -import net.minecraft.nbt.CompoundTag; - -public final class TagHelper { - private TagHelper() { - } - - public static CompoundTag createDummyTag() { - return createDummyTag("tag"); - } - - public static CompoundTag createDummyTag(final String id) { - final CompoundTag tag = new CompoundTag(); - tag.putString("dummy", id); - return tag; - } -} diff --git a/settings.gradle b/settings.gradle index 77b7e05d5..b196264c1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -29,5 +29,4 @@ include 'refinedstorage2-platform-api' include 'refinedstorage2-platform-fabric' include 'refinedstorage2-platform-forge' include 'refinedstorage2-platform-common' -include 'refinedstorage2-platform-test' include 'refinedstorage2-network-test' From 03d02f1e07e1e6e9726404c236c3af227126ade0 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 4 Jul 2024 12:56:16 +0200 Subject: [PATCH 7/9] refactor: rename packages to "refinedstorage" instead of "refinedstorage2" --- .github/CONTRIBUTING.md | 46 +- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- .gitignore | 2 +- .idea/dictionaries/refinedstorage2.xml | 9 - CHANGELOG.md | 2 +- build.gradle | 20 +- config/checkstyle/checkstyle-imports.xml | 2 +- crowdin.yml | 4 +- .../decision/001-multi-loader-architecture.md | 4 +- doc/architecture/decision/002-api-modules.md | 4 +- .../decision/003-the-platform-api-module.md | 6 +- .../decision/004-coverage-requirements.md | 2 +- doc/architecture/decision/005-unit-testing.md | 4 +- .../decision/006-no-persistent-networks.md | 4 +- .../decision/010-shared-storage.md | 4 +- refinedstorage-core-api/build.gradle | 21 + .../refinedstorage/api/core/Action.java | 9 + .../api/core/CoreValidations.java | 2 +- .../FieldsAndMethodsAreNonnullByDefault.java | 2 +- .../api/core/component/ComponentAccessor.java | 2 +- .../api/core/component/ComponentMap.java | 2 +- .../core/component/ComponentMapFactory.java | 2 +- .../api/core/component/package-info.java | 7 + .../refinedstorage/api/core/package-info.java | 5 + .../src/main/resources/fabric.mod.json | 19 + .../api/core/CoreValidationsTest.java | 2 +- .../component/ComponentMapFactoryTest.java | 2 +- refinedstorage-grid-api/build.gradle | 28 + .../api/grid/operations/GridExtractMode.java | 2 +- .../api/grid/operations/GridInsertMode.java | 2 +- .../api/grid/operations/GridOperations.java | 8 +- .../grid/operations/GridOperationsImpl.java | 16 +- .../grid/operations/NoopGridOperations.java | 21 + .../api/grid/operations/package-info.java | 7 + .../api/grid/query/GridQueryParser.java | 12 + .../grid/query/GridQueryParserException.java | 2 +- .../api/grid/query/GridQueryParserImpl.java | 36 +- .../api/grid/query/package-info.java | 7 + .../api/grid/view/GridResource.java | 4 +- .../grid/view/GridResourceAttributeKey.java | 2 +- .../api/grid/view/GridResourceFactory.java | 4 +- .../api/grid/view/GridSortingDirection.java | 2 +- .../api/grid/view/GridSortingType.java | 2 +- .../api/grid/view/GridView.java | 8 +- .../api/grid/view/GridViewBuilder.java | 6 +- .../api/grid/view/GridViewBuilderImpl.java | 10 +- .../api/grid/view/GridViewImpl.java | 16 +- .../api/grid/view/package-info.java | 7 + .../api/grid/watcher/GridWatcher.java | 6 +- .../api/grid/watcher/GridWatcherManager.java | 27 + .../grid/watcher/GridWatcherManagerImpl.java | 6 +- .../grid/watcher/GridWatcherRegistration.java | 8 +- .../api/grid/watcher/package-info.java | 7 + .../src/main/resources/fabric.mod.json | 19 + .../refinedstorage/api/grid/TestResource.java | 10 + .../grid/query/GridQueryParserImplTest.java | 18 +- .../grid/service/GridOperationsImplTest.java | 36 +- .../view/FakeGridResourceAttributeKeys.java | 2 +- .../api/grid/view/GridResourceImpl.java | 8 +- .../api/grid/view/GridViewImplTest.java | 18 +- .../watcher/GridWatcherManagerImplTest.java | 20 +- refinedstorage-network-api/build.gradle | 16 + .../api/network/ConnectionProvider.java | 15 + .../api/network/Connections.java | 4 +- .../refinedstorage/api/network/Network.java | 21 + .../api/network/NetworkBuilder.java | 6 +- .../api/network/NetworkComponent.java | 4 +- .../energy/EnergyNetworkComponent.java | 9 + .../api/network/energy/EnergyProvider.java | 2 +- .../api/network/energy/EnergyStorage.java | 4 +- .../api/network/energy/package-info.java | 7 + .../network/node/GraphNetworkComponent.java | 6 +- .../api/network/node/NetworkNode.java | 15 + .../api/network/node/NetworkNodeActor.java | 13 + .../node/container/NetworkNodeContainer.java | 6 +- .../network/node/container/package-info.java | 7 + .../exporter/ExporterTransferStrategy.java | 15 + .../network/node/exporter/package-info.java | 7 + .../ExternalStorageProviderFactory.java | 20 + .../node/externalstorage/package-info.java | 7 + .../importer/ImporterTransferStrategy.java | 15 + .../network/node/importer/package-info.java | 7 + .../api/network/node/package-info.java | 7 + .../api/network/node/task/Task.java | 9 + .../api/network/node/task/TaskExecutor.java | 2 +- .../api/network/node/task/package-info.java | 7 + .../api/network/package-info.java | 7 + .../api/network/security/Permission.java | 7 + .../api/network/security/SecurityActor.java | 7 + .../network/security/SecurityDecision.java | 2 +- .../security/SecurityDecisionProvider.java | 2 +- .../security/SecurityNetworkComponent.java | 12 + .../api/network/security/SecurityPolicy.java | 2 +- .../api/network/security/package-info.java | 7 + .../storage/StorageNetworkComponent.java | 18 + .../api/network/storage/StorageProvider.java | 26 + .../api/network/storage/package-info.java | 7 + .../src/main/resources/fabric.mod.json | 19 + refinedstorage-network-test/build.gradle | 25 + .../network/test/AddNetworkNode.java | 2 +- .../network/test/InjectNetwork.java | 2 +- .../test/InjectNetworkEnergyComponent.java | 2 +- .../test/InjectNetworkSecurityComponent.java | 2 +- .../test/InjectNetworkStorageComponent.java | 2 +- .../network/test/NetworkTest.java | 51 + .../network/test/NetworkTestExtension.java | 26 +- .../network/test/NetworkTestFixtures.java | 45 + .../network/test/RegisterNetworkNode.java | 19 + .../network/test/RegisterNetworkNodes.java | 2 +- .../network/test/SetupNetwork.java | 2 +- .../network/test/SetupNetworks.java | 2 +- .../network/test/fake/FakeActor.java | 15 + .../network/test/fake/FakePermissions.java | 7 + .../network/test/fake/FakeResources.java | 13 + .../network/test/fake/FakeSecurityActors.java | 7 + .../network/test/fake/package-info.java | 7 + .../AbstractNetworkNodeFactory.java | 8 +- .../ControllerNetworkNodeFactory.java | 14 + .../DetectorNetworkNodeFactory.java | 14 + .../ExporterNetworkNodeFactory.java | 14 + .../ExternalStorageNetworkNodeFactory.java | 20 + .../nodefactory/GridNetworkNodeFactory.java | 14 + .../ImporterNetworkNodeFactory.java | 14 + .../InterfaceNetworkNodeFactory.java | 14 + .../test/nodefactory/NetworkNodeFactory.java | 11 + .../RelayInputNetworkNodeFactory.java | 14 + .../RelayOutputNetworkNodeFactory.java | 14 + .../nodefactory/SimpleNetworkNodeFactory.java | 14 + .../StorageNetworkNodeFactory.java | 23 + .../StorageTransferNetworkNodeFactory.java | 23 + .../test/nodefactory/package-info.java | 7 + .../network/test/package-info.java | 7 + .../InheritanceNetworkTestExtensionTest.java | 4 +- .../network/test/NetworkNodeFactoryTest.java | 53 + .../test/NetworkTestExtensionTest.java | 26 +- refinedstorage-network/build.gradle | 28 + .../api/network/impl/NetworkBuilderImpl.java | 20 +- .../api/network/impl/NetworkFactory.java | 17 + .../api/network/impl/NetworkImpl.java | 47 + .../AbstractListeningEnergyStorage.java | 6 +- .../energy/AbstractProxyEnergyStorage.java | 6 +- .../energy/EnergyNetworkComponentImpl.java | 8 +- .../impl/energy/EnergyStorageImpl.java | 8 +- .../api/network/impl/energy/package-info.java | 7 + .../impl/node/AbstractNetworkNode.java | 8 +- .../AbstractStorageContainerNetworkNode.java | 8 +- .../impl/node/GraphNetworkComponentImpl.java | 8 +- .../network/impl/node/SimpleNetworkNode.java | 2 +- .../NetworkNodeContainerPriorities.java | 2 +- .../impl/node/container/package-info.java | 7 + .../controller/ControllerEnergyState.java | 8 + .../controller/ControllerNetworkNode.java | 10 +- .../impl/node/controller/package-info.java | 7 + .../AbstractDetectorAmountStrategy.java | 11 + .../node/detector/DetectorAmountStrategy.java | 8 + .../detector/DetectorAmountStrategyImpl.java | 15 + .../impl/node/detector/DetectorMode.java | 7 + .../node/detector/DetectorNetworkNode.java | 6 +- .../impl/node/detector/package-info.java | 7 + .../CompositeExporterTransferStrategy.java | 26 + .../node/exporter/ExporterNetworkNode.java | 18 +- .../ExporterTransferStrategyImpl.java | 20 +- .../impl/node/exporter/package-info.java | 7 + .../ExposedExternalStorage.java | 26 +- .../ExternalStorageNetworkNode.java | 76 + .../node/externalstorage/package-info.java | 7 + .../impl/node/grid/GridNetworkNode.java | 52 + .../network/impl/node/grid/package-info.java | 7 + .../impl/node/iface/InterfaceExportState.java | 8 +- .../impl/node/iface/InterfaceNetworkNode.java | 24 +- .../InterfaceExternalStorageProvider.java | 11 + .../InterfaceExternalStorageProviderImpl.java | 16 +- .../iface/externalstorage/package-info.java | 7 + .../network/impl/node/iface/package-info.java | 7 + .../node/importer/ImporterNetworkNode.java | 68 + .../impl/node/importer/ImporterSource.java | 24 + .../ImporterTransferStrategyImpl.java | 18 +- .../impl/node/importer/package-info.java | 7 + .../api/network/impl/node/package-info.java | 7 + .../impl/node/relay/RelayComponentType.java | 7 + .../node/relay/RelayInputNetworkNode.java | 20 +- .../node/relay/RelayOutputNetworkNode.java | 32 +- .../impl/node/relay/RelayOutputStorage.java | 32 +- .../network/impl/node/relay/package-info.java | 7 + ...urityDecisionProviderProxyNetworkNode.java | 12 +- .../impl/node/security/package-info.java | 7 + .../impl/node/storage/ExposedStorage.java | 76 + .../impl/node/storage/StorageNetworkNode.java | 14 +- .../impl/node/storage/package-info.java | 7 + .../StorageTransferListener.java | 6 + .../storagetransfer/StorageTransferMode.java | 6 + .../StorageTransferNetworkNode.java | 28 +- .../node/storagetransfer/package-info.java | 7 + .../impl/node/task/DefaultTaskExecutor.java | 17 + .../impl/node/task/RandomTaskExecutor.java | 6 +- .../node/task/RoundRobinTaskExecutor.java | 6 +- .../network/impl/node/task/package-info.java | 7 + .../api/network/impl/package-info.java | 7 + .../SecurityDecisionProviderImpl.java | 12 +- .../SecurityNetworkComponentImpl.java | 18 +- .../network/impl/security/package-info.java | 7 + .../AbstractConfiguredProxyStorage.java | 22 +- ...stractImmutableConfiguredProxyStorage.java | 4 +- .../NetworkNodeStorageConfiguration.java | 18 +- .../impl/storage/StorageConfiguration.java | 36 + .../storage/StorageNetworkComponentImpl.java | 54 + .../network/impl/storage/package-info.java | 7 + .../src/main/resources/fabric.mod.json | 19 + .../impl/AbstractNetworkBuilderImplTest.java | 18 +- .../network/impl/FakeConnectionProvider.java | 8 +- .../InitializeNetworkBuilderImplTest.java | 8 +- .../impl/PriorityNetworkBuilderImplTest.java | 32 +- .../impl/RemoveNetworkBuilderImplTest.java | 8 +- .../api/network/impl/SpyingNetworkNode.java | 4 +- .../impl/UpdateNetworkBuilderImplTest.java | 8 +- .../EnergyNetworkComponentImplTest.java | 12 +- .../impl/energy/EnergyStorageImplTest.java | 6 +- .../energy/ListeningEnergyStorageTest.java | 6 +- .../impl/energy/ProxyEnergyStorageTest.java | 4 +- .../node/GraphNetworkComponentImplTest.java | 12 +- .../api/network/impl/node/ProviderImpl.java | 4 +- .../impl/node/SimpleNetworkNodeTest.java | 78 ++ .../controller/ControllerNetworkNodeTest.java | 12 +- .../detector/DetectorNetworkNodeTest.java | 24 +- .../AbstractExporterNetworkNodeTest.java | 46 +- ...FirstAvailableExporterNetworkNodeTest.java | 40 +- .../RandomExporterNetworkNodeTest.java | 96 ++ .../RoundRobinExporterNetworkNodeTest.java | 32 +- .../ExternalStorageNetworkNodeTest.java | 50 +- .../ExternalStorageProviderFactoryImpl.java | 14 + .../StorageExternalStorageProvider.java | 33 + .../impl/node/grid/GridNetworkNodeTest.java | 48 +- .../ClearSlotInterfaceNetworkNodeTest.java | 22 +- ...rtToEmptySlotInterfaceNetworkNodeTest.java | 30 +- .../node/iface/InterfaceExportStateImpl.java | 16 +- .../node/iface/InterfaceNetworkNodeTest.java | 28 +- ...KeepExportingInterfaceNetworkNodeTest.java | 32 +- ...erfaceExternalStorageProviderImplTest.java | 32 +- ...erfaceExternalStorageProviderImplTest.java | 40 +- ...erfaceExternalStorageProviderImplTest.java | 64 + .../node/importer/FakeImporterSource.java | 47 + .../importer/ImporterNetworkNodeTest.java | 46 +- .../relay/RelayEnergyNetworkNodeTest.java | 106 ++ .../impl/node/relay/RelayNetworkNodeTest.java | 56 +- .../relay/RelaySecurityNetworkNodeTest.java | 46 +- .../relay/RelayStorageNetworkNodeTest.java | 60 +- .../PriorityStorageNetworkNodeTest.java | 76 + .../node/storage/StorageNetworkNodeTest.java | 60 +- .../StorageTransferNetworkNodeTest.java | 46 +- .../SecurityNetworkComponentImplTest.java | 14 +- .../StorageNetworkComponentImplTest.java | 34 +- refinedstorage-platform-api/build.gradle | 28 + .../platform/api/PlatformApi.java | 208 +++ .../platform/api/PlatformApiProxy.java | 92 +- .../platform/api/RefinedStoragePlugin.java | 2 +- .../ConfigurationCardTarget.java | 2 +- .../api/configurationcard/package-info.java | 7 + .../ConstructorStrategy.java | 14 + .../ConstructorStrategyFactory.java | 4 +- .../DestructorStrategy.java | 8 +- .../DestructorStrategyFactory.java | 4 +- .../constructordestructor/package-info.java | 7 + .../platform/api/exporter/AmountOverride.java | 4 +- .../ExporterTransferStrategyFactory.java | 22 + .../platform/api/exporter/package-info.java | 7 + .../platform/api/grid/Grid.java | 28 + .../platform/api/grid/GridInsertionHint.java | 2 +- .../platform/api/grid/GridInsertionHints.java | 2 +- .../api/grid/GridResourceAttributeKeys.java | 13 + .../platform/api/grid/GridScrollMode.java | 7 + .../platform/api/grid/GridSynchronizer.java | 2 +- .../platform/api/grid/package-info.java | 7 + .../grid/strategy/GridExtractionStrategy.java | 11 + .../GridExtractionStrategyFactory.java | 13 + .../grid/strategy/GridInsertionStrategy.java | 12 + .../GridInsertionStrategyFactory.java | 13 + .../grid/strategy/GridScrollingStrategy.java | 11 + .../GridScrollingStrategyFactory.java | 13 + .../api/grid/strategy/package-info.java | 7 + .../view/AbstractPlatformGridResource.java | 12 +- .../api/grid/view/PlatformGridResource.java | 45 + .../platform/api/grid/view/package-info.java | 7 + .../ImporterTransferStrategyFactory.java | 22 + .../platform/api/importer/package-info.java | 7 + .../platform/api/package-info.java | 7 + .../api/security/BuiltinPermissions.java | 2 +- .../api/security/PlatformPermission.java | 4 +- .../PlatformSecurityNetworkComponent.java | 12 + .../platform/api/security/SecurityHelper.java | 10 +- .../security/SecurityPolicyContainerItem.java | 6 +- .../platform/api/security/package-info.java | 7 + .../AbstractStorageContainerBlockItem.java | 4 +- .../storage/AbstractStorageContainerItem.java | 4 +- .../platform/api/storage/PlayerActor.java | 4 +- .../api/storage/SerializableStorage.java | 18 + .../api/storage/StorageBlockEntity.java | 2 +- .../api/storage/StorageContainerItem.java | 2 +- .../storage/StorageContainerItemHelper.java | 2 +- .../platform/api/storage/StorageInfo.java | 18 + .../api/storage/StorageRepository.java | 2 +- .../platform/api/storage/StorageType.java | 4 +- .../storage/channel/FuzzyStorageChannel.java | 14 + .../api/storage/channel/package-info.java | 7 + ...latformExternalStorageProviderFactory.java | 19 + .../storage/externalstorage/package-info.java | 7 + .../platform/api/storage/package-info.java | 7 + .../StorageMonitorExtractionStrategy.java | 14 + .../StorageMonitorInsertionStrategy.java | 16 + .../api/storagemonitor/package-info.java | 7 + .../api/support/AmountFormatting.java | 2 +- .../api/support/HelpTooltipComponent.java | 2 +- .../energy/AbstractEnergyBlockItem.java | 2 +- .../support/energy/AbstractEnergyItem.java | 2 +- .../AbstractNetworkBoundEnergyItem.java | 10 +- .../api/support/energy/EnergyItemHelper.java | 2 +- .../energy/TransferableBlockEntityEnergy.java | 10 + .../api/support/energy/package-info.java | 7 + ...stractNetworkNodeContainerBlockEntity.java | 6 +- .../api/support/network/ConnectionLogic.java | 6 +- .../api/support/network/ConnectionSink.java | 2 +- .../network/InWorldNetworkNodeContainer.java | 21 + .../NetworkNodeContainerBlockEntity.java | 19 + .../bounditem/NetworkBoundItemHelper.java | 2 +- .../bounditem/NetworkBoundItemSession.java | 16 + .../NetworkBoundItemTargetBlockEntity.java | 13 + .../network/bounditem/SlotReference.java | 2 +- .../bounditem/SlotReferenceFactory.java | 4 +- .../bounditem/SlotReferenceProvider.java | 2 +- .../network/bounditem/package-info.java | 7 + .../api/support/network/package-info.java | 7 + .../platform/api/support/package-info.java | 7 + .../support/registry/PlatformRegistry.java | 2 +- .../api/support/registry/package-info.java | 7 + .../resource/AbstractResourceType.java | 2 +- .../support/resource/FuzzyModeNormalizer.java | 10 + .../support/resource/PlatformResourceKey.java | 12 + .../RecipeModIngredientConverter.java | 2 +- .../support/resource/ResourceContainer.java | 8 +- .../api/support/resource/ResourceFactory.java | 16 + .../support/resource/ResourceRendering.java | 4 +- .../api/support/resource/ResourceType.java | 46 + .../resource/list/FuzzyResourceList.java | 21 + .../support/resource/list/package-info.java | 7 + .../api/support/resource/package-info.java | 7 + .../api/upgrade/AbstractUpgradeItem.java | 2 +- .../upgrade/BuiltinUpgradeDestinations.java | 2 +- .../api/upgrade/UpgradeDestination.java | 2 +- .../platform/api/upgrade/UpgradeItem.java | 8 + .../platform/api/upgrade/UpgradeMapping.java | 2 +- .../platform/api/upgrade/UpgradeRegistry.java | 2 +- .../platform/api/upgrade/UpgradeState.java | 2 +- .../platform/api/upgrade/package-info.java | 7 + .../WirelessTransmitter.java | 2 +- .../WirelessTransmitterRangeModifier.java | 15 + .../api/wirelesstransmitter/package-info.java | 7 + .../src/main/resources/fabric.mod.json | 19 + .../api/support/AmountFormattingTest.java | 2 +- refinedstorage-platform-common/build.gradle | 29 + .../blockstates/black_cable.json | 62 + .../blockstates/black_constructor.json | 180 +++ .../blockstates/black_controller.json | 16 + .../blockstates/black_crafting_grid.json | 110 ++ .../black_creative_controller.json | 16 + .../blockstates/black_destructor.json | 180 +++ .../blockstates/black_detector.json | 56 + .../blockstates/black_disk_interface.json | 7 + .../blockstates/black_exporter.json | 115 ++ .../blockstates/black_external_storage.json | 115 ++ .../blockstates/black_grid.json | 110 ++ .../blockstates/black_importer.json | 115 ++ .../blockstates/black_network_receiver.json | 10 + .../black_network_transmitter.json | 13 + .../blockstates/black_relay.json | 52 + .../blockstates/black_security_manager.json | 34 + .../black_wireless_transmitter.json | 56 + .../blockstates/blue_cable.json | 62 + .../blockstates/blue_constructor.json | 180 +++ .../blockstates/blue_controller.json | 16 + .../blockstates/blue_crafting_grid.json | 110 ++ .../blockstates/blue_creative_controller.json | 16 + .../blockstates/blue_destructor.json | 180 +++ .../blockstates/blue_detector.json | 56 + .../blockstates/blue_disk_interface.json | 7 + .../blockstates/blue_exporter.json | 115 ++ .../blockstates/blue_external_storage.json | 115 ++ .../refinedstorage/blockstates/blue_grid.json | 110 ++ .../blockstates/blue_importer.json | 115 ++ .../blockstates/blue_network_receiver.json | 10 + .../blockstates/blue_network_transmitter.json | 13 + .../blockstates/blue_relay.json | 52 + .../blockstates/blue_security_manager.json | 34 + .../blue_wireless_transmitter.json | 56 + .../blockstates/brown_cable.json | 62 + .../blockstates/brown_constructor.json | 180 +++ .../blockstates/brown_controller.json | 16 + .../blockstates/brown_crafting_grid.json | 110 ++ .../brown_creative_controller.json | 16 + .../blockstates/brown_destructor.json | 180 +++ .../blockstates/brown_detector.json | 56 + .../blockstates/brown_disk_interface.json | 7 + .../blockstates/brown_exporter.json | 115 ++ .../blockstates/brown_external_storage.json | 115 ++ .../blockstates/brown_grid.json | 110 ++ .../blockstates/brown_importer.json | 115 ++ .../blockstates/brown_network_receiver.json | 10 + .../brown_network_transmitter.json | 13 + .../blockstates/brown_relay.json | 52 + .../blockstates/brown_security_manager.json | 34 + .../brown_wireless_transmitter.json | 56 + .../refinedstorage/blockstates/cable.json | 62 + .../blockstates/constructor.json | 180 +++ .../blockstates/controller.json | 16 + .../blockstates/crafting_grid.json | 110 ++ .../blockstates/creative_controller.json | 16 + .../blockstates/cyan_cable.json | 62 + .../blockstates/cyan_constructor.json | 180 +++ .../blockstates/cyan_controller.json | 16 + .../blockstates/cyan_crafting_grid.json | 110 ++ .../blockstates/cyan_creative_controller.json | 16 + .../blockstates/cyan_destructor.json | 180 +++ .../blockstates/cyan_detector.json | 56 + .../blockstates/cyan_disk_interface.json | 7 + .../blockstates/cyan_exporter.json | 115 ++ .../blockstates/cyan_external_storage.json | 115 ++ .../refinedstorage/blockstates/cyan_grid.json | 110 ++ .../blockstates/cyan_importer.json | 115 ++ .../blockstates/cyan_network_receiver.json | 10 + .../blockstates/cyan_network_transmitter.json | 13 + .../blockstates/cyan_relay.json | 52 + .../blockstates/cyan_security_manager.json | 34 + .../cyan_wireless_transmitter.json | 56 + .../blockstates/destructor.json | 180 +++ .../refinedstorage/blockstates/detector.json | 56 + .../blockstates/disk_interface.json | 7 + .../refinedstorage/blockstates/exporter.json | 115 ++ .../blockstates/external_storage.json | 115 ++ .../blockstates/gray_controller.json | 16 + .../blockstates/gray_crafting_grid.json | 110 ++ .../blockstates/gray_creative_controller.json | 16 + .../blockstates/gray_detector.json | 56 + .../blockstates/gray_disk_interface.json | 7 + .../refinedstorage/blockstates/gray_grid.json | 110 ++ .../blockstates/gray_network_receiver.json | 10 + .../blockstates/gray_network_transmitter.json | 13 + .../blockstates/gray_relay.json | 52 + .../blockstates/gray_security_manager.json | 34 + .../gray_wireless_transmitter.json | 56 + .../blockstates/green_cable.json | 62 + .../blockstates/green_constructor.json | 180 +++ .../blockstates/green_controller.json | 16 + .../blockstates/green_crafting_grid.json | 110 ++ .../green_creative_controller.json | 16 + .../blockstates/green_destructor.json | 180 +++ .../blockstates/green_detector.json | 56 + .../blockstates/green_disk_interface.json | 7 + .../blockstates/green_exporter.json | 115 ++ .../blockstates/green_external_storage.json | 115 ++ .../blockstates/green_grid.json | 110 ++ .../blockstates/green_importer.json | 115 ++ .../blockstates/green_network_receiver.json | 10 + .../green_network_transmitter.json | 13 + .../blockstates/green_relay.json | 52 + .../blockstates/green_security_manager.json | 34 + .../green_wireless_transmitter.json | 56 + .../refinedstorage/blockstates/grid.json | 110 ++ .../refinedstorage/blockstates/importer.json | 115 ++ .../blockstates/light_blue_cable.json | 62 + .../blockstates/light_blue_constructor.json | 180 +++ .../blockstates/light_blue_destructor.json | 180 +++ .../blockstates/light_blue_exporter.json | 115 ++ .../light_blue_external_storage.json | 115 ++ .../blockstates/light_blue_importer.json | 115 ++ .../blockstates/light_gray_cable.json | 62 + .../blockstates/light_gray_constructor.json | 180 +++ .../blockstates/light_gray_controller.json | 16 + .../blockstates/light_gray_crafting_grid.json | 110 ++ .../light_gray_creative_controller.json | 16 + .../blockstates/light_gray_destructor.json | 180 +++ .../blockstates/light_gray_detector.json | 56 + .../light_gray_disk_interface.json | 7 + .../blockstates/light_gray_exporter.json | 115 ++ .../light_gray_external_storage.json | 115 ++ .../blockstates/light_gray_grid.json | 110 ++ .../blockstates/light_gray_importer.json | 115 ++ .../light_gray_network_receiver.json | 10 + .../light_gray_network_transmitter.json | 13 + .../blockstates/light_gray_relay.json | 52 + .../light_gray_security_manager.json | 34 + .../light_gray_wireless_transmitter.json | 56 + .../blockstates/lime_cable.json | 62 + .../blockstates/lime_constructor.json | 180 +++ .../blockstates/lime_controller.json | 16 + .../blockstates/lime_crafting_grid.json | 110 ++ .../blockstates/lime_creative_controller.json | 16 + .../blockstates/lime_destructor.json | 180 +++ .../blockstates/lime_detector.json | 56 + .../blockstates/lime_disk_interface.json | 7 + .../blockstates/lime_exporter.json | 115 ++ .../blockstates/lime_external_storage.json | 115 ++ .../refinedstorage/blockstates/lime_grid.json | 110 ++ .../blockstates/lime_importer.json | 115 ++ .../blockstates/lime_network_receiver.json | 10 + .../blockstates/lime_network_transmitter.json | 13 + .../blockstates/lime_relay.json | 52 + .../blockstates/lime_security_manager.json | 34 + .../lime_wireless_transmitter.json | 56 + .../blockstates/magenta_cable.json | 62 + .../blockstates/magenta_constructor.json | 180 +++ .../blockstates/magenta_controller.json | 16 + .../blockstates/magenta_crafting_grid.json | 110 ++ .../magenta_creative_controller.json | 16 + .../blockstates/magenta_destructor.json | 180 +++ .../blockstates/magenta_detector.json | 56 + .../blockstates/magenta_disk_interface.json | 7 + .../blockstates/magenta_exporter.json | 115 ++ .../blockstates/magenta_external_storage.json | 115 ++ .../blockstates/magenta_grid.json | 110 ++ .../blockstates/magenta_importer.json | 115 ++ .../blockstates/magenta_network_receiver.json | 10 + .../magenta_network_transmitter.json | 13 + .../blockstates/magenta_relay.json | 52 + .../blockstates/magenta_security_manager.json | 34 + .../magenta_wireless_transmitter.json | 56 + .../blockstates/network_receiver.json | 10 + .../blockstates/network_transmitter.json | 13 + .../blockstates/orange_cable.json | 62 + .../blockstates/orange_constructor.json | 180 +++ .../blockstates/orange_controller.json | 16 + .../blockstates/orange_crafting_grid.json | 110 ++ .../orange_creative_controller.json | 16 + .../blockstates/orange_destructor.json | 180 +++ .../blockstates/orange_detector.json | 56 + .../blockstates/orange_disk_interface.json | 7 + .../blockstates/orange_exporter.json | 115 ++ .../blockstates/orange_external_storage.json | 115 ++ .../blockstates/orange_grid.json | 110 ++ .../blockstates/orange_importer.json | 115 ++ .../blockstates/orange_network_receiver.json | 10 + .../orange_network_transmitter.json | 13 + .../blockstates/orange_relay.json | 52 + .../blockstates/orange_security_manager.json | 34 + .../orange_wireless_transmitter.json | 56 + .../blockstates/pink_cable.json | 62 + .../blockstates/pink_constructor.json | 180 +++ .../blockstates/pink_controller.json | 16 + .../blockstates/pink_crafting_grid.json | 110 ++ .../blockstates/pink_creative_controller.json | 16 + .../blockstates/pink_destructor.json | 180 +++ .../blockstates/pink_detector.json | 56 + .../blockstates/pink_disk_interface.json | 7 + .../blockstates/pink_exporter.json | 115 ++ .../blockstates/pink_external_storage.json | 115 ++ .../refinedstorage/blockstates/pink_grid.json | 110 ++ .../blockstates/pink_importer.json | 115 ++ .../blockstates/pink_network_receiver.json | 10 + .../blockstates/pink_network_transmitter.json | 13 + .../blockstates/pink_relay.json | 52 + .../blockstates/pink_security_manager.json | 34 + .../pink_wireless_transmitter.json | 56 + .../blockstates/purple_cable.json | 62 + .../blockstates/purple_constructor.json | 180 +++ .../blockstates/purple_controller.json | 16 + .../blockstates/purple_crafting_grid.json | 110 ++ .../purple_creative_controller.json | 16 + .../blockstates/purple_destructor.json | 180 +++ .../blockstates/purple_detector.json | 56 + .../blockstates/purple_disk_interface.json | 7 + .../blockstates/purple_exporter.json | 115 ++ .../blockstates/purple_external_storage.json | 115 ++ .../blockstates/purple_grid.json | 110 ++ .../blockstates/purple_importer.json | 115 ++ .../blockstates/purple_network_receiver.json | 10 + .../purple_network_transmitter.json | 13 + .../blockstates/purple_relay.json | 52 + .../blockstates/purple_security_manager.json | 34 + .../purple_wireless_transmitter.json | 56 + .../refinedstorage/blockstates/red_cable.json | 62 + .../blockstates/red_constructor.json | 180 +++ .../blockstates/red_controller.json | 16 + .../blockstates/red_crafting_grid.json | 110 ++ .../blockstates/red_creative_controller.json | 16 + .../blockstates/red_destructor.json | 180 +++ .../blockstates/red_detector.json | 56 + .../blockstates/red_disk_interface.json | 7 + .../blockstates/red_exporter.json | 115 ++ .../blockstates/red_external_storage.json | 115 ++ .../refinedstorage/blockstates/red_grid.json | 110 ++ .../blockstates/red_importer.json | 115 ++ .../blockstates/red_network_receiver.json | 10 + .../blockstates/red_network_transmitter.json | 13 + .../refinedstorage/blockstates/red_relay.json | 52 + .../blockstates/red_security_manager.json | 34 + .../blockstates/red_wireless_transmitter.json | 56 + .../refinedstorage/blockstates/relay.json | 52 + .../blockstates/security_manager.json | 34 + .../blockstates/white_cable.json | 62 + .../blockstates/white_constructor.json | 180 +++ .../blockstates/white_controller.json | 16 + .../blockstates/white_crafting_grid.json | 110 ++ .../white_creative_controller.json | 16 + .../blockstates/white_destructor.json | 180 +++ .../blockstates/white_detector.json | 56 + .../blockstates/white_disk_interface.json | 7 + .../blockstates/white_exporter.json | 115 ++ .../blockstates/white_external_storage.json | 115 ++ .../blockstates/white_grid.json | 110 ++ .../blockstates/white_importer.json | 115 ++ .../blockstates/white_network_receiver.json | 10 + .../white_network_transmitter.json | 13 + .../blockstates/white_relay.json | 52 + .../blockstates/white_security_manager.json | 34 + .../white_wireless_transmitter.json | 56 + .../blockstates/wireless_transmitter.json | 56 + .../blockstates/yellow_cable.json | 62 + .../blockstates/yellow_constructor.json | 180 +++ .../blockstates/yellow_controller.json | 16 + .../blockstates/yellow_crafting_grid.json | 110 ++ .../yellow_creative_controller.json | 16 + .../blockstates/yellow_destructor.json | 180 +++ .../blockstates/yellow_detector.json | 56 + .../blockstates/yellow_disk_interface.json | 7 + .../blockstates/yellow_exporter.json | 115 ++ .../blockstates/yellow_external_storage.json | 115 ++ .../blockstates/yellow_grid.json | 110 ++ .../blockstates/yellow_importer.json | 115 ++ .../blockstates/yellow_network_receiver.json | 10 + .../yellow_network_transmitter.json | 13 + .../blockstates/yellow_relay.json | 52 + .../blockstates/yellow_security_manager.json | 34 + .../yellow_wireless_transmitter.json | 56 + .../models/block/cable/core/black.json | 7 + .../models/block/cable/core/blue.json | 7 + .../models/block/cable/core/brown.json | 7 + .../models/block/cable/core/cyan.json | 7 + .../models/block/cable/core/gray.json | 7 + .../models/block/cable/core/green.json | 7 + .../models/block/cable/core/light_blue.json | 7 + .../models/block/cable/core/light_gray.json | 7 + .../models/block/cable/core/lime.json | 7 + .../models/block/cable/core/magenta.json | 7 + .../models/block/cable/core/orange.json | 7 + .../models/block/cable/core/pink.json | 7 + .../models/block/cable/core/purple.json | 7 + .../models/block/cable/core/red.json | 7 + .../models/block/cable/core/white.json | 7 + .../models/block/cable/core/yellow.json | 7 + .../models/block/cable/extension/black.json | 7 + .../models/block/cable/extension/blue.json | 7 + .../models/block/cable/extension/brown.json | 7 + .../models/block/cable/extension/cyan.json | 7 + .../models/block/cable/extension/gray.json | 7 + .../models/block/cable/extension/green.json | 7 + .../block/cable/extension/light_blue.json | 7 + .../block/cable/extension/light_gray.json | 7 + .../models/block/cable/extension/lime.json | 7 + .../models/block/cable/extension/magenta.json | 7 + .../models/block/cable/extension/orange.json | 7 + .../models/block/cable/extension/pink.json | 7 + .../models/block/cable/extension/purple.json | 7 + .../models/block/cable/extension/red.json | 7 + .../models/block/cable/extension/white.json | 7 + .../models/block/cable/extension/yellow.json | 7 + .../models/block/controller/black.json | 8 + .../models/block/controller/blue.json | 8 + .../models/block/controller/brown.json | 8 + .../models/block/controller/cyan.json | 8 + .../models/block/controller/gray.json | 8 + .../models/block/controller/green.json | 8 + .../models/block/controller/light_blue.json | 8 + .../models/block/controller/light_gray.json | 8 + .../models/block/controller/lime.json | 8 + .../models/block/controller/magenta.json | 8 + .../models/block/controller/orange.json | 8 + .../models/block/controller/pink.json | 8 + .../models/block/controller/purple.json | 8 + .../models/block/controller/red.json | 8 + .../models/block/controller/white.json | 8 + .../models/block/controller/yellow.json | 8 + .../models/block/crafting_grid/black.json | 13 + .../models/block/crafting_grid/blue.json | 13 + .../models/block/crafting_grid/brown.json | 13 + .../models/block/crafting_grid/cyan.json | 13 + .../models/block/crafting_grid/gray.json | 13 + .../models/block/crafting_grid/green.json | 13 + .../models/block/crafting_grid/inactive.json | 13 + .../block/crafting_grid/light_blue.json | 13 + .../block/crafting_grid/light_gray.json | 13 + .../models/block/crafting_grid/lime.json | 13 + .../models/block/crafting_grid/magenta.json | 13 + .../models/block/crafting_grid/orange.json | 13 + .../models/block/crafting_grid/pink.json | 13 + .../models/block/crafting_grid/purple.json | 13 + .../models/block/crafting_grid/red.json | 13 + .../models/block/crafting_grid/white.json | 13 + .../models/block/crafting_grid/yellow.json | 13 + .../models/block/detector/black.json | 10 + .../models/block/detector/blue.json | 10 + .../models/block/detector/brown.json | 10 + .../models/block/detector/cyan.json | 10 + .../models/block/detector/gray.json | 10 + .../models/block/detector/green.json | 10 + .../models/block/detector/light_blue.json | 10 + .../models/block/detector/light_gray.json | 10 + .../models/block/detector/lime.json | 10 + .../models/block/detector/magenta.json | 10 + .../models/block/detector/orange.json | 10 + .../models/block/detector/pink.json | 10 + .../models/block/detector/purple.json | 10 + .../models/block/detector/red.json | 10 + .../models/block/detector/white.json | 10 + .../models/block/detector/yellow.json | 10 + .../block/disk_interface/base_black.json | 13 + .../block/disk_interface/base_blue.json | 13 + .../block/disk_interface/base_brown.json | 13 + .../block/disk_interface/base_cyan.json | 13 + .../block/disk_interface/base_gray.json | 13 + .../block/disk_interface/base_green.json | 13 + .../block/disk_interface/base_light_blue.json | 13 + .../block/disk_interface/base_light_gray.json | 13 + .../block/disk_interface/base_lime.json | 13 + .../block/disk_interface/base_magenta.json | 13 + .../block/disk_interface/base_orange.json | 13 + .../block/disk_interface/base_pink.json | 13 + .../block/disk_interface/base_purple.json | 13 + .../models/block/disk_interface/base_red.json | 13 + .../block/disk_interface/base_white.json | 13 + .../block/disk_interface/base_yellow.json | 13 + .../models/block/disk_interface/black.json | 3 + .../models/block/disk_interface/blue.json | 3 + .../models/block/disk_interface/brown.json | 3 + .../models/block/disk_interface/cyan.json | 3 + .../models/block/disk_interface/gray.json | 3 + .../models/block/disk_interface/green.json | 3 + .../models/block/disk_interface/inactive.json | 13 + .../block/disk_interface/light_blue.json | 3 + .../block/disk_interface/light_gray.json | 3 + .../models/block/disk_interface/lime.json | 3 + .../models/block/disk_interface/magenta.json | 3 + .../models/block/disk_interface/orange.json | 3 + .../models/block/disk_interface/pink.json | 3 + .../models/block/disk_interface/purple.json | 3 + .../models/block/disk_interface/red.json | 3 + .../models/block/disk_interface/white.json | 3 + .../models/block/disk_interface/yellow.json | 3 + .../models/block/grid/black.json | 13 + .../models/block/grid/blue.json | 13 + .../models/block/grid/brown.json | 13 + .../models/block/grid/cyan.json | 13 + .../models/block/grid/gray.json | 13 + .../models/block/grid/green.json | 13 + .../models/block/grid/inactive.json | 13 + .../models/block/grid/light_blue.json | 13 + .../models/block/grid/light_gray.json | 13 + .../models/block/grid/lime.json | 13 + .../models/block/grid/magenta.json | 13 + .../models/block/grid/orange.json | 13 + .../models/block/grid/pink.json | 13 + .../models/block/grid/purple.json | 13 + .../refinedstorage/models/block/grid/red.json | 13 + .../models/block/grid/white.json | 13 + .../models/block/grid/yellow.json | 13 + .../models/block/network_receiver/black.json | 8 + .../models/block/network_receiver/blue.json | 8 + .../models/block/network_receiver/brown.json | 8 + .../models/block/network_receiver/cyan.json | 8 + .../models/block/network_receiver/gray.json | 8 + .../models/block/network_receiver/green.json | 8 + .../block/network_receiver/inactive.json | 8 + .../block/network_receiver/light_blue.json | 8 + .../block/network_receiver/light_gray.json | 8 + .../models/block/network_receiver/lime.json | 8 + .../block/network_receiver/magenta.json | 8 + .../models/block/network_receiver/orange.json | 8 + .../models/block/network_receiver/pink.json | 8 + .../models/block/network_receiver/purple.json | 8 + .../models/block/network_receiver/red.json | 8 + .../models/block/network_receiver/white.json | 8 + .../models/block/network_receiver/yellow.json | 8 + .../block/network_transmitter/black.json | 8 + .../block/network_transmitter/blue.json | 8 + .../block/network_transmitter/brown.json | 8 + .../block/network_transmitter/cyan.json | 8 + .../block/network_transmitter/error.json | 8 + .../block/network_transmitter/gray.json | 8 + .../block/network_transmitter/green.json | 8 + .../block/network_transmitter/inactive.json | 8 + .../block/network_transmitter/light_blue.json | 8 + .../block/network_transmitter/light_gray.json | 8 + .../block/network_transmitter/lime.json | 8 + .../block/network_transmitter/magenta.json | 8 + .../block/network_transmitter/orange.json | 8 + .../block/network_transmitter/pink.json | 8 + .../block/network_transmitter/purple.json | 8 + .../models/block/network_transmitter/red.json | 8 + .../block/network_transmitter/white.json | 8 + .../block/network_transmitter/yellow.json | 8 + .../models/block/relay/black.json | 18 + .../models/block/relay/blue.json | 18 + .../models/block/relay/brown.json | 18 + .../models/block/relay/cyan.json | 18 + .../models/block/relay/gray.json | 18 + .../models/block/relay/green.json | 18 + .../models/block/relay/inactive.json | 18 + .../models/block/relay/light_blue.json | 18 + .../models/block/relay/light_gray.json | 18 + .../models/block/relay/lime.json | 18 + .../models/block/relay/magenta.json | 18 + .../models/block/relay/orange.json | 18 + .../models/block/relay/pink.json | 18 + .../models/block/relay/purple.json | 18 + .../models/block/relay/red.json | 18 + .../models/block/relay/white.json | 18 + .../models/block/relay/yellow.json | 18 + .../models/block/security_manager/black.json | 18 + .../models/block/security_manager/blue.json | 18 + .../models/block/security_manager/brown.json | 18 + .../models/block/security_manager/cyan.json | 18 + .../models/block/security_manager/gray.json | 18 + .../models/block/security_manager/green.json | 18 + .../block/security_manager/inactive.json | 18 + .../block/security_manager/light_blue.json | 18 + .../block/security_manager/light_gray.json | 18 + .../models/block/security_manager/lime.json | 18 + .../block/security_manager/magenta.json | 18 + .../models/block/security_manager/orange.json | 18 + .../models/block/security_manager/pink.json | 18 + .../models/block/security_manager/purple.json | 18 + .../models/block/security_manager/red.json | 18 + .../models/block/security_manager/white.json | 18 + .../models/block/security_manager/yellow.json | 18 + .../block/wireless_transmitter/black.json | 6 + .../block/wireless_transmitter/blue.json | 6 + .../block/wireless_transmitter/brown.json | 6 + .../block/wireless_transmitter/cyan.json | 6 + .../block/wireless_transmitter/gray.json | 6 + .../block/wireless_transmitter/green.json | 6 + .../wireless_transmitter/light_blue.json | 6 + .../wireless_transmitter/light_gray.json | 6 + .../block/wireless_transmitter/lime.json | 6 + .../block/wireless_transmitter/magenta.json | 6 + .../block/wireless_transmitter/orange.json | 6 + .../block/wireless_transmitter/pink.json | 6 + .../block/wireless_transmitter/purple.json | 6 + .../block/wireless_transmitter/red.json | 6 + .../block/wireless_transmitter/white.json | 6 + .../block/wireless_transmitter/yellow.json | 6 + .../models/item/black_cable.json | 6 + .../models/item/black_constructor.json | 6 + .../models/item/black_controller.json | 29 + .../models/item/black_crafting_grid.json | 3 + .../item/black_creative_controller.json | 3 + .../models/item/black_destructor.json | 6 + .../models/item/black_detector.json | 3 + .../models/item/black_disk_interface.json | 3 + .../models/item/black_exporter.json | 6 + .../models/item/black_external_storage.json | 6 + .../models/item/black_grid.json | 3 + .../models/item/black_importer.json | 6 + .../models/item/black_network_receiver.json | 6 + .../item/black_network_transmitter.json | 6 + .../models/item/black_relay.json | 3 + .../models/item/black_security_manager.json | 3 + .../item/black_wireless_transmitter.json | 6 + .../models/item/blue_cable.json | 6 + .../models/item/blue_constructor.json | 6 + .../models/item/blue_controller.json | 29 + .../models/item/blue_crafting_grid.json | 3 + .../models/item/blue_creative_controller.json | 3 + .../models/item/blue_destructor.json | 6 + .../models/item/blue_detector.json | 3 + .../models/item/blue_disk_interface.json | 3 + .../models/item/blue_exporter.json | 6 + .../models/item/blue_external_storage.json | 6 + .../refinedstorage/models/item/blue_grid.json | 3 + .../models/item/blue_importer.json | 6 + .../models/item/blue_network_receiver.json | 6 + .../models/item/blue_network_transmitter.json | 6 + .../models/item/blue_relay.json | 3 + .../models/item/blue_security_manager.json | 3 + .../item/blue_wireless_transmitter.json | 6 + .../models/item/brown_cable.json | 6 + .../models/item/brown_constructor.json | 6 + .../models/item/brown_controller.json | 29 + .../models/item/brown_crafting_grid.json | 3 + .../item/brown_creative_controller.json | 3 + .../models/item/brown_destructor.json | 6 + .../models/item/brown_detector.json | 3 + .../models/item/brown_disk_interface.json | 3 + .../models/item/brown_exporter.json | 6 + .../models/item/brown_external_storage.json | 6 + .../models/item/brown_grid.json | 3 + .../models/item/brown_importer.json | 6 + .../models/item/brown_network_receiver.json | 6 + .../item/brown_network_transmitter.json | 6 + .../models/item/brown_relay.json | 3 + .../models/item/brown_security_manager.json | 3 + .../item/brown_wireless_transmitter.json | 6 + .../refinedstorage/models/item/cable.json | 6 + .../models/item/constructor.json | 6 + .../models/item/controller.json | 29 + .../models/item/crafting_grid.json | 3 + .../models/item/creative_controller.json | 3 + .../models/item/cyan_cable.json | 6 + .../models/item/cyan_constructor.json | 6 + .../models/item/cyan_controller.json | 29 + .../models/item/cyan_crafting_grid.json | 3 + .../models/item/cyan_creative_controller.json | 3 + .../models/item/cyan_destructor.json | 6 + .../models/item/cyan_detector.json | 3 + .../models/item/cyan_disk_interface.json | 3 + .../models/item/cyan_exporter.json | 6 + .../models/item/cyan_external_storage.json | 6 + .../refinedstorage/models/item/cyan_grid.json | 3 + .../models/item/cyan_importer.json | 6 + .../models/item/cyan_network_receiver.json | 6 + .../models/item/cyan_network_transmitter.json | 6 + .../models/item/cyan_relay.json | 3 + .../models/item/cyan_security_manager.json | 3 + .../item/cyan_wireless_transmitter.json | 6 + .../models/item/destructor.json | 6 + .../refinedstorage/models/item/detector.json | 3 + .../models/item/disk_interface.json | 3 + .../refinedstorage/models/item/exporter.json | 6 + .../models/item/external_storage.json | 6 + .../models/item/gray_controller.json | 29 + .../models/item/gray_crafting_grid.json | 3 + .../models/item/gray_creative_controller.json | 3 + .../models/item/gray_detector.json | 3 + .../models/item/gray_disk_interface.json | 3 + .../refinedstorage/models/item/gray_grid.json | 3 + .../models/item/gray_network_receiver.json | 6 + .../models/item/gray_network_transmitter.json | 6 + .../models/item/gray_relay.json | 3 + .../models/item/gray_security_manager.json | 3 + .../item/gray_wireless_transmitter.json | 6 + .../models/item/green_cable.json | 6 + .../models/item/green_constructor.json | 6 + .../models/item/green_controller.json | 29 + .../models/item/green_crafting_grid.json | 3 + .../item/green_creative_controller.json | 3 + .../models/item/green_destructor.json | 6 + .../models/item/green_detector.json | 3 + .../models/item/green_disk_interface.json | 3 + .../models/item/green_exporter.json | 6 + .../models/item/green_external_storage.json | 6 + .../models/item/green_grid.json | 3 + .../models/item/green_importer.json | 6 + .../models/item/green_network_receiver.json | 6 + .../item/green_network_transmitter.json | 6 + .../models/item/green_relay.json | 3 + .../models/item/green_security_manager.json | 3 + .../item/green_wireless_transmitter.json | 6 + .../refinedstorage/models/item/grid.json | 3 + .../refinedstorage/models/item/importer.json | 6 + .../models/item/light_blue_cable.json | 6 + .../models/item/light_blue_constructor.json | 6 + .../models/item/light_blue_destructor.json | 6 + .../models/item/light_blue_exporter.json | 6 + .../item/light_blue_external_storage.json | 6 + .../models/item/light_blue_importer.json | 6 + .../models/item/light_gray_cable.json | 6 + .../models/item/light_gray_constructor.json | 6 + .../models/item/light_gray_controller.json | 29 + .../models/item/light_gray_crafting_grid.json | 3 + .../item/light_gray_creative_controller.json | 3 + .../models/item/light_gray_destructor.json | 6 + .../models/item/light_gray_detector.json | 3 + .../item/light_gray_disk_interface.json | 3 + .../models/item/light_gray_exporter.json | 6 + .../item/light_gray_external_storage.json | 6 + .../models/item/light_gray_grid.json | 3 + .../models/item/light_gray_importer.json | 6 + .../item/light_gray_network_receiver.json | 6 + .../item/light_gray_network_transmitter.json | 6 + .../models/item/light_gray_relay.json | 3 + .../item/light_gray_security_manager.json | 3 + .../item/light_gray_wireless_transmitter.json | 6 + .../models/item/lime_cable.json | 6 + .../models/item/lime_constructor.json | 6 + .../models/item/lime_controller.json | 29 + .../models/item/lime_crafting_grid.json | 3 + .../models/item/lime_creative_controller.json | 3 + .../models/item/lime_destructor.json | 6 + .../models/item/lime_detector.json | 3 + .../models/item/lime_disk_interface.json | 3 + .../models/item/lime_exporter.json | 6 + .../models/item/lime_external_storage.json | 6 + .../refinedstorage/models/item/lime_grid.json | 3 + .../models/item/lime_importer.json | 6 + .../models/item/lime_network_receiver.json | 6 + .../models/item/lime_network_transmitter.json | 6 + .../models/item/lime_relay.json | 3 + .../models/item/lime_security_manager.json | 3 + .../item/lime_wireless_transmitter.json | 6 + .../models/item/magenta_cable.json | 6 + .../models/item/magenta_constructor.json | 6 + .../models/item/magenta_controller.json | 29 + .../models/item/magenta_crafting_grid.json | 3 + .../item/magenta_creative_controller.json | 3 + .../models/item/magenta_destructor.json | 6 + .../models/item/magenta_detector.json | 3 + .../models/item/magenta_disk_interface.json | 3 + .../models/item/magenta_exporter.json | 6 + .../models/item/magenta_external_storage.json | 6 + .../models/item/magenta_grid.json | 3 + .../models/item/magenta_importer.json | 6 + .../models/item/magenta_network_receiver.json | 6 + .../item/magenta_network_transmitter.json | 6 + .../models/item/magenta_relay.json | 3 + .../models/item/magenta_security_manager.json | 3 + .../item/magenta_wireless_transmitter.json | 6 + .../models/item/network_receiver.json | 6 + .../models/item/network_transmitter.json | 6 + .../models/item/orange_cable.json | 6 + .../models/item/orange_constructor.json | 6 + .../models/item/orange_controller.json | 29 + .../models/item/orange_crafting_grid.json | 3 + .../item/orange_creative_controller.json | 3 + .../models/item/orange_destructor.json | 6 + .../models/item/orange_detector.json | 3 + .../models/item/orange_disk_interface.json | 3 + .../models/item/orange_exporter.json | 6 + .../models/item/orange_external_storage.json | 6 + .../models/item/orange_grid.json | 3 + .../models/item/orange_importer.json | 6 + .../models/item/orange_network_receiver.json | 6 + .../item/orange_network_transmitter.json | 6 + .../models/item/orange_relay.json | 3 + .../models/item/orange_security_manager.json | 3 + .../item/orange_wireless_transmitter.json | 6 + .../models/item/pink_cable.json | 6 + .../models/item/pink_constructor.json | 6 + .../models/item/pink_controller.json | 29 + .../models/item/pink_crafting_grid.json | 3 + .../models/item/pink_creative_controller.json | 3 + .../models/item/pink_destructor.json | 6 + .../models/item/pink_detector.json | 3 + .../models/item/pink_disk_interface.json | 3 + .../models/item/pink_exporter.json | 6 + .../models/item/pink_external_storage.json | 6 + .../refinedstorage/models/item/pink_grid.json | 3 + .../models/item/pink_importer.json | 6 + .../models/item/pink_network_receiver.json | 6 + .../models/item/pink_network_transmitter.json | 6 + .../models/item/pink_relay.json | 3 + .../models/item/pink_security_manager.json | 3 + .../item/pink_wireless_transmitter.json | 6 + .../models/item/purple_cable.json | 6 + .../models/item/purple_constructor.json | 6 + .../models/item/purple_controller.json | 29 + .../models/item/purple_crafting_grid.json | 3 + .../item/purple_creative_controller.json | 3 + .../models/item/purple_destructor.json | 6 + .../models/item/purple_detector.json | 3 + .../models/item/purple_disk_interface.json | 3 + .../models/item/purple_exporter.json | 6 + .../models/item/purple_external_storage.json | 6 + .../models/item/purple_grid.json | 3 + .../models/item/purple_importer.json | 6 + .../models/item/purple_network_receiver.json | 6 + .../item/purple_network_transmitter.json | 6 + .../models/item/purple_relay.json | 3 + .../models/item/purple_security_manager.json | 3 + .../item/purple_wireless_transmitter.json | 6 + .../refinedstorage/models/item/red_cable.json | 6 + .../models/item/red_constructor.json | 6 + .../models/item/red_controller.json | 29 + .../models/item/red_crafting_grid.json | 3 + .../models/item/red_creative_controller.json | 3 + .../models/item/red_destructor.json | 6 + .../models/item/red_detector.json | 3 + .../models/item/red_disk_interface.json | 3 + .../models/item/red_exporter.json | 6 + .../models/item/red_external_storage.json | 6 + .../refinedstorage/models/item/red_grid.json | 3 + .../models/item/red_importer.json | 6 + .../models/item/red_network_receiver.json | 6 + .../models/item/red_network_transmitter.json | 6 + .../refinedstorage/models/item/red_relay.json | 3 + .../models/item/red_security_manager.json | 3 + .../models/item/red_wireless_transmitter.json | 6 + .../refinedstorage/models/item/relay.json | 3 + .../models/item/security_manager.json | 3 + .../models/item/white_cable.json | 6 + .../models/item/white_constructor.json | 6 + .../models/item/white_controller.json | 29 + .../models/item/white_crafting_grid.json | 3 + .../item/white_creative_controller.json | 3 + .../models/item/white_destructor.json | 6 + .../models/item/white_detector.json | 3 + .../models/item/white_disk_interface.json | 3 + .../models/item/white_exporter.json | 6 + .../models/item/white_external_storage.json | 6 + .../models/item/white_grid.json | 3 + .../models/item/white_importer.json | 6 + .../models/item/white_network_receiver.json | 6 + .../item/white_network_transmitter.json | 6 + .../models/item/white_relay.json | 3 + .../models/item/white_security_manager.json | 3 + .../item/white_wireless_transmitter.json | 6 + .../models/item/wireless_transmitter.json | 6 + .../models/item/yellow_cable.json | 6 + .../models/item/yellow_constructor.json | 6 + .../models/item/yellow_controller.json | 29 + .../models/item/yellow_crafting_grid.json | 3 + .../item/yellow_creative_controller.json | 3 + .../models/item/yellow_destructor.json | 6 + .../models/item/yellow_detector.json | 3 + .../models/item/yellow_disk_interface.json | 3 + .../models/item/yellow_exporter.json | 6 + .../models/item/yellow_external_storage.json | 6 + .../models/item/yellow_grid.json | 3 + .../models/item/yellow_importer.json | 6 + .../models/item/yellow_network_receiver.json | 6 + .../item/yellow_network_transmitter.json | 6 + .../models/item/yellow_relay.json | 3 + .../models/item/yellow_security_manager.json | 3 + .../item/yellow_wireless_transmitter.json | 6 + .../recipes/misc/coloring/black_cable.json | 32 + .../misc/coloring/black_constructor.json | 32 + .../misc/coloring/black_controller.json | 32 + .../misc/coloring/black_crafting_grid.json | 32 + .../misc/coloring/black_destructor.json | 32 + .../recipes/misc/coloring/black_detector.json | 32 + .../misc/coloring/black_disk_interface.json | 32 + .../recipes/misc/coloring/black_exporter.json | 32 + .../misc/coloring/black_external_storage.json | 32 + .../recipes/misc/coloring/black_grid.json | 32 + .../recipes/misc/coloring/black_importer.json | 32 + .../misc/coloring/black_network_receiver.json | 32 + .../coloring/black_network_transmitter.json | 32 + .../recipes/misc/coloring/black_relay.json | 32 + .../misc/coloring/black_security_manager.json | 32 + .../coloring/black_wireless_transmitter.json | 32 + .../recipes/misc/coloring/blue_cable.json | 32 + .../misc/coloring/blue_constructor.json | 32 + .../misc/coloring/blue_controller.json | 32 + .../misc/coloring/blue_crafting_grid.json | 32 + .../misc/coloring/blue_destructor.json | 32 + .../recipes/misc/coloring/blue_detector.json | 32 + .../misc/coloring/blue_disk_interface.json | 32 + .../recipes/misc/coloring/blue_exporter.json | 32 + .../misc/coloring/blue_external_storage.json | 32 + .../recipes/misc/coloring/blue_grid.json | 32 + .../recipes/misc/coloring/blue_importer.json | 32 + .../misc/coloring/blue_network_receiver.json | 32 + .../coloring/blue_network_transmitter.json | 32 + .../recipes/misc/coloring/blue_relay.json | 32 + .../misc/coloring/blue_security_manager.json | 32 + .../coloring/blue_wireless_transmitter.json | 32 + .../recipes/misc/coloring/brown_cable.json | 32 + .../misc/coloring/brown_constructor.json | 32 + .../misc/coloring/brown_controller.json | 32 + .../misc/coloring/brown_crafting_grid.json | 32 + .../misc/coloring/brown_destructor.json | 32 + .../recipes/misc/coloring/brown_detector.json | 32 + .../misc/coloring/brown_disk_interface.json | 32 + .../recipes/misc/coloring/brown_exporter.json | 32 + .../misc/coloring/brown_external_storage.json | 32 + .../recipes/misc/coloring/brown_grid.json | 32 + .../recipes/misc/coloring/brown_importer.json | 32 + .../misc/coloring/brown_network_receiver.json | 32 + .../coloring/brown_network_transmitter.json | 32 + .../recipes/misc/coloring/brown_relay.json | 32 + .../misc/coloring/brown_security_manager.json | 32 + .../coloring/brown_wireless_transmitter.json | 32 + .../recipes/misc/coloring/cyan_cable.json | 32 + .../misc/coloring/cyan_constructor.json | 32 + .../misc/coloring/cyan_controller.json | 32 + .../misc/coloring/cyan_crafting_grid.json | 32 + .../misc/coloring/cyan_destructor.json | 32 + .../recipes/misc/coloring/cyan_detector.json | 32 + .../misc/coloring/cyan_disk_interface.json | 32 + .../recipes/misc/coloring/cyan_exporter.json | 32 + .../misc/coloring/cyan_external_storage.json | 32 + .../recipes/misc/coloring/cyan_grid.json | 32 + .../recipes/misc/coloring/cyan_importer.json | 32 + .../misc/coloring/cyan_network_receiver.json | 32 + .../coloring/cyan_network_transmitter.json | 32 + .../recipes/misc/coloring/cyan_relay.json | 32 + .../misc/coloring/cyan_security_manager.json | 32 + .../coloring/cyan_wireless_transmitter.json | 32 + .../recipes/misc/coloring/gray_cable.json | 32 + .../misc/coloring/gray_constructor.json | 32 + .../misc/coloring/gray_controller.json | 32 + .../misc/coloring/gray_crafting_grid.json | 32 + .../misc/coloring/gray_destructor.json | 32 + .../recipes/misc/coloring/gray_detector.json | 32 + .../misc/coloring/gray_disk_interface.json | 32 + .../recipes/misc/coloring/gray_exporter.json | 32 + .../misc/coloring/gray_external_storage.json | 32 + .../recipes/misc/coloring/gray_grid.json | 32 + .../recipes/misc/coloring/gray_importer.json | 32 + .../misc/coloring/gray_network_receiver.json | 32 + .../coloring/gray_network_transmitter.json | 32 + .../recipes/misc/coloring/gray_relay.json | 32 + .../misc/coloring/gray_security_manager.json | 32 + .../coloring/gray_wireless_transmitter.json | 32 + .../recipes/misc/coloring/green_cable.json | 32 + .../misc/coloring/green_constructor.json | 32 + .../misc/coloring/green_controller.json | 32 + .../misc/coloring/green_crafting_grid.json | 32 + .../misc/coloring/green_destructor.json | 32 + .../recipes/misc/coloring/green_detector.json | 32 + .../misc/coloring/green_disk_interface.json | 32 + .../recipes/misc/coloring/green_exporter.json | 32 + .../misc/coloring/green_external_storage.json | 32 + .../recipes/misc/coloring/green_grid.json | 32 + .../recipes/misc/coloring/green_importer.json | 32 + .../misc/coloring/green_network_receiver.json | 32 + .../coloring/green_network_transmitter.json | 32 + .../recipes/misc/coloring/green_relay.json | 32 + .../misc/coloring/green_security_manager.json | 32 + .../coloring/green_wireless_transmitter.json | 32 + .../misc/coloring/light_blue_cable.json | 32 + .../misc/coloring/light_blue_constructor.json | 32 + .../misc/coloring/light_blue_controller.json | 32 + .../coloring/light_blue_crafting_grid.json | 32 + .../misc/coloring/light_blue_destructor.json | 32 + .../misc/coloring/light_blue_detector.json | 32 + .../coloring/light_blue_disk_interface.json | 32 + .../misc/coloring/light_blue_exporter.json | 32 + .../coloring/light_blue_external_storage.json | 32 + .../misc/coloring/light_blue_grid.json | 32 + .../misc/coloring/light_blue_importer.json | 32 + .../coloring/light_blue_network_receiver.json | 32 + .../light_blue_network_transmitter.json | 32 + .../misc/coloring/light_blue_relay.json | 32 + .../coloring/light_blue_security_manager.json | 32 + .../light_blue_wireless_transmitter.json | 32 + .../misc/coloring/light_gray_cable.json | 32 + .../misc/coloring/light_gray_constructor.json | 32 + .../misc/coloring/light_gray_controller.json | 32 + .../coloring/light_gray_crafting_grid.json | 32 + .../misc/coloring/light_gray_destructor.json | 32 + .../misc/coloring/light_gray_detector.json | 32 + .../coloring/light_gray_disk_interface.json | 32 + .../misc/coloring/light_gray_exporter.json | 32 + .../coloring/light_gray_external_storage.json | 32 + .../misc/coloring/light_gray_grid.json | 32 + .../misc/coloring/light_gray_importer.json | 32 + .../coloring/light_gray_network_receiver.json | 32 + .../light_gray_network_transmitter.json | 32 + .../misc/coloring/light_gray_relay.json | 32 + .../coloring/light_gray_security_manager.json | 32 + .../light_gray_wireless_transmitter.json | 32 + .../recipes/misc/coloring/lime_cable.json | 32 + .../misc/coloring/lime_constructor.json | 32 + .../misc/coloring/lime_controller.json | 32 + .../misc/coloring/lime_crafting_grid.json | 32 + .../misc/coloring/lime_destructor.json | 32 + .../recipes/misc/coloring/lime_detector.json | 32 + .../misc/coloring/lime_disk_interface.json | 32 + .../recipes/misc/coloring/lime_exporter.json | 32 + .../misc/coloring/lime_external_storage.json | 32 + .../recipes/misc/coloring/lime_grid.json | 32 + .../recipes/misc/coloring/lime_importer.json | 32 + .../misc/coloring/lime_network_receiver.json | 32 + .../coloring/lime_network_transmitter.json | 32 + .../recipes/misc/coloring/lime_relay.json | 32 + .../misc/coloring/lime_security_manager.json | 32 + .../coloring/lime_wireless_transmitter.json | 32 + .../recipes/misc/coloring/magenta_cable.json | 32 + .../misc/coloring/magenta_constructor.json | 32 + .../misc/coloring/magenta_controller.json | 32 + .../misc/coloring/magenta_crafting_grid.json | 32 + .../misc/coloring/magenta_destructor.json | 32 + .../misc/coloring/magenta_detector.json | 32 + .../misc/coloring/magenta_disk_interface.json | 32 + .../misc/coloring/magenta_exporter.json | 32 + .../coloring/magenta_external_storage.json | 32 + .../recipes/misc/coloring/magenta_grid.json | 32 + .../misc/coloring/magenta_importer.json | 32 + .../coloring/magenta_network_receiver.json | 32 + .../coloring/magenta_network_transmitter.json | 32 + .../recipes/misc/coloring/magenta_relay.json | 32 + .../coloring/magenta_security_manager.json | 32 + .../magenta_wireless_transmitter.json | 32 + .../recipes/misc/coloring/orange_cable.json | 32 + .../misc/coloring/orange_constructor.json | 32 + .../misc/coloring/orange_controller.json | 32 + .../misc/coloring/orange_crafting_grid.json | 32 + .../misc/coloring/orange_destructor.json | 32 + .../misc/coloring/orange_detector.json | 32 + .../misc/coloring/orange_disk_interface.json | 32 + .../misc/coloring/orange_exporter.json | 32 + .../coloring/orange_external_storage.json | 32 + .../recipes/misc/coloring/orange_grid.json | 32 + .../misc/coloring/orange_importer.json | 32 + .../coloring/orange_network_receiver.json | 32 + .../coloring/orange_network_transmitter.json | 32 + .../recipes/misc/coloring/orange_relay.json | 32 + .../coloring/orange_security_manager.json | 32 + .../coloring/orange_wireless_transmitter.json | 32 + .../recipes/misc/coloring/pink_cable.json | 32 + .../misc/coloring/pink_constructor.json | 32 + .../misc/coloring/pink_controller.json | 32 + .../misc/coloring/pink_crafting_grid.json | 32 + .../misc/coloring/pink_destructor.json | 32 + .../recipes/misc/coloring/pink_detector.json | 32 + .../misc/coloring/pink_disk_interface.json | 32 + .../recipes/misc/coloring/pink_exporter.json | 32 + .../misc/coloring/pink_external_storage.json | 32 + .../recipes/misc/coloring/pink_grid.json | 32 + .../recipes/misc/coloring/pink_importer.json | 32 + .../misc/coloring/pink_network_receiver.json | 32 + .../coloring/pink_network_transmitter.json | 32 + .../recipes/misc/coloring/pink_relay.json | 32 + .../misc/coloring/pink_security_manager.json | 32 + .../coloring/pink_wireless_transmitter.json | 32 + .../recipes/misc/coloring/purple_cable.json | 32 + .../misc/coloring/purple_constructor.json | 32 + .../misc/coloring/purple_controller.json | 32 + .../misc/coloring/purple_crafting_grid.json | 32 + .../misc/coloring/purple_destructor.json | 32 + .../misc/coloring/purple_detector.json | 32 + .../misc/coloring/purple_disk_interface.json | 32 + .../misc/coloring/purple_exporter.json | 32 + .../coloring/purple_external_storage.json | 32 + .../recipes/misc/coloring/purple_grid.json | 32 + .../misc/coloring/purple_importer.json | 32 + .../coloring/purple_network_receiver.json | 32 + .../coloring/purple_network_transmitter.json | 32 + .../recipes/misc/coloring/purple_relay.json | 32 + .../coloring/purple_security_manager.json | 32 + .../coloring/purple_wireless_transmitter.json | 32 + .../recipes/misc/coloring/red_cable.json | 32 + .../misc/coloring/red_constructor.json | 32 + .../recipes/misc/coloring/red_controller.json | 32 + .../misc/coloring/red_crafting_grid.json | 32 + .../recipes/misc/coloring/red_destructor.json | 32 + .../recipes/misc/coloring/red_detector.json | 32 + .../misc/coloring/red_disk_interface.json | 32 + .../recipes/misc/coloring/red_exporter.json | 32 + .../misc/coloring/red_external_storage.json | 32 + .../recipes/misc/coloring/red_grid.json | 32 + .../recipes/misc/coloring/red_importer.json | 32 + .../misc/coloring/red_network_receiver.json | 32 + .../coloring/red_network_transmitter.json | 32 + .../recipes/misc/coloring/red_relay.json | 32 + .../misc/coloring/red_security_manager.json | 32 + .../coloring/red_wireless_transmitter.json | 32 + .../recipes/misc/coloring/white_cable.json | 32 + .../misc/coloring/white_constructor.json | 32 + .../misc/coloring/white_controller.json | 32 + .../misc/coloring/white_crafting_grid.json | 32 + .../misc/coloring/white_destructor.json | 32 + .../recipes/misc/coloring/white_detector.json | 32 + .../misc/coloring/white_disk_interface.json | 32 + .../recipes/misc/coloring/white_exporter.json | 32 + .../misc/coloring/white_external_storage.json | 32 + .../recipes/misc/coloring/white_grid.json | 32 + .../recipes/misc/coloring/white_importer.json | 32 + .../misc/coloring/white_network_receiver.json | 32 + .../coloring/white_network_transmitter.json | 32 + .../recipes/misc/coloring/white_relay.json | 32 + .../misc/coloring/white_security_manager.json | 32 + .../coloring/white_wireless_transmitter.json | 32 + .../recipes/misc/coloring/yellow_cable.json | 32 + .../misc/coloring/yellow_constructor.json | 32 + .../misc/coloring/yellow_controller.json | 32 + .../misc/coloring/yellow_crafting_grid.json | 32 + .../misc/coloring/yellow_destructor.json | 32 + .../misc/coloring/yellow_detector.json | 32 + .../misc/coloring/yellow_disk_interface.json | 32 + .../misc/coloring/yellow_exporter.json | 32 + .../coloring/yellow_external_storage.json | 32 + .../recipes/misc/coloring/yellow_grid.json | 32 + .../misc/coloring/yellow_importer.json | 32 + .../coloring/yellow_network_receiver.json | 32 + .../coloring/yellow_network_transmitter.json | 32 + .../recipes/misc/coloring/yellow_relay.json | 32 + .../coloring/yellow_security_manager.json | 32 + .../coloring/yellow_wireless_transmitter.json | 32 + .../loot_table/blocks/black_cable.json | 21 + .../loot_table/blocks/black_constructor.json | 21 + .../loot_table/blocks/black_controller.json | 26 + .../blocks/black_crafting_grid.json | 21 + .../blocks/black_creative_controller.json | 21 + .../loot_table/blocks/black_destructor.json | 21 + .../loot_table/blocks/black_detector.json | 21 + .../blocks/black_disk_interface.json | 21 + .../loot_table/blocks/black_grid.json | 21 + .../blocks/black_network_receiver.json | 21 + .../blocks/black_network_transmitter.json | 21 + .../loot_table/blocks/black_relay.json | 21 + .../blocks/black_security_manager.json | 21 + .../blocks/black_wireless_transmitter.json | 21 + .../loot_table/blocks/blue_cable.json | 21 + .../loot_table/blocks/blue_constructor.json | 21 + .../loot_table/blocks/blue_controller.json | 26 + .../loot_table/blocks/blue_crafting_grid.json | 21 + .../blocks/blue_creative_controller.json | 21 + .../loot_table/blocks/blue_destructor.json | 21 + .../loot_table/blocks/blue_detector.json | 21 + .../blocks/blue_disk_interface.json | 21 + .../loot_table/blocks/blue_grid.json | 21 + .../blocks/blue_network_receiver.json | 21 + .../blocks/blue_network_transmitter.json | 21 + .../loot_table/blocks/blue_relay.json | 21 + .../blocks/blue_security_manager.json | 21 + .../blocks/blue_wireless_transmitter.json | 21 + .../loot_table/blocks/brown_cable.json | 21 + .../loot_table/blocks/brown_constructor.json | 21 + .../loot_table/blocks/brown_controller.json | 26 + .../blocks/brown_crafting_grid.json | 21 + .../blocks/brown_creative_controller.json | 21 + .../loot_table/blocks/brown_destructor.json | 21 + .../loot_table/blocks/brown_detector.json | 21 + .../blocks/brown_disk_interface.json | 21 + .../loot_table/blocks/brown_grid.json | 21 + .../blocks/brown_network_receiver.json | 21 + .../blocks/brown_network_transmitter.json | 21 + .../loot_table/blocks/brown_relay.json | 21 + .../blocks/brown_security_manager.json | 21 + .../blocks/brown_wireless_transmitter.json | 21 + .../loot_table/blocks/cable.json | 21 + .../loot_table/blocks/constructor.json | 21 + .../loot_table/blocks/controller.json | 26 + .../loot_table/blocks/crafting_grid.json | 21 + .../blocks/creative_controller.json | 21 + .../loot_table/blocks/cyan_cable.json | 21 + .../loot_table/blocks/cyan_constructor.json | 21 + .../loot_table/blocks/cyan_controller.json | 26 + .../loot_table/blocks/cyan_crafting_grid.json | 21 + .../blocks/cyan_creative_controller.json | 21 + .../loot_table/blocks/cyan_destructor.json | 21 + .../loot_table/blocks/cyan_detector.json | 21 + .../blocks/cyan_disk_interface.json | 21 + .../loot_table/blocks/cyan_grid.json | 21 + .../blocks/cyan_network_receiver.json | 21 + .../blocks/cyan_network_transmitter.json | 21 + .../loot_table/blocks/cyan_relay.json | 21 + .../blocks/cyan_security_manager.json | 21 + .../blocks/cyan_wireless_transmitter.json | 21 + .../loot_table/blocks/destructor.json | 21 + .../loot_table/blocks/detector.json | 21 + .../loot_table/blocks/disk_interface.json | 21 + .../loot_table/blocks/gray_controller.json | 26 + .../loot_table/blocks/gray_crafting_grid.json | 21 + .../blocks/gray_creative_controller.json | 21 + .../loot_table/blocks/gray_detector.json | 21 + .../blocks/gray_disk_interface.json | 21 + .../loot_table/blocks/gray_grid.json | 21 + .../blocks/gray_network_receiver.json | 21 + .../blocks/gray_network_transmitter.json | 21 + .../loot_table/blocks/gray_relay.json | 21 + .../blocks/gray_security_manager.json | 21 + .../blocks/gray_wireless_transmitter.json | 21 + .../loot_table/blocks/green_cable.json | 21 + .../loot_table/blocks/green_constructor.json | 21 + .../loot_table/blocks/green_controller.json | 26 + .../blocks/green_crafting_grid.json | 21 + .../blocks/green_creative_controller.json | 21 + .../loot_table/blocks/green_destructor.json | 21 + .../loot_table/blocks/green_detector.json | 21 + .../blocks/green_disk_interface.json | 21 + .../loot_table/blocks/green_grid.json | 21 + .../blocks/green_network_receiver.json | 21 + .../blocks/green_network_transmitter.json | 21 + .../loot_table/blocks/green_relay.json | 21 + .../blocks/green_security_manager.json | 21 + .../blocks/green_wireless_transmitter.json | 21 + .../loot_table/blocks/grid.json | 21 + .../loot_table/blocks/light_blue_cable.json | 21 + .../blocks/light_blue_constructor.json | 21 + .../blocks/light_blue_destructor.json | 21 + .../loot_table/blocks/light_gray_cable.json | 21 + .../blocks/light_gray_constructor.json | 21 + .../blocks/light_gray_controller.json | 26 + .../blocks/light_gray_crafting_grid.json | 21 + .../light_gray_creative_controller.json | 21 + .../blocks/light_gray_destructor.json | 21 + .../blocks/light_gray_detector.json | 21 + .../blocks/light_gray_disk_interface.json | 21 + .../loot_table/blocks/light_gray_grid.json | 21 + .../blocks/light_gray_network_receiver.json | 21 + .../light_gray_network_transmitter.json | 21 + .../loot_table/blocks/light_gray_relay.json | 21 + .../blocks/light_gray_security_manager.json | 21 + .../light_gray_wireless_transmitter.json | 21 + .../loot_table/blocks/lime_cable.json | 21 + .../loot_table/blocks/lime_constructor.json | 21 + .../loot_table/blocks/lime_controller.json | 26 + .../loot_table/blocks/lime_crafting_grid.json | 21 + .../blocks/lime_creative_controller.json | 21 + .../loot_table/blocks/lime_destructor.json | 21 + .../loot_table/blocks/lime_detector.json | 21 + .../blocks/lime_disk_interface.json | 21 + .../loot_table/blocks/lime_grid.json | 21 + .../blocks/lime_network_receiver.json | 21 + .../blocks/lime_network_transmitter.json | 21 + .../loot_table/blocks/lime_relay.json | 21 + .../blocks/lime_security_manager.json | 21 + .../blocks/lime_wireless_transmitter.json | 21 + .../loot_table/blocks/magenta_cable.json | 21 + .../blocks/magenta_constructor.json | 21 + .../loot_table/blocks/magenta_controller.json | 26 + .../blocks/magenta_crafting_grid.json | 21 + .../blocks/magenta_creative_controller.json | 21 + .../loot_table/blocks/magenta_destructor.json | 21 + .../loot_table/blocks/magenta_detector.json | 21 + .../blocks/magenta_disk_interface.json | 21 + .../loot_table/blocks/magenta_grid.json | 21 + .../blocks/magenta_network_receiver.json | 21 + .../blocks/magenta_network_transmitter.json | 21 + .../loot_table/blocks/magenta_relay.json | 21 + .../blocks/magenta_security_manager.json | 21 + .../blocks/magenta_wireless_transmitter.json | 21 + .../loot_table/blocks/network_receiver.json | 21 + .../blocks/network_transmitter.json | 21 + .../loot_table/blocks/orange_cable.json | 21 + .../loot_table/blocks/orange_constructor.json | 21 + .../loot_table/blocks/orange_controller.json | 26 + .../blocks/orange_crafting_grid.json | 21 + .../blocks/orange_creative_controller.json | 21 + .../loot_table/blocks/orange_destructor.json | 21 + .../loot_table/blocks/orange_detector.json | 21 + .../blocks/orange_disk_interface.json | 21 + .../loot_table/blocks/orange_grid.json | 21 + .../blocks/orange_network_receiver.json | 21 + .../blocks/orange_network_transmitter.json | 21 + .../loot_table/blocks/orange_relay.json | 21 + .../blocks/orange_security_manager.json | 21 + .../blocks/orange_wireless_transmitter.json | 21 + .../loot_table/blocks/pink_cable.json | 21 + .../loot_table/blocks/pink_constructor.json | 21 + .../loot_table/blocks/pink_controller.json | 26 + .../loot_table/blocks/pink_crafting_grid.json | 21 + .../blocks/pink_creative_controller.json | 21 + .../loot_table/blocks/pink_destructor.json | 21 + .../loot_table/blocks/pink_detector.json | 21 + .../blocks/pink_disk_interface.json | 21 + .../loot_table/blocks/pink_grid.json | 21 + .../blocks/pink_network_receiver.json | 21 + .../blocks/pink_network_transmitter.json | 21 + .../loot_table/blocks/pink_relay.json | 21 + .../blocks/pink_security_manager.json | 21 + .../blocks/pink_wireless_transmitter.json | 21 + .../loot_table/blocks/purple_cable.json | 21 + .../loot_table/blocks/purple_constructor.json | 21 + .../loot_table/blocks/purple_controller.json | 26 + .../blocks/purple_crafting_grid.json | 21 + .../blocks/purple_creative_controller.json | 21 + .../loot_table/blocks/purple_destructor.json | 21 + .../loot_table/blocks/purple_detector.json | 21 + .../blocks/purple_disk_interface.json | 21 + .../loot_table/blocks/purple_grid.json | 21 + .../blocks/purple_network_receiver.json | 21 + .../blocks/purple_network_transmitter.json | 21 + .../loot_table/blocks/purple_relay.json | 21 + .../blocks/purple_security_manager.json | 21 + .../blocks/purple_wireless_transmitter.json | 21 + .../loot_table/blocks/red_cable.json | 21 + .../loot_table/blocks/red_constructor.json | 21 + .../loot_table/blocks/red_controller.json | 26 + .../loot_table/blocks/red_crafting_grid.json | 21 + .../blocks/red_creative_controller.json | 21 + .../loot_table/blocks/red_destructor.json | 21 + .../loot_table/blocks/red_detector.json | 21 + .../loot_table/blocks/red_disk_interface.json | 21 + .../loot_table/blocks/red_grid.json | 21 + .../blocks/red_network_receiver.json | 21 + .../blocks/red_network_transmitter.json | 21 + .../loot_table/blocks/red_relay.json | 21 + .../blocks/red_security_manager.json | 21 + .../blocks/red_wireless_transmitter.json | 21 + .../loot_table/blocks/relay.json | 21 + .../loot_table/blocks/security_manager.json | 21 + .../loot_table/blocks/white_cable.json | 21 + .../loot_table/blocks/white_constructor.json | 21 + .../loot_table/blocks/white_controller.json | 26 + .../blocks/white_crafting_grid.json | 21 + .../blocks/white_creative_controller.json | 21 + .../loot_table/blocks/white_destructor.json | 21 + .../loot_table/blocks/white_detector.json | 21 + .../blocks/white_disk_interface.json | 21 + .../loot_table/blocks/white_grid.json | 21 + .../blocks/white_network_receiver.json | 21 + .../blocks/white_network_transmitter.json | 21 + .../loot_table/blocks/white_relay.json | 21 + .../blocks/white_security_manager.json | 21 + .../blocks/white_wireless_transmitter.json | 21 + .../blocks/wireless_transmitter.json | 21 + .../loot_table/blocks/yellow_cable.json | 21 + .../loot_table/blocks/yellow_constructor.json | 21 + .../loot_table/blocks/yellow_controller.json | 26 + .../blocks/yellow_crafting_grid.json | 21 + .../blocks/yellow_creative_controller.json | 21 + .../loot_table/blocks/yellow_destructor.json | 21 + .../loot_table/blocks/yellow_detector.json | 21 + .../blocks/yellow_disk_interface.json | 21 + .../loot_table/blocks/yellow_grid.json | 21 + .../blocks/yellow_network_receiver.json | 21 + .../blocks/yellow_network_transmitter.json | 21 + .../loot_table/blocks/yellow_relay.json | 21 + .../blocks/yellow_security_manager.json | 21 + .../blocks/yellow_wireless_transmitter.json | 21 + .../recipe/coloring/black_cable.json | 16 + .../recipe/coloring/black_constructor.json | 16 + .../recipe/coloring/black_controller.json | 16 + .../recipe/coloring/black_crafting_grid.json | 16 + .../recipe/coloring/black_destructor.json | 16 + .../recipe/coloring/black_detector.json | 16 + .../recipe/coloring/black_disk_interface.json | 16 + .../recipe/coloring/black_exporter.json | 16 + .../coloring/black_external_storage.json | 16 + .../recipe/coloring/black_grid.json | 16 + .../recipe/coloring/black_importer.json | 16 + .../coloring/black_network_receiver.json | 16 + .../coloring/black_network_transmitter.json | 16 + .../recipe/coloring/black_relay.json | 16 + .../coloring/black_security_manager.json | 16 + .../coloring/black_wireless_transmitter.json | 16 + .../recipe/coloring/blue_cable.json | 16 + .../recipe/coloring/blue_constructor.json | 16 + .../recipe/coloring/blue_controller.json | 16 + .../recipe/coloring/blue_crafting_grid.json | 16 + .../recipe/coloring/blue_destructor.json | 16 + .../recipe/coloring/blue_detector.json | 16 + .../recipe/coloring/blue_disk_interface.json | 16 + .../recipe/coloring/blue_exporter.json | 16 + .../coloring/blue_external_storage.json | 16 + .../recipe/coloring/blue_grid.json | 16 + .../recipe/coloring/blue_importer.json | 16 + .../coloring/blue_network_receiver.json | 16 + .../coloring/blue_network_transmitter.json | 16 + .../recipe/coloring/blue_relay.json | 16 + .../coloring/blue_security_manager.json | 16 + .../coloring/blue_wireless_transmitter.json | 16 + .../recipe/coloring/brown_cable.json | 16 + .../recipe/coloring/brown_constructor.json | 16 + .../recipe/coloring/brown_controller.json | 16 + .../recipe/coloring/brown_crafting_grid.json | 16 + .../recipe/coloring/brown_destructor.json | 16 + .../recipe/coloring/brown_detector.json | 16 + .../recipe/coloring/brown_disk_interface.json | 16 + .../recipe/coloring/brown_exporter.json | 16 + .../coloring/brown_external_storage.json | 16 + .../recipe/coloring/brown_grid.json | 16 + .../recipe/coloring/brown_importer.json | 16 + .../coloring/brown_network_receiver.json | 16 + .../coloring/brown_network_transmitter.json | 16 + .../recipe/coloring/brown_relay.json | 16 + .../coloring/brown_security_manager.json | 16 + .../coloring/brown_wireless_transmitter.json | 16 + .../recipe/coloring/cyan_cable.json | 16 + .../recipe/coloring/cyan_constructor.json | 16 + .../recipe/coloring/cyan_controller.json | 16 + .../recipe/coloring/cyan_crafting_grid.json | 16 + .../recipe/coloring/cyan_destructor.json | 16 + .../recipe/coloring/cyan_detector.json | 16 + .../recipe/coloring/cyan_disk_interface.json | 16 + .../recipe/coloring/cyan_exporter.json | 16 + .../coloring/cyan_external_storage.json | 16 + .../recipe/coloring/cyan_grid.json | 16 + .../recipe/coloring/cyan_importer.json | 16 + .../coloring/cyan_network_receiver.json | 16 + .../coloring/cyan_network_transmitter.json | 16 + .../recipe/coloring/cyan_relay.json | 16 + .../coloring/cyan_security_manager.json | 16 + .../coloring/cyan_wireless_transmitter.json | 16 + .../recipe/coloring/gray_cable.json | 16 + .../recipe/coloring/gray_constructor.json | 16 + .../recipe/coloring/gray_controller.json | 16 + .../recipe/coloring/gray_crafting_grid.json | 16 + .../recipe/coloring/gray_destructor.json | 16 + .../recipe/coloring/gray_detector.json | 16 + .../recipe/coloring/gray_disk_interface.json | 16 + .../recipe/coloring/gray_exporter.json | 16 + .../coloring/gray_external_storage.json | 16 + .../recipe/coloring/gray_grid.json | 16 + .../recipe/coloring/gray_importer.json | 16 + .../coloring/gray_network_receiver.json | 16 + .../coloring/gray_network_transmitter.json | 16 + .../recipe/coloring/gray_relay.json | 16 + .../coloring/gray_security_manager.json | 16 + .../coloring/gray_wireless_transmitter.json | 16 + .../recipe/coloring/green_cable.json | 16 + .../recipe/coloring/green_constructor.json | 16 + .../recipe/coloring/green_controller.json | 16 + .../recipe/coloring/green_crafting_grid.json | 16 + .../recipe/coloring/green_destructor.json | 16 + .../recipe/coloring/green_detector.json | 16 + .../recipe/coloring/green_disk_interface.json | 16 + .../recipe/coloring/green_exporter.json | 16 + .../coloring/green_external_storage.json | 16 + .../recipe/coloring/green_grid.json | 16 + .../recipe/coloring/green_importer.json | 16 + .../coloring/green_network_receiver.json | 16 + .../coloring/green_network_transmitter.json | 16 + .../recipe/coloring/green_relay.json | 16 + .../coloring/green_security_manager.json | 16 + .../coloring/green_wireless_transmitter.json | 16 + .../recipe/coloring/light_blue_cable.json | 16 + .../coloring/light_blue_constructor.json | 16 + .../coloring/light_blue_controller.json | 16 + .../coloring/light_blue_crafting_grid.json | 16 + .../coloring/light_blue_destructor.json | 16 + .../recipe/coloring/light_blue_detector.json | 16 + .../coloring/light_blue_disk_interface.json | 16 + .../recipe/coloring/light_blue_exporter.json | 16 + .../coloring/light_blue_external_storage.json | 16 + .../recipe/coloring/light_blue_grid.json | 16 + .../recipe/coloring/light_blue_importer.json | 16 + .../coloring/light_blue_network_receiver.json | 16 + .../light_blue_network_transmitter.json | 16 + .../recipe/coloring/light_blue_relay.json | 16 + .../coloring/light_blue_security_manager.json | 16 + .../light_blue_wireless_transmitter.json | 16 + .../recipe/coloring/light_gray_cable.json | 16 + .../coloring/light_gray_constructor.json | 16 + .../coloring/light_gray_controller.json | 16 + .../coloring/light_gray_crafting_grid.json | 16 + .../coloring/light_gray_destructor.json | 16 + .../recipe/coloring/light_gray_detector.json | 16 + .../coloring/light_gray_disk_interface.json | 16 + .../recipe/coloring/light_gray_exporter.json | 16 + .../coloring/light_gray_external_storage.json | 16 + .../recipe/coloring/light_gray_grid.json | 16 + .../recipe/coloring/light_gray_importer.json | 16 + .../coloring/light_gray_network_receiver.json | 16 + .../light_gray_network_transmitter.json | 16 + .../recipe/coloring/light_gray_relay.json | 16 + .../coloring/light_gray_security_manager.json | 16 + .../light_gray_wireless_transmitter.json | 16 + .../recipe/coloring/lime_cable.json | 16 + .../recipe/coloring/lime_constructor.json | 16 + .../recipe/coloring/lime_controller.json | 16 + .../recipe/coloring/lime_crafting_grid.json | 16 + .../recipe/coloring/lime_destructor.json | 16 + .../recipe/coloring/lime_detector.json | 16 + .../recipe/coloring/lime_disk_interface.json | 16 + .../recipe/coloring/lime_exporter.json | 16 + .../coloring/lime_external_storage.json | 16 + .../recipe/coloring/lime_grid.json | 16 + .../recipe/coloring/lime_importer.json | 16 + .../coloring/lime_network_receiver.json | 16 + .../coloring/lime_network_transmitter.json | 16 + .../recipe/coloring/lime_relay.json | 16 + .../coloring/lime_security_manager.json | 16 + .../coloring/lime_wireless_transmitter.json | 16 + .../recipe/coloring/magenta_cable.json | 16 + .../recipe/coloring/magenta_constructor.json | 16 + .../recipe/coloring/magenta_controller.json | 16 + .../coloring/magenta_crafting_grid.json | 16 + .../recipe/coloring/magenta_destructor.json | 16 + .../recipe/coloring/magenta_detector.json | 16 + .../coloring/magenta_disk_interface.json | 16 + .../recipe/coloring/magenta_exporter.json | 16 + .../coloring/magenta_external_storage.json | 16 + .../recipe/coloring/magenta_grid.json | 16 + .../recipe/coloring/magenta_importer.json | 16 + .../coloring/magenta_network_receiver.json | 16 + .../coloring/magenta_network_transmitter.json | 16 + .../recipe/coloring/magenta_relay.json | 16 + .../coloring/magenta_security_manager.json | 16 + .../magenta_wireless_transmitter.json | 16 + .../recipe/coloring/orange_cable.json | 16 + .../recipe/coloring/orange_constructor.json | 16 + .../recipe/coloring/orange_controller.json | 16 + .../recipe/coloring/orange_crafting_grid.json | 16 + .../recipe/coloring/orange_destructor.json | 16 + .../recipe/coloring/orange_detector.json | 16 + .../coloring/orange_disk_interface.json | 16 + .../recipe/coloring/orange_exporter.json | 16 + .../coloring/orange_external_storage.json | 16 + .../recipe/coloring/orange_grid.json | 16 + .../recipe/coloring/orange_importer.json | 16 + .../coloring/orange_network_receiver.json | 16 + .../coloring/orange_network_transmitter.json | 16 + .../recipe/coloring/orange_relay.json | 16 + .../coloring/orange_security_manager.json | 16 + .../coloring/orange_wireless_transmitter.json | 16 + .../recipe/coloring/pink_cable.json | 16 + .../recipe/coloring/pink_constructor.json | 16 + .../recipe/coloring/pink_controller.json | 16 + .../recipe/coloring/pink_crafting_grid.json | 16 + .../recipe/coloring/pink_destructor.json | 16 + .../recipe/coloring/pink_detector.json | 16 + .../recipe/coloring/pink_disk_interface.json | 16 + .../recipe/coloring/pink_exporter.json | 16 + .../coloring/pink_external_storage.json | 16 + .../recipe/coloring/pink_grid.json | 16 + .../recipe/coloring/pink_importer.json | 16 + .../coloring/pink_network_receiver.json | 16 + .../coloring/pink_network_transmitter.json | 16 + .../recipe/coloring/pink_relay.json | 16 + .../coloring/pink_security_manager.json | 16 + .../coloring/pink_wireless_transmitter.json | 16 + .../recipe/coloring/purple_cable.json | 16 + .../recipe/coloring/purple_constructor.json | 16 + .../recipe/coloring/purple_controller.json | 16 + .../recipe/coloring/purple_crafting_grid.json | 16 + .../recipe/coloring/purple_destructor.json | 16 + .../recipe/coloring/purple_detector.json | 16 + .../coloring/purple_disk_interface.json | 16 + .../recipe/coloring/purple_exporter.json | 16 + .../coloring/purple_external_storage.json | 16 + .../recipe/coloring/purple_grid.json | 16 + .../recipe/coloring/purple_importer.json | 16 + .../coloring/purple_network_receiver.json | 16 + .../coloring/purple_network_transmitter.json | 16 + .../recipe/coloring/purple_relay.json | 16 + .../coloring/purple_security_manager.json | 16 + .../coloring/purple_wireless_transmitter.json | 16 + .../recipe/coloring/red_cable.json | 16 + .../recipe/coloring/red_constructor.json | 16 + .../recipe/coloring/red_controller.json | 16 + .../recipe/coloring/red_crafting_grid.json | 16 + .../recipe/coloring/red_destructor.json | 16 + .../recipe/coloring/red_detector.json | 16 + .../recipe/coloring/red_disk_interface.json | 16 + .../recipe/coloring/red_exporter.json | 16 + .../recipe/coloring/red_external_storage.json | 16 + .../recipe/coloring/red_grid.json | 16 + .../recipe/coloring/red_importer.json | 16 + .../recipe/coloring/red_network_receiver.json | 16 + .../coloring/red_network_transmitter.json | 16 + .../recipe/coloring/red_relay.json | 16 + .../recipe/coloring/red_security_manager.json | 16 + .../coloring/red_wireless_transmitter.json | 16 + .../recipe/coloring/white_cable.json | 16 + .../recipe/coloring/white_constructor.json | 16 + .../recipe/coloring/white_controller.json | 16 + .../recipe/coloring/white_crafting_grid.json | 16 + .../recipe/coloring/white_destructor.json | 16 + .../recipe/coloring/white_detector.json | 16 + .../recipe/coloring/white_disk_interface.json | 16 + .../recipe/coloring/white_exporter.json | 16 + .../coloring/white_external_storage.json | 16 + .../recipe/coloring/white_grid.json | 16 + .../recipe/coloring/white_importer.json | 16 + .../coloring/white_network_receiver.json | 16 + .../coloring/white_network_transmitter.json | 16 + .../recipe/coloring/white_relay.json | 16 + .../coloring/white_security_manager.json | 16 + .../coloring/white_wireless_transmitter.json | 16 + .../recipe/coloring/yellow_cable.json | 16 + .../recipe/coloring/yellow_constructor.json | 16 + .../recipe/coloring/yellow_controller.json | 16 + .../recipe/coloring/yellow_crafting_grid.json | 16 + .../recipe/coloring/yellow_destructor.json | 16 + .../recipe/coloring/yellow_detector.json | 16 + .../coloring/yellow_disk_interface.json | 16 + .../recipe/coloring/yellow_exporter.json | 16 + .../coloring/yellow_external_storage.json | 16 + .../recipe/coloring/yellow_grid.json | 16 + .../recipe/coloring/yellow_importer.json | 16 + .../coloring/yellow_network_receiver.json | 16 + .../coloring/yellow_network_transmitter.json | 16 + .../recipe/coloring/yellow_relay.json | 16 + .../coloring/yellow_security_manager.json | 16 + .../coloring/yellow_wireless_transmitter.json | 16 + .../data/refinedstorage/tags/item/cables.json | 20 + .../tags/item/constructors.json | 20 + .../refinedstorage/tags/item/controllers.json | 20 + .../tags/item/crafting_grids.json | 20 + .../tags/item/creative_controllers.json | 20 + .../refinedstorage/tags/item/destructors.json | 20 + .../refinedstorage/tags/item/detectors.json | 20 + .../tags/item/disk_interfaces.json | 20 + .../refinedstorage/tags/item/exporters.json | 20 + .../tags/item/external_storages.json | 20 + .../tags/item/fluid_storage_disks.json | 8 + .../data/refinedstorage/tags/item/grids.json | 20 + .../refinedstorage/tags/item/importers.json | 20 + .../tags/item/network_receivers.json | 20 + .../tags/item/network_transmitters.json | 20 + .../data/refinedstorage/tags/item/relays.json | 20 + .../tags/item/security_managers.json | 20 + .../tags/item/storage_disks.json | 8 + .../tags/item/wireless_transmitters.json | 20 + .../common/AbstractClientModInitializer.java | 135 ++ .../common/AbstractModInitializer.java | 886 ++++++++++++ .../platform/common/AbstractPlatform.java | 8 +- .../platform/common/Config.java | 10 +- .../platform/common/Platform.java | 22 +- .../platform/common/PlatformApiImpl.java | 576 ++++++++ .../platform/common/PlatformProxy.java | 22 +- .../ConfigurationCardItem.java | 10 +- ...ConfigurationCardItemPropertyFunction.java | 4 +- .../ConfigurationCardState.java | 2 +- .../configurationcard/package-info.java | 7 + .../AbstractConstructorDestructorBlock.java | 12 +- .../AbstractItemConstructorStrategy.java | 18 +- .../BlockBreakDestructorStrategy.java | 20 +- .../BlockBreakDestructorStrategyFactory.java | 12 +- .../CompositeConstructorStrategy.java | 32 + .../CompositeDestructorStrategy.java | 33 + .../ConstructorBlock.java | 49 + .../ConstructorBlockEntity.java | 36 +- .../ConstructorContainerMenu.java | 65 + .../ConstructorDestructorPropertyTypes.java | 18 + .../ConstructorDropItemsSideButtonWidget.java | 22 + .../ConstructorScreen.java | 30 + .../DestructorBlock.java | 49 + .../DestructorBlockEntity.java | 42 +- .../DestructorContainerMenu.java | 78 ++ ...DestructorPickupItemsSideButtonWidget.java | 22 + .../DestructorScreen.java | 29 + .../FluidBreakDestructorStrategy.java | 20 +- .../FluidBreakDestructorStrategyFactory.java | 22 + .../ItemDropConstructorStrategy.java | 6 +- .../ItemDropConstructorStrategyFactory.java | 36 + .../ItemPickupDestructorStrategy.java | 18 +- .../ItemPickupDestructorStrategyFactory.java | 30 + .../PlaceBlockConstructorStrategy.java | 8 +- .../PlaceFireworksConstructorStrategy.java | 6 +- .../PlaceFluidConstructorStrategy.java | 59 + .../constructordestructor/package-info.java | 7 + .../common/content/BlockColorMap.java | 4 +- .../common/content/BlockConstants.java | 2 +- .../common/content/BlockEntities.java | 54 +- .../content/BlockEntityTypeFactory.java | 2 +- .../platform/common/content/BlockFactory.java | 2 +- .../platform/common/content/Blocks.java | 68 +- .../platform/common/content/ColorMap.java | 2 +- .../platform/common/content/ContentIds.java | 10 +- .../platform/common/content/ContentNames.java | 6 +- .../common/content/CreativeModeTabItems.java | 8 +- .../common/content/DataComponents.java | 10 +- .../common/content/DefaultEnergyUsage.java | 2 +- .../content/DirectRegistryCallback.java | 2 +- .../content/ExtendedMenuTypeFactory.java | 2 +- .../platform/common/content/Items.java | 26 +- .../platform/common/content/KeyMappings.java | 2 +- .../common/content/LootFunctions.java | 8 +- .../common/content/MenuTypeFactory.java | 2 +- .../platform/common/content/Menus.java | 54 +- .../common/content/RegistryCallback.java | 2 +- .../platform/common/content/Sounds.java | 2 +- .../platform/common/content/Tags.java | 4 +- .../platform/common/content/package-info.java | 7 + .../controller/AbstractControllerBlock.java | 10 +- .../common/controller/ControllerBlock.java | 6 +- .../controller/ControllerBlockEntity.java | 28 +- .../ControllerBlockEntityTicker.java | 6 +- .../controller/ControllerBlockItem.java | 66 + .../controller/ControllerContainerMenu.java | 59 + .../common/controller/ControllerData.java | 2 +- .../controller/ControllerEnergyType.java | 4 +- .../ControllerItemPropertyFunction.java | 4 +- .../common/controller/ControllerScreen.java | 57 + .../common/controller/ControllerType.java | 6 + .../controller/CreativeControllerBlock.java | 6 +- .../CreativeControllerBlockItem.java | 17 + .../common/controller/package-info.java | 7 + .../common/detector/DetectorBlock.java | 32 +- .../common/detector/DetectorBlockEntity.java | 38 +- .../detector/DetectorContainerMenu.java | 59 + .../common/detector/DetectorModeSettings.java | 4 +- .../DetectorModeSideButtonWidget.java | 10 +- .../detector/DetectorPropertyTypes.java | 17 + .../common/detector/DetectorScreen.java | 24 + .../detector/FuzzyDetectorAmountStrategy.java | 29 + .../common/detector/package-info.java | 7 + .../common/exporter/ExporterBlock.java | 93 ++ .../common/exporter/ExporterBlockEntity.java | 32 +- .../exporter/ExporterContainerMenu.java | 47 + .../common/exporter/ExporterScreen.java | 25 + .../FuzzyExporterTransferStrategy.java | 29 + .../common/exporter/package-info.java | 7 + .../common/grid/AbstractGridBlock.java | 30 + .../common/grid/AbstractGridBlockEntity.java | 107 ++ .../grid/AbstractGridContainerMenu.java | 76 +- .../common/grid/AbstractGridSynchronizer.java | 18 + .../common/grid/ClientCraftingGridSource.java | 6 +- .../common/grid/CraftingGridBlock.java | 61 + .../common/grid/CraftingGridBlockEntity.java | 26 +- .../grid/CraftingGridContainerMenu.java | 22 +- .../grid/CraftingGridMatrixCloseBehavior.java | 7 + .../grid/CraftingGridRefillContext.java | 12 + .../grid/CraftingGridRefillContextImpl.java | 4 +- .../common/grid/CraftingGridResultSlot.java | 6 +- .../common/grid/CraftingGridSource.java | 4 +- .../common/grid/CraftingGridSourceImpl.java | 12 +- .../platform/common/grid/CraftingMatrix.java | 2 +- .../grid/CraftingMatrixContainerMenu.java | 2 +- .../platform/common/grid/GridBlock.java | 61 + .../platform/common/grid/GridBlockEntity.java | 8 +- .../common/grid/GridContainerMenu.java | 27 + .../platform/common/grid/GridData.java | 45 + .../platform/common/grid/GridSearchBox.java | 2 +- .../common/grid/GridSortingTypes.java | 37 + .../common/grid/NoopGridSynchronizer.java | 4 +- .../common/grid/PortableGridData.java | 20 + .../common/grid/SecuredGridOperations.java | 54 + .../SnapshotCraftingGridRefillContext.java | 14 +- .../platform/common/grid/WirelessGrid.java | 96 ++ .../grid/WirelessGridContainerMenu.java | 8 +- .../common/grid/WirelessGridData.java | 15 + .../WirelessGridExtendedMenuProvider.java | 10 +- .../common/grid/WirelessGridItem.java | 49 + .../common/grid/WirelessGridOperations.java | 56 + .../platform/common/grid/package-info.java | 7 + .../grid/screen/AbstractGridScreen.java | 50 +- .../screen/AutoSelectedSideButtonWidget.java | 52 + .../grid/screen/CraftingGridScreen.java | 20 +- .../common/grid/screen/GridScreen.java | 25 + .../grid/screen/GridSearchBoxWidget.java | 20 +- .../common/grid/screen/LastModified.java | 2 +- .../screen/ResourceTypeSideButtonWidget.java | 12 +- .../SortingDirectionSideButtonWidget.java | 10 +- .../screen/SortingTypeSideButtonWidget.java | 10 +- .../SynchronizationSideButtonWidget.java | 8 +- .../screen/hint/FluidGridInsertionHint.java | 33 + .../screen/hint/GridInsertionHintsImpl.java | 6 +- .../screen/hint/ItemGridInsertionHint.java | 21 + .../hint/SingleItemGridInsertionHint.java | 20 + .../common/grid/screen/hint/package-info.java | 7 + .../common/grid/screen/package-info.java | 7 + .../ClientGridExtractionStrategy.java | 16 + .../strategy/ClientGridInsertionStrategy.java | 18 + .../strategy/ClientGridScrollingStrategy.java | 14 + .../CompositeGridExtractionStrategy.java | 28 + .../CompositeGridInsertionStrategy.java | 6 +- .../CompositeGridScrollingStrategy.java | 26 + .../common/grid/strategy/package-info.java | 7 + .../AbstractFluidGridResourceFactory.java | 10 +- .../view/AbstractItemGridResourceFactory.java | 10 +- .../view/CompositeGridResourceFactory.java | 25 + .../common/grid/view/FluidGridResource.java | 106 ++ .../common/grid/view/ItemGridResource.java | 26 +- .../common/grid/view/package-info.java | 7 + .../iface/ExportedResourcesContainer.java | 20 +- .../platform/common/iface/InterfaceBlock.java | 16 +- .../common/iface/InterfaceBlockEntity.java | 36 +- .../common/iface/InterfaceContainerMenu.java | 24 +- .../platform/common/iface/InterfaceData.java | 4 +- ...latformExternalStorageProviderFactory.java | 6 +- ...InterfaceProxyExternalStorageProvider.java | 16 +- .../common/iface/InterfaceScreen.java | 40 + .../platform/common/iface/package-info.java | 7 + .../common/importer/ImporterBlock.java | 93 ++ .../common/importer/ImporterBlockEntity.java | 42 +- .../importer/ImporterContainerMenu.java | 78 ++ .../common/importer/ImporterScreen.java | 31 + .../common/importer/package-info.java | 7 + .../platform/common/misc/ProcessorItem.java | 2 +- .../platform/common/misc/WrenchItem.java | 25 + .../platform/common/misc/package-info.java | 7 + .../common/networking/CableBlock.java | 36 +- .../networking/NetworkCardInventory.java | 4 +- .../common/networking/NetworkCardItem.java | 10 +- .../NetworkCardItemPropertyFunction.java | 4 +- .../networking/NetworkReceiverBlock.java | 81 ++ .../NetworkReceiverBlockEntity.java | 34 + .../common/networking/NetworkReceiverKey.java | 2 +- .../networking/NetworkTransmitterBlock.java | 18 +- .../NetworkTransmitterBlockEntity.java | 26 +- .../NetworkTransmitterBlockEntityTicker.java | 25 + .../NetworkTransmitterContainerMenu.java | 18 +- .../networking/NetworkTransmitterData.java | 2 +- .../networking/NetworkTransmitterScreen.java | 12 +- .../networking/NetworkTransmitterState.java | 2 +- .../common/networking/RelayBlock.java | 71 + .../common/networking/RelayBlockEntity.java | 40 +- .../common/networking/RelayContainerMenu.java | 26 +- .../RelayInputNetworkNodeContainer.java | 8 +- .../RelayOutputNetworkNodeContainer.java | 8 +- .../RelayPassEnergySideButtonWidget.java | 36 + .../RelayPassSecuritySideButtonWidget.java | 36 + .../RelayPassStorageSideButtonWidget.java | 36 + .../RelayPassThroughSideButtonWidget.java | 36 + .../common/networking/RelayPropertyTypes.java | 24 + .../common/networking/RelayScreen.java | 20 +- .../common/networking/package-info.java | 7 + .../platform/common/package-info.java | 7 + .../AbstractSecurityCardContainerMenu.java | 12 +- ...tractSecurityCardExtendedMenuProvider.java | 32 + .../security/AbstractSecurityCardItem.java | 20 +- .../security/AbstractSecurityCardScreen.java | 12 +- .../common/security/BuiltinPermission.java | 12 +- .../FallbackSecurityCardContainerMenu.java | 6 +- ...lbackSecurityCardExtendedMenuProvider.java | 10 +- .../security/FallbackSecurityCardItem.java | 53 + .../security/FallbackSecurityCardScreen.java | 2 +- .../PlatformSecurityNetworkComponentImpl.java | 31 + .../security/PlayerBoundSecurityCardData.java | 2 +- .../common/security/PlayerSecurityActor.java | 8 + .../security/SecurityCardBoundPlayer.java | 2 +- .../security/SecurityCardContainerMenu.java | 10 +- .../common/security/SecurityCardData.java | 32 + .../SecurityCardExtendedMenuProvider.java | 10 +- .../common/security/SecurityCardItem.java | 18 +- .../SecurityCardItemPropertyFunction.java | 4 +- .../security/SecurityCardPermissions.java | 6 +- .../common/security/SecurityCardScreen.java | 2 +- .../common/security/SecurityManagerBlock.java | 75 + .../security/SecurityManagerBlockEntity.java | 30 +- .../SecurityManagerContainerMenu.java | 72 + .../security/SecurityManagerScreen.java | 61 + .../common/security/package-info.java | 7 + .../AbstractDiskContainerBlockEntity.java | 28 +- .../AbstractProgressStorageScreen.java | 4 +- .../storage/AbstractStorageContainerMenu.java | 16 +- .../common/storage/AbstractStorageScreen.java | 14 +- .../common/storage/AccessModeSettings.java | 4 +- .../storage/AccessModeSideButtonWidget.java | 10 +- ...ucketPlayerInventoryInsertableStorage.java | 18 +- .../storage/ClientStorageRepository.java | 10 +- .../platform/common/storage/Disk.java | 10 + .../DiskContainerBlockEntityTicker.java | 6 +- .../common/storage/DiskInventory.java | 14 +- .../storage/DiskStateChangeListener.java | 4 +- .../storage/FilterModeSideButtonWidget.java | 10 +- .../common/storage/FluidStorageType.java | 14 +- .../common/storage/ItemStorageType.java | 12 +- .../storage/LimitedPlatformStorage.java | 23 + .../common/storage/PlatformStorage.java | 78 ++ .../storage/PrioritySideButtonWidget.java | 10 +- .../common/storage/StorageAccessor.java | 11 + .../common/storage/StorageCodecs.java | 16 +- .../StorageConfigurationContainer.java | 31 + .../StorageConfigurationContainerImpl.java | 16 +- .../StorageContainerItemHelperImpl.java | 18 +- .../common/storage/StoragePropertyTypes.java | 26 + .../common/storage/StorageRepositoryImpl.java | 14 +- .../common/storage/StorageTooltipHelper.java | 4 +- .../platform/common/storage/StorageTypes.java | 34 + .../storage/VoidExcessSideButtonWidget.java | 46 + .../AbstractDiskDriveBlockEntity.java | 16 +- .../AbstractDiskDriveBlockEntityRenderer.java | 8 +- .../storage/diskdrive/DiskDriveBlock.java | 59 + .../diskdrive/DiskDriveContainerMenu.java | 34 +- .../storage/diskdrive/DiskDriveScreen.java | 32 + .../EmptyStorageDiskInfoAccessor.java | 14 + .../diskdrive/StorageDiskInfoAccessor.java | 11 + .../StorageDiskInfoAccessorImpl.java | 25 + .../storage/diskdrive/package-info.java | 7 + .../AbstractDiskInterfaceBlockEntity.java | 34 +- ...tractDiskInterfaceBlockEntityRenderer.java | 8 +- .../diskinterface/DiskInterfaceBlock.java | 83 ++ .../DiskInterfaceContainerMenu.java | 128 ++ .../DiskInterfacePropertyTypes.java | 17 + .../diskinterface/DiskInterfaceScreen.java | 66 + .../diskinterface/TransferModeSettings.java | 4 +- .../TransferModeSideButtonWidget.java | 10 +- .../storage/diskinterface/package-info.java | 7 + .../externalstorage/ExternalStorageBlock.java | 26 +- .../ExternalStorageBlockEntity.java | 28 +- .../ExternalStorageContainerMenu.java | 57 + .../ExternalStorageScreen.java | 24 + ...ternalStorageTrackedStorageRepository.java | 14 +- .../ExternalStorageWorkRate.java | 2 +- .../storage/externalstorage/package-info.java | 7 + .../platform/common/storage/package-info.java | 7 + .../AbstractPortableGridBlockEntity.java | 48 +- ...stractPortableGridBlockEntityRenderer.java | 8 +- .../AbstractPortableGridContainerMenu.java | 83 ++ .../portablegrid/InWorldPortableGrid.java | 8 +- .../storage/portablegrid/PortableGrid.java | 122 ++ .../portablegrid/PortableGridBlock.java | 14 +- .../PortableGridBlockContainerMenu.java | 39 + .../PortableGridBlockEntityTicker.java | 4 +- .../portablegrid/PortableGridBlockItem.java | 40 +- .../PortableGridBlockItemRenderInfo.java | 6 + .../PortableGridItemContainerMenu.java | 38 + .../PortableGridItemExtendedMenuProvider.java | 63 + .../PortableGridLootItemFunction.java | 6 +- .../portablegrid/PortableGridOperations.java | 49 + .../portablegrid/PortableGridScreen.java | 8 +- .../portablegrid/PortableGridStorage.java | 25 + .../portablegrid/PortableGridType.java | 6 + .../storage/portablegrid/package-info.java | 7 + .../storageblock/AbstractStorageBlock.java | 6 +- .../AbstractStorageBlockBlockEntity.java | 34 +- .../AbstractStorageBlockContainerMenu.java | 87 ++ .../AbstractStorageBlockScreen.java | 24 + .../storageblock/FluidStorageBlock.java | 27 + .../FluidStorageBlockBlockEntity.java | 18 +- .../FluidStorageBlockBlockItem.java | 20 +- .../FluidStorageBlockContainerMenu.java | 35 + .../storageblock/FluidStorageBlockScreen.java | 4 +- .../storageblock/ItemStorageBlock.java | 27 + .../ItemStorageBlockBlockEntity.java | 18 +- .../ItemStorageBlockBlockItem.java | 18 +- .../ItemStorageBlockContainerMenu.java | 35 + .../storageblock/ItemStorageBlockScreen.java | 2 +- .../storageblock/StorageBlockData.java | 4 +- .../StorageBlockLootItemFunction.java | 8 +- .../storage/storageblock/package-info.java | 7 + .../storagedisk/FluidStorageDiskItem.java | 83 ++ .../storagedisk/ItemStorageDiskItem.java | 73 + .../storage/storagedisk/package-info.java | 7 + ...ositeStorageMonitorExtractionStrategy.java | 33 + ...positeStorageMonitorInsertionStrategy.java | 32 + ...FluidStorageMonitorExtractionStrategy.java | 41 + .../FluidStorageMonitorInsertionStrategy.java | 64 + .../ItemStorageMonitorExtractionStrategy.java | 40 + .../ItemStorageMonitorInsertionStrategy.java | 40 + .../storagemonitor/StorageMonitorBlock.java | 22 +- .../StorageMonitorBlockEntity.java | 44 +- .../StorageMonitorBlockEntityRenderer.java | 12 +- .../StorageMonitorContainerMenu.java | 56 + .../StorageMonitorInsertTracker.java | 4 +- .../storagemonitor/StorageMonitorScreen.java | 40 + .../common/storagemonitor/package-info.java | 7 + ...AbstractActiveColoredDirectionalBlock.java | 2 +- .../common/support/AbstractBaseBlock.java | 16 +- .../support/AbstractBaseContainerMenu.java | 20 +- .../common/support/AbstractBaseScreen.java | 38 +- .../support/AbstractBlockEntityTicker.java | 2 +- .../common/support/AbstractColoredBlock.java | 2 +- .../support/AbstractDirectionalBlock.java | 4 +- .../AbstractDirectionalCableBlock.java | 8 +- .../common/support/AbstractFilterScreen.java | 38 + .../common/support/AbstractSafeSavedData.java | 2 +- .../common/support/BaseBlockItem.java | 4 +- .../common/support/BlockEntityWithDrops.java | 9 + .../common/support/BlockItemProvider.java | 8 + .../common/support/CableBlockSupport.java | 4 +- .../common/support/CableShapeCacheKey.java | 23 + .../support/ClientToServerCommunications.java | 45 + .../common/support/ColorableBlock.java | 17 + .../support/DirectionalCableBlockShapes.java | 2 +- .../common/support/FilterModeSettings.java | 4 +- .../common/support/FilterWithFuzzyMode.java | 8 +- .../common/support/FilteredContainer.java | 2 +- .../common/support/NetworkNodeBlockItem.java | 4 +- .../support/PlayerAwareBlockEntity.java | 7 + .../platform/common/support/RedstoneMode.java | 2 +- .../common/support/RedstoneModeSettings.java | 2 +- .../common/support/SchedulingMode.java | 4 +- .../common/support/SchedulingModeType.java | 12 +- .../platform/common/support/SimpleBlock.java | 11 + .../platform/common/support/SimpleItem.java | 9 + .../platform/common/support/TextureIds.java | 12 + .../support/amount/AbstractAmountScreen.java | 6 +- .../amount/AbstractSingleAmountScreen.java | 6 +- .../support/amount/AmountOperations.java | 2 +- .../amount/AmountScreenConfiguration.java | 2 +- .../amount/DoubleAmountOperations.java | 2 +- .../amount/IntegerAmountOperations.java | 2 +- .../support/amount/LongAmountOperations.java | 4 +- .../common/support/amount/PriorityScreen.java | 8 +- .../support/amount/ResourceAmountScreen.java | 10 +- .../common/support/amount/package-info.java | 7 + .../AbstractResourceContainerMenu.java | 10 +- .../AbstractSchedulingContainerMenu.java | 16 +- .../AbstractSimpleFilterContainerMenu.java | 16 +- .../AbstractSingleAmountContainerMenu.java | 10 +- .../support/containermenu/ClientProperty.java | 4 +- .../support/containermenu/DisabledSlot.java | 2 +- .../containermenu/ExtendedMenuProvider.java | 2 +- .../support/containermenu/MenuOpener.java | 8 + .../NetworkNodeExtendedMenuProvider.java | 4 + .../NetworkNodeMenuProvider.java | 18 + .../support/containermenu/Property.java | 11 + .../support/containermenu/PropertyType.java | 2 +- .../support/containermenu/PropertyTypes.java | 52 + .../ResourceInventoryDestination.java | 2 +- .../support/containermenu/ResourceSlot.java | 18 +- .../containermenu/ResourceSlotType.java | 7 + .../support/containermenu/ServerProperty.java | 2 +- .../containermenu/SingleAmountData.java | 22 + .../containermenu/TransferDestination.java | 11 + .../containermenu/TransferManager.java | 2 +- .../support/containermenu/ValidatedSlot.java | 4 +- .../support/containermenu/package-info.java | 7 + .../common/support/direction/BiDirection.java | 2 +- .../support/direction/BiDirectionType.java | 2 +- .../direction/DefaultDirectionType.java | 2 +- .../support/direction/DirectionType.java | 2 +- .../direction/HorizontalDirection.java | 2 +- .../direction/HorizontalDirectionType.java | 2 +- .../support/direction/package-info.java | 7 + .../energy/BlockEntityEnergyStorage.java | 20 + .../support/energy/CreativeEnergyStorage.java | 31 + .../support/energy/EnergyContainerMenu.java | 6 + .../common/support/energy/EnergyInfo.java | 6 +- .../support/energy/EnergyItemHelperImpl.java | 12 +- .../energy/EnergyLootItemFunction.java | 10 +- .../energy/ItemBlockEnergyStorage.java | 8 +- .../support/energy/ItemEnergyStorage.java | 26 + .../common/support/energy/package-info.java | 7 + ...actingNetworkNodeContainerBlockEntity.java | 4 +- ...neModeNetworkNodeContainerBlockEntity.java | 16 +- ...dulingNetworkNodeContainerBlockEntity.java | 93 ++ ...deableNetworkNodeContainerBlockEntity.java | 16 +- .../BaseNetworkNodeContainerBlockEntity.java | 22 +- .../network/ConnectionProviderImpl.java | 12 +- .../support/network/ConnectionSinkImpl.java | 4 +- .../InWorldNetworkNodeContainerImpl.java | 10 +- .../network/NetworkNodeBlockEntityTicker.java | 6 +- .../CompositeSlotReferenceProvider.java | 8 +- .../bounditem/InventorySlotReference.java | 6 +- .../InventorySlotReferenceFactory.java | 6 +- .../InventorySlotReferenceProvider.java | 27 + .../bounditem/NetworkBoundItemHelperImpl.java | 16 +- .../NetworkBoundItemItemPropertyFunction.java | 6 +- .../NetworkBoundItemSessionImpl.java | 18 +- .../network/bounditem/package-info.java | 7 + .../PlatformStorageNetworkComponent.java | 29 + .../network/component/package-info.java | 7 + .../common/support/network/package-info.java | 7 + .../platform/common/support/package-info.java | 7 + .../common/support/packet/PacketContext.java | 8 + .../common/support/packet/PacketHandler.java | 6 + .../common/support/packet/c2s/C2SPackets.java | 22 +- .../packet/c2s/CraftingGridClearPacket.java | 8 +- .../c2s/CraftingGridRecipeTransferPacket.java | 40 + .../support/packet/c2s/GridExtractPacket.java | 40 + .../support/packet/c2s/GridInsertPacket.java | 33 + .../support/packet/c2s/GridScrollPacket.java | 40 + .../packet/c2s/PropertyChangePacket.java | 8 +- .../c2s/ResourceFilterSlotChangePacket.java | 38 + .../c2s/ResourceSlotAmountChangePacket.java | 8 +- .../packet/c2s/ResourceSlotChangePacket.java | 8 +- .../c2s/SecurityCardBoundPlayerPacket.java | 8 +- .../c2s/SecurityCardPermissionPacket.java | 37 + .../SecurityCardResetPermissionPacket.java | 34 + .../packet/c2s/SingleAmountChangePacket.java | 8 +- .../packet/c2s/StorageInfoRequestPacket.java | 41 + .../packet/c2s/UseNetworkBoundItemPacket.java | 47 + .../support/packet/c2s/package-info.java | 7 + .../common/support/packet/package-info.java | 7 + .../support/packet/s2c/EnergyInfoPacket.java | 8 +- .../support/packet/s2c/GridActivePacket.java | 8 +- .../support/packet/s2c/GridClearPacket.java | 32 + .../support/packet/s2c/GridUpdatePacket.java | 42 + .../s2c/NetworkTransmitterStatusPacket.java | 10 +- .../packet/s2c/NoPermissionPacket.java | 6 +- .../packet/s2c/ResourceSlotUpdatePacket.java | 41 + .../common/support/packet/s2c/S2CPackets.java | 14 +- .../packet/s2c/StorageInfoResponsePacket.java | 8 +- .../s2c/WirelessTransmitterRangePacket.java | 8 +- .../support/packet/s2c/package-info.java | 7 + .../registry/PlatformRegistryImpl.java | 6 +- .../common/support/registry/package-info.java | 7 + .../AbstractDiskLedBlockEntityRenderer.java | 8 +- .../support/render/AbstractFluidRenderer.java | 2 +- .../common/support/render/CubeBuilder.java | 2 +- .../common/support/render/FluidRenderer.java | 4 +- .../common/support/render/package-info.java | 7 + ...ractResourceContainerContainerAdapter.java | 8 +- ...CompositeRecipeModIngredientConverter.java | 6 +- .../support/resource/FluidResource.java | 39 + .../resource/FluidResourceFactory.java | 25 + .../resource/FluidResourceRendering.java | 10 +- .../support/resource/FluidResourceType.java | 87 ++ .../common/support/resource/ItemResource.java | 12 +- .../support/resource/ItemResourceFactory.java | 24 + .../resource/ItemResourceRendering.java | 8 +- .../support/resource/ItemResourceType.java | 89 ++ .../support/resource/ResourceCodecs.java | 12 +- .../resource/ResourceContainerData.java | 6 +- .../resource/ResourceContainerImpl.java | 22 +- .../resource/ResourceContainerSlot.java | 8 +- .../support/resource/ResourceTypes.java | 11 + .../resource/list/FuzzyResourceListImpl.java | 14 +- .../support/resource/list/package-info.java | 7 + .../common/support/resource/package-info.java | 7 + .../stretching/AbstractStretchingScreen.java | 10 +- .../common/support/stretching/ScreenSize.java | 2 +- .../stretching/ScreenSizeListener.java | 6 + .../ScreenSizeSideButtonWidget.java | 8 +- .../support/stretching/package-info.java | 7 + .../CompositeClientTooltipComponent.java | 2 +- .../tooltip/HelpClientTooltipComponent.java | 6 +- .../MouseWithIconClientTooltipComponent.java | 4 +- .../ResourceClientTooltipComponent.java | 8 +- .../common/support/tooltip/SmallText.java | 2 +- .../SmallTextClientTooltipComponent.java | 2 +- .../common/support/tooltip/package-info.java | 7 + .../widget/AbstractSideButtonWidget.java | 10 +- .../widget/AbstractYesNoSideButtonWidget.java | 33 + .../support/widget/CustomCheckboxWidget.java | 2 +- .../widget/FuzzyModeSideButtonWidget.java | 6 +- .../common/support/widget/History.java | 2 +- .../support/widget/HoveredImageButton.java | 2 +- .../common/support/widget/ProgressWidget.java | 4 +- .../widget/RedstoneModeSideButtonWidget.java | 8 +- .../SchedulingModeSideButtonWidget.java | 8 +- .../support/widget/ScrollbarWidget.java | 6 +- .../support/widget/SearchFieldWidget.java | 6 +- .../common/support/widget/package-info.java | 7 + .../BuiltinUpgradeDestinationsImpl.java | 31 + .../common/upgrade/FortuneUpgradeItem.java | 12 +- .../common/upgrade/RangeUpgradeItem.java | 40 + .../RegulatorUpgradeContainerMenu.java | 53 + .../common/upgrade/RegulatorUpgradeItem.java | 36 +- .../upgrade/RegulatorUpgradeScreen.java | 14 + .../common/upgrade/RegulatorUpgradeState.java | 6 +- .../common/upgrade/SimpleUpgradeItem.java | 14 +- .../common/upgrade/UpgradeContainer.java | 16 +- ...radeDestinationClientTooltipComponent.java | 4 +- .../common/upgrade/UpgradeDestinations.java | 8 +- .../UpgradeItemClientTooltipComponent.java | 4 +- .../common/upgrade/UpgradeRegistryImpl.java | 8 +- .../platform/common/upgrade/UpgradeSlot.java | 4 +- .../UpgradeWithEnchantedBookRecipe.java | 4 +- ...radeWithEnchantedBookRecipeSerializer.java | 2 +- .../platform/common/upgrade/package-info.java | 7 + .../platform/common/util/ContainerUtil.java | 2 +- .../common/util/CustomBlockPlaceContext.java | 2 +- .../platform/common/util/IdentifierUtil.java | 6 +- .../platform/common/util/MathUtil.java | 2 +- .../platform/common/util/PacketUtil.java | 2 +- .../common/util/SecurityToastUtil.java | 4 +- .../common/util/ServerEventQueue.java | 2 +- .../platform/common/util/package-info.java | 7 + .../BaseWirelessTransmitterRangeModifier.java | 12 + ...ositeWirelessTransmitterRangeModifier.java | 6 +- ...gradeWirelessTransmitterRangeModifier.java | 20 + ...gradeWirelessTransmitterRangeModifier.java | 15 + .../WirelessTransmitterBlock.java | 28 +- .../WirelessTransmitterBlockEntity.java | 28 +- .../WirelessTransmitterContainerMenu.java | 24 +- .../WirelessTransmitterData.java | 2 +- ...relessTransmitterNetworkNodeContainer.java | 10 +- .../WirelessTransmitterScreen.java | 50 + .../wirelesstransmitter/package-info.java | 7 + .../1024b_fluid_storage_block.json | 7 + .../blockstates/16k_storage_block.json | 7 + .../blockstates/1k_storage_block.json | 7 + .../blockstates/256b_fluid_storage_block.json | 7 + .../4096b_fluid_storage_block.json | 7 + .../blockstates/4k_storage_block.json | 7 + .../blockstates/64b_fluid_storage_block.json | 7 + .../blockstates/64k_storage_block.json | 7 + .../creative_fluid_storage_block.json | 7 + .../blockstates/creative_portable_grid.json | 7 + .../blockstates/creative_storage_block.json | 7 + .../blockstates/disk_drive.json | 7 + .../refinedstorage/blockstates/interface.json | 10 + .../blockstates/machine_casing.json | 7 + .../blockstates/portable_grid.json | 7 + .../quartz_enriched_copper_block.json | 7 + .../quartz_enriched_iron_block.json | 7 + .../blockstates/storage_monitor.json | 57 + .../resources/assets/refinedstorage}/icon.png | Bin .../assets/refinedstorage/lang/de_de.json | 452 ++++++ .../assets/refinedstorage/lang/en_us.json | 473 +++++++ .../assets/refinedstorage/lang/es_es.json | 452 ++++++ .../assets/refinedstorage/lang/fr_fr.json | 452 ++++++ .../assets/refinedstorage/lang/hu_hu.json | 452 ++++++ .../assets/refinedstorage/lang/id_id.json | 452 ++++++ .../assets/refinedstorage/lang/it_it.json | 452 ++++++ .../assets/refinedstorage/lang/ja_jp.json | 452 ++++++ .../assets/refinedstorage/lang/ko_kr.json | 452 ++++++ .../assets/refinedstorage/lang/nl_nl.json | 365 +++++ .../assets/refinedstorage/lang/pl_pl.json | 452 ++++++ .../assets/refinedstorage/lang/pt_br.json | 452 ++++++ .../assets/refinedstorage/lang/ru_ru.json | 452 ++++++ .../assets/refinedstorage/lang/zh_cn.json | 452 ++++++ .../assets/refinedstorage/lang/zh_tw.json | 452 ++++++ .../block/1024b_fluid_storage_block.json | 6 + .../models/block/16k_storage_block.json | 6 + .../models/block/1k_storage_block.json | 6 + .../block/256b_fluid_storage_block.json | 6 + .../block/4096b_fluid_storage_block.json | 6 + .../models/block/4k_storage_block.json | 6 + .../models/block/64b_fluid_storage_block.json | 6 + .../models/block/64k_storage_block.json | 6 + .../models/block/all_cutout.json | 0 .../models/block/cable/core/base.json | 0 .../models/block/cable/extension/base.json | 0 .../models/block/constructor/active.json | 8 + .../models/block/constructor/inactive.json | 8 + .../block/constructor_destructor/active.json | 165 +++ .../constructor_destructor/inactive.json | 161 +++ .../models/block/controller/nearly.json | 0 .../models/block/controller/nearly_off.json | 9 + .../models/block/controller/nearly_on.json | 9 + .../models/block/controller/off.json | 8 + .../block/creative_fluid_storage_block.json | 6 + .../models/block/creative_portable_grid.json | 4 + .../models/block/creative_storage_block.json | 6 + .../refinedstorage}/models/block/cutout.json | 0 .../models/block/destructor/active.json | 8 + .../models/block/destructor/inactive.json | 8 + .../models/block/detector/powered.json | 0 .../models/block/detector/unpowered.json | 10 +- .../models/block/disk/disk.json | 2 +- .../models/block/disk/fluid_disk.json | 2 +- .../models/block/disk/led_full.json | 2 +- .../models/block/disk/led_inactive.json | 2 +- .../models/block/disk/led_near_capacity.json | 2 +- .../models/block/disk/led_normal.json | 2 +- .../models/block/disk_drive.json | 4 + .../models/block/disk_drive/base.json | 50 + .../models/block/emissive_all_cutout.json | 0 .../models/block/emissive_cutout.json | 0 .../models/block/emissive_north_cutout.json | 0 .../refinedstorage/models/block/exporter.json | 215 +++ .../models/block/external_storage.json | 137 ++ .../refinedstorage/models/block/importer.json | 215 +++ .../models/block/interface_active.json | 6 + .../models/block/interface_inactive.json | 6 + .../models/block/machine_casing.json | 6 + .../models/block/north_cutout.json | 0 .../models/block/portable_grid.json | 4 + .../models/block/portable_grid/active.json | 6 + .../models/block/portable_grid/base.json | 558 ++++++++ .../models/block/portable_grid/inactive.json | 6 + .../block/quartz_enriched_copper_block.json | 6 + .../block/quartz_enriched_iron_block.json | 6 + .../models/block/storage_monitor.json | 12 + .../block/wireless_transmitter/active.json | 233 ++++ .../block/wireless_transmitter/inactive.json | 210 +++ .../item/1024b_fluid_storage_block.json | 3 + .../models/item/1024b_fluid_storage_disk.json | 6 + .../models/item/1024b_fluid_storage_part.json | 6 + .../models/item/16k_storage_block.json | 3 + .../models/item/16k_storage_disk.json | 6 + .../models/item/16k_storage_part.json | 6 + .../models/item/1k_storage_block.json | 3 + .../models/item/1k_storage_disk.json | 6 + .../models/item/1k_storage_part.json | 6 + .../models/item/256b_fluid_storage_block.json | 3 + .../models/item/256b_fluid_storage_disk.json | 6 + .../models/item/256b_fluid_storage_part.json | 6 + .../item/4096b_fluid_storage_block.json | 3 + .../models/item/4096b_fluid_storage_disk.json | 6 + .../models/item/4096b_fluid_storage_part.json | 6 + .../models/item/4k_storage_block.json | 3 + .../models/item/4k_storage_disk.json | 6 + .../models/item/4k_storage_part.json | 6 + .../models/item/64b_fluid_storage_block.json | 3 + .../models/item/64b_fluid_storage_disk.json | 6 + .../models/item/64b_fluid_storage_part.json | 6 + .../models/item/64k_storage_block.json | 3 + .../models/item/64k_storage_disk.json | 6 + .../models/item/64k_storage_part.json | 6 + .../models/item/advanced_processor.json | 6 + .../models/item/basic_processor.json | 6 + .../refinedstorage/models/item/book.json | 6 + .../models/item/cable/base.json | 0 .../models/item/configuration_card.json | 17 + .../item/configuration_card/active.json | 6 + .../item/configuration_card/inactive.json | 6 + .../models/item/construction_core.json | 6 + .../models/item/constructor/base.json | 392 ++++++ .../item/creative_fluid_storage_block.json | 3 + .../item/creative_fluid_storage_disk.json | 6 + .../models/item/creative_portable_grid.json | 3 + .../models/item/creative_range_upgrade.json | 6 + .../models/item/creative_storage_block.json | 3 + .../models/item/creative_storage_disk.json | 6 + .../models/item/creative_wireless_grid.json | 17 + .../models/item/destruction_core.json | 6 + .../models/item/destructor/base.json | 392 ++++++ .../models/item/disk_drive.json | 4 + .../models/item/exporter/base.json | 440 ++++++ .../models/item/external_storage/base.json | 362 +++++ .../models/item/fallback_security_card.json | 6 + .../models/item/fortune_1_upgrade.json | 6 + .../models/item/fortune_2_upgrade.json | 6 + .../models/item/fortune_3_upgrade.json | 6 + .../models/item/importer/base.json | 440 ++++++ .../models/item/improved_processor.json | 6 + .../refinedstorage/models/item/interface.json | 3 + .../models/item/machine_casing.json | 3 + .../models/item/network_card.json | 17 + .../models/item/network_card/active.json | 6 + .../models/item/network_card/inactive.json | 6 + .../models/item/portable_grid.json | 3 + .../models/item/processor_binding.json | 6 + .../models/item/quartz_enriched_copper.json | 6 + .../item/quartz_enriched_copper_block.json | 3 + .../models/item/quartz_enriched_iron.json | 6 + .../item/quartz_enriched_iron_block.json | 3 + .../models/item/range_upgrade.json | 6 + .../models/item/raw_advanced_processor.json | 6 + .../models/item/raw_basic_processor.json | 6 + .../models/item/raw_improved_processor.json | 6 + .../models/item/regulator_upgrade.json | 6 + .../models/item/security_card.json | 17 + .../models/item/security_card/active.json | 6 + .../models/item/security_card/inactive.json | 6 + .../refinedstorage/models/item/silicon.json | 6 + .../models/item/silk_touch_upgrade.json | 6 + .../models/item/speed_upgrade.json | 6 + .../models/item/stack_upgrade.json | 6 + .../models/item/storage_housing.json | 6 + .../models/item/storage_monitor.json | 3 + .../refinedstorage/models/item/upgrade.json | 6 + .../models/item/wireless_grid.json | 17 + .../models/item/wireless_grid/active.json | 6 + .../models/item/wireless_grid/inactive.json | 6 + .../refinedstorage/models/item/wrench.json | 6 + .../assets/refinedstorage/sounds.json | 8 + .../assets/refinedstorage}/sounds/wrench.ogg | Bin .../refinedstorage}/textures/block/bottom.png | Bin .../textures/block/cable/black.png | Bin .../textures/block/cable/blue.png | Bin .../textures/block/cable/brown.png | Bin .../textures/block/cable/cyan.png | Bin .../textures/block/cable/gray.png | Bin .../textures/block/cable/green.png | Bin .../textures/block/cable/light_blue.png | Bin .../textures/block/cable/light_gray.png | Bin .../textures/block/cable/lime.png | Bin .../textures/block/cable/magenta.png | Bin .../textures/block/cable/orange.png | Bin .../textures/block/cable/part_border.png | Bin .../textures/block/cable/pink.png | Bin .../textures/block/cable/purple.png | Bin .../textures/block/cable/red.png | Bin .../textures/block/cable/white.png | Bin .../textures/block/cable/yellow.png | Bin .../block/constructor/cutouts/active.png | Bin .../constructor/cutouts/active.png.mcmeta | 0 .../block/constructor/cutouts/inactive.png | Bin .../textures/block/constructor/front.png | Bin .../block/controller/cutouts/black.png | Bin .../block/controller/cutouts/black.png.mcmeta | 0 .../block/controller/cutouts/blue.png | Bin .../block/controller/cutouts/blue.png.mcmeta | 0 .../block/controller/cutouts/brown.png | Bin .../block/controller/cutouts/brown.png.mcmeta | 0 .../block/controller/cutouts/cyan.png | Bin .../block/controller/cutouts/cyan.png.mcmeta | 0 .../block/controller/cutouts/gray.png | Bin .../block/controller/cutouts/gray.png.mcmeta | 0 .../block/controller/cutouts/green.png | Bin .../block/controller/cutouts/green.png.mcmeta | 0 .../block/controller/cutouts/light_blue.png | Bin .../controller/cutouts/light_blue.png.mcmeta | 0 .../block/controller/cutouts/light_gray.png | Bin .../controller/cutouts/light_gray.png.mcmeta | 0 .../block/controller/cutouts/lime.png | Bin .../block/controller/cutouts/lime.png.mcmeta | 0 .../block/controller/cutouts/magenta.png | Bin .../controller/cutouts/magenta.png.mcmeta | 0 .../block/controller/cutouts/nearly_off.png | Bin .../controller/cutouts/nearly_off.png.mcmeta | 0 .../controller/cutouts/nearly_off_gray.png | Bin .../cutouts/nearly_off_gray.png.mcmeta | 0 .../block/controller/cutouts/nearly_on.png | Bin .../controller/cutouts/nearly_on.png.mcmeta | 0 .../controller/cutouts/nearly_on_gray.png | Bin .../cutouts/nearly_on_gray.png.mcmeta | 0 .../textures/block/controller/cutouts/off.png | Bin .../block/controller/cutouts/on.png.mcmeta | 0 .../block/controller/cutouts/orange.png | Bin .../controller/cutouts/orange.png.mcmeta | 0 .../block/controller/cutouts/pink.png | Bin .../block/controller/cutouts/pink.png.mcmeta | 0 .../block/controller/cutouts/purple.png | Bin .../controller/cutouts/purple.png.mcmeta | 0 .../textures/block/controller/cutouts/red.png | Bin .../block/controller/cutouts/red.png.mcmeta | 0 .../block/controller/cutouts/white.png | Bin .../block/controller/cutouts/white.png.mcmeta | 0 .../block/controller/cutouts/yellow.png | Bin .../controller/cutouts/yellow.png.mcmeta | 0 .../textures/block/controller/off.png | Bin .../textures/block/controller/on.png | Bin .../textures/block/crafting_grid/back.png | Bin .../block/crafting_grid/cutouts/black.png | Bin .../block/crafting_grid/cutouts/blue.png | Bin .../block/crafting_grid/cutouts/brown.png | Bin .../block/crafting_grid/cutouts/cyan.png | Bin .../block/crafting_grid/cutouts/gray.png | Bin .../block/crafting_grid/cutouts/green.png | Bin .../block/crafting_grid/cutouts/inactive.png | Bin .../crafting_grid/cutouts/light_blue.png | Bin .../crafting_grid/cutouts/light_gray.png | Bin .../block/crafting_grid/cutouts/lime.png | Bin .../block/crafting_grid/cutouts/magenta.png | Bin .../block/crafting_grid/cutouts/orange.png | Bin .../block/crafting_grid/cutouts/pink.png | Bin .../block/crafting_grid/cutouts/purple.png | Bin .../block/crafting_grid/cutouts/red.png | Bin .../block/crafting_grid/cutouts/white.png | Bin .../block/crafting_grid/cutouts/yellow.png | Bin .../textures/block/crafting_grid/front.png | Bin .../textures/block/crafting_grid/left.png | Bin .../textures/block/crafting_grid/right.png | Bin .../textures/block/crafting_grid/top.png | Bin .../block/destructor/cutouts/active.png | Bin .../destructor/cutouts/active.png.mcmeta | 0 .../block/destructor/cutouts/inactive.png | Bin .../textures/block/destructor/front.png | Bin .../textures/block/detector/bottom.png | Bin .../textures/block/detector/cutouts/black.png | Bin .../textures/block/detector/cutouts/blue.png | Bin .../textures/block/detector/cutouts/brown.png | Bin .../textures/block/detector/cutouts/cyan.png | Bin .../textures/block/detector/cutouts/gray.png | Bin .../textures/block/detector/cutouts/green.png | Bin .../block/detector/cutouts/light_blue.png | Bin .../block/detector/cutouts/light_gray.png | Bin .../textures/block/detector/cutouts/lime.png | Bin .../block/detector/cutouts/magenta.png | Bin .../block/detector/cutouts/orange.png | Bin .../textures/block/detector/cutouts/pink.png | Bin .../block/detector/cutouts/purple.png | Bin .../textures/block/detector/cutouts/red.png | Bin .../block/detector/cutouts/unpowered.png | Bin .../textures/block/detector/cutouts/white.png | Bin .../block/detector/cutouts/yellow.png | Bin .../textures/block/detector/side.png | Bin .../textures/block/detector/top.png | Bin .../textures/block/disk/disk.png | Bin .../textures/block/disk/fluid_disk.png | Bin .../textures/block/disk/leds.png | Bin .../textures/block/disk_drive/bottom.png | Bin .../textures/block/disk_drive/front.png | Bin .../textures/block/disk_drive/side.png | Bin .../textures/block/disk_drive/top.png | Bin .../textures/block/disk_interface/back.png | Bin .../block/disk_interface/cutouts/black.png | Bin .../block/disk_interface/cutouts/blue.png | Bin .../block/disk_interface/cutouts/brown.png | Bin .../block/disk_interface/cutouts/cyan.png | Bin .../block/disk_interface/cutouts/gray.png | Bin .../block/disk_interface/cutouts/green.png | Bin .../block/disk_interface/cutouts/inactive.png | Bin .../disk_interface/cutouts/light_blue.png | Bin .../disk_interface/cutouts/light_gray.png | Bin .../block/disk_interface/cutouts/lime.png | Bin .../block/disk_interface/cutouts/magenta.png | Bin .../block/disk_interface/cutouts/orange.png | Bin .../block/disk_interface/cutouts/pink.png | Bin .../block/disk_interface/cutouts/purple.png | Bin .../block/disk_interface/cutouts/red.png | Bin .../block/disk_interface/cutouts/white.png | Bin .../block/disk_interface/cutouts/yellow.png | Bin .../textures/block/disk_interface/front.png | Bin .../textures/block/disk_interface/left.png | Bin .../textures/block/disk_interface/right.png | Bin .../textures/block/disk_interface/top.png | Bin .../1024b_fluid_storage_block.png | Bin .../256b_fluid_storage_block.png | Bin .../4096b_fluid_storage_block.png | Bin .../64b_fluid_storage_block.png | Bin .../creative_fluid_storage_block.png | Bin .../textures/block/grid/back.png | Bin .../textures/block/grid/cutouts/black.png | Bin .../textures/block/grid/cutouts/blue.png | Bin .../textures/block/grid/cutouts/brown.png | Bin .../textures/block/grid/cutouts/cyan.png | Bin .../textures/block/grid/cutouts/gray.png | Bin .../textures/block/grid/cutouts/green.png | Bin .../textures/block/grid/cutouts/inactive.png | Bin .../block/grid/cutouts/light_blue.png | Bin .../block/grid/cutouts/light_gray.png | Bin .../textures/block/grid/cutouts/lime.png | Bin .../textures/block/grid/cutouts/magenta.png | Bin .../textures/block/grid/cutouts/orange.png | Bin .../textures/block/grid/cutouts/pink.png | Bin .../textures/block/grid/cutouts/purple.png | Bin .../textures/block/grid/cutouts/red.png | Bin .../textures/block/grid/cutouts/white.png | Bin .../textures/block/grid/cutouts/yellow.png | Bin .../textures/block/grid/front.png | Bin .../textures/block/grid/left.png | Bin .../textures/block/grid/right.png | Bin .../textures/block/grid/top.png | Bin .../textures/block/interface/active.png | Bin .../textures/block/interface/inactive.png | Bin .../textures/block/machine_casing.png | Bin .../textures/block/network_receiver/base.png | Bin .../block/network_receiver/cutouts/black.png | Bin .../block/network_receiver/cutouts/blue.png | Bin .../block/network_receiver/cutouts/brown.png | Bin .../block/network_receiver/cutouts/cyan.png | Bin .../block/network_receiver/cutouts/gray.png | Bin .../block/network_receiver/cutouts/green.png | Bin .../network_receiver/cutouts/inactive.png | Bin .../network_receiver/cutouts/light_blue.png | Bin .../network_receiver/cutouts/light_gray.png | Bin .../block/network_receiver/cutouts/lime.png | Bin .../network_receiver/cutouts/magenta.png | Bin .../block/network_receiver/cutouts/orange.png | Bin .../block/network_receiver/cutouts/pink.png | Bin .../block/network_receiver/cutouts/purple.png | Bin .../block/network_receiver/cutouts/red.png | Bin .../block/network_receiver/cutouts/white.png | Bin .../block/network_receiver/cutouts/yellow.png | Bin .../block/network_transmitter/base.png | Bin .../network_transmitter/cutouts/black.png | Bin .../network_transmitter/cutouts/blue.png | Bin .../network_transmitter/cutouts/brown.png | Bin .../network_transmitter/cutouts/cyan.png | Bin .../network_transmitter/cutouts/error.png | Bin .../network_transmitter/cutouts/gray.png | Bin .../network_transmitter/cutouts/green.png | Bin .../network_transmitter/cutouts/inactive.png | Bin .../cutouts/light_blue.png | Bin .../cutouts/light_gray.png | Bin .../network_transmitter/cutouts/lime.png | Bin .../network_transmitter/cutouts/magenta.png | Bin .../network_transmitter/cutouts/orange.png | Bin .../network_transmitter/cutouts/pink.png | Bin .../network_transmitter/cutouts/purple.png | Bin .../block/network_transmitter/cutouts/red.png | Bin .../network_transmitter/cutouts/white.png | Bin .../network_transmitter/cutouts/yellow.png | Bin .../block/portable_grid/portable_grid_1.png | Bin .../block/portable_grid/portable_grid_2.png | Bin .../portable_grid_2_inactive.png | Bin .../block/portable_grid/portable_grid_3.png | Bin .../block/portable_grid/portable_grid_4.png | Bin .../block/portable_grid/portable_grid_5.png | Bin .../block/portable_grid/portable_grid_6.png | Bin .../block/portable_grid/portable_grid_7.png | Bin .../block/portable_grid/portable_grid_8.png | Bin .../block/quartz_enriched_copper_block.png | Bin .../block/quartz_enriched_iron_block.png | Bin .../textures/block/relay/cutouts/in/black.png | Bin .../textures/block/relay/cutouts/in/blue.png | Bin .../textures/block/relay/cutouts/in/brown.png | Bin .../textures/block/relay/cutouts/in/cyan.png | Bin .../textures/block/relay/cutouts/in/gray.png | Bin .../textures/block/relay/cutouts/in/green.png | Bin .../block/relay/cutouts/in/inactive.png | Bin .../block/relay/cutouts/in/light_blue.png | Bin .../block/relay/cutouts/in/light_gray.png | Bin .../textures/block/relay/cutouts/in/lime.png | Bin .../block/relay/cutouts/in/magenta.png | Bin .../block/relay/cutouts/in/orange.png | Bin .../textures/block/relay/cutouts/in/pink.png | Bin .../block/relay/cutouts/in/purple.png | Bin .../textures/block/relay/cutouts/in/red.png | Bin .../textures/block/relay/cutouts/in/white.png | Bin .../block/relay/cutouts/in/yellow.png | Bin .../textures/block/relay/in.png | Bin .../textures/block/relay/out.png | Bin .../textures/block/security_manager/back.png | Bin .../security_manager/cutouts/back/black.png | Bin .../security_manager/cutouts/back/blue.png | Bin .../security_manager/cutouts/back/brown.png | Bin .../security_manager/cutouts/back/cyan.png | Bin .../security_manager/cutouts/back/gray.png | Bin .../security_manager/cutouts/back/green.png | Bin .../cutouts/back/inactive.png | Bin .../cutouts/back/light_blue.png | Bin .../cutouts/back/light_gray.png | Bin .../security_manager/cutouts/back/lime.png | Bin .../security_manager/cutouts/back/magenta.png | Bin .../security_manager/cutouts/back/orange.png | Bin .../security_manager/cutouts/back/pink.png | Bin .../security_manager/cutouts/back/purple.png | Bin .../security_manager/cutouts/back/red.png | Bin .../security_manager/cutouts/back/white.png | Bin .../security_manager/cutouts/back/yellow.png | Bin .../security_manager/cutouts/front/black.png | Bin .../security_manager/cutouts/front/blue.png | Bin .../security_manager/cutouts/front/brown.png | Bin .../security_manager/cutouts/front/cyan.png | Bin .../security_manager/cutouts/front/gray.png | Bin .../security_manager/cutouts/front/green.png | Bin .../cutouts/front/inactive.png | Bin .../cutouts/front/light_blue.png | Bin .../cutouts/front/light_gray.png | Bin .../security_manager/cutouts/front/lime.png | Bin .../cutouts/front/magenta.png | Bin .../security_manager/cutouts/front/orange.png | Bin .../security_manager/cutouts/front/pink.png | Bin .../security_manager/cutouts/front/purple.png | Bin .../security_manager/cutouts/front/red.png | Bin .../security_manager/cutouts/front/white.png | Bin .../security_manager/cutouts/front/yellow.png | Bin .../security_manager/cutouts/left/black.png | Bin .../security_manager/cutouts/left/blue.png | Bin .../security_manager/cutouts/left/brown.png | Bin .../security_manager/cutouts/left/cyan.png | Bin .../security_manager/cutouts/left/gray.png | Bin .../security_manager/cutouts/left/green.png | Bin .../cutouts/left/inactive.png | Bin .../cutouts/left/light_blue.png | Bin .../cutouts/left/light_gray.png | Bin .../security_manager/cutouts/left/lime.png | Bin .../security_manager/cutouts/left/magenta.png | Bin .../security_manager/cutouts/left/orange.png | Bin .../security_manager/cutouts/left/pink.png | Bin .../security_manager/cutouts/left/purple.png | Bin .../security_manager/cutouts/left/red.png | Bin .../security_manager/cutouts/left/white.png | Bin .../security_manager/cutouts/left/yellow.png | Bin .../security_manager/cutouts/right/black.png | Bin .../security_manager/cutouts/right/blue.png | Bin .../security_manager/cutouts/right/brown.png | Bin .../security_manager/cutouts/right/cyan.png | Bin .../security_manager/cutouts/right/gray.png | Bin .../security_manager/cutouts/right/green.png | Bin .../cutouts/right/inactive.png | Bin .../cutouts/right/light_blue.png | Bin .../cutouts/right/light_gray.png | Bin .../security_manager/cutouts/right/lime.png | Bin .../cutouts/right/magenta.png | Bin .../security_manager/cutouts/right/orange.png | Bin .../security_manager/cutouts/right/pink.png | Bin .../security_manager/cutouts/right/purple.png | Bin .../security_manager/cutouts/right/red.png | Bin .../security_manager/cutouts/right/white.png | Bin .../security_manager/cutouts/right/yellow.png | Bin .../security_manager/cutouts/top/black.png | Bin .../security_manager/cutouts/top/blue.png | Bin .../security_manager/cutouts/top/brown.png | Bin .../security_manager/cutouts/top/cyan.png | Bin .../security_manager/cutouts/top/gray.png | Bin .../security_manager/cutouts/top/green.png | Bin .../security_manager/cutouts/top/inactive.png | Bin .../cutouts/top/light_blue.png | Bin .../cutouts/top/light_gray.png | Bin .../security_manager/cutouts/top/lime.png | Bin .../security_manager/cutouts/top/magenta.png | Bin .../security_manager/cutouts/top/orange.png | Bin .../security_manager/cutouts/top/pink.png | Bin .../security_manager/cutouts/top/purple.png | Bin .../security_manager/cutouts/top/red.png | Bin .../security_manager/cutouts/top/white.png | Bin .../security_manager/cutouts/top/yellow.png | Bin .../textures/block/security_manager/front.png | Bin .../textures/block/security_manager/left.png | Bin .../textures/block/security_manager/right.png | Bin .../textures/block/security_manager/top.png | Bin .../refinedstorage}/textures/block/side.png | Bin .../block/storage_block/16k_storage_block.png | Bin .../block/storage_block/1k_storage_block.png | Bin .../block/storage_block/4k_storage_block.png | Bin .../block/storage_block/64k_storage_block.png | Bin .../storage_block/creative_storage_block.png | Bin .../textures/block/storage_monitor/back.png | Bin .../textures/block/storage_monitor/front.png | Bin .../textures/block/storage_monitor/left.png | Bin .../textures/block/storage_monitor/right.png | Bin .../textures/block/storage_monitor/top.png | Bin .../block/wireless_transmitter/base.png | Bin .../wireless_transmitter/cutouts/black.png | Bin .../wireless_transmitter/cutouts/blue.png | Bin .../wireless_transmitter/cutouts/brown.png | Bin .../wireless_transmitter/cutouts/cyan.png | Bin .../wireless_transmitter/cutouts/gray.png | Bin .../wireless_transmitter/cutouts/green.png | Bin .../wireless_transmitter/cutouts/inactive.png | Bin .../cutouts/light_blue.png | Bin .../cutouts/light_gray.png | Bin .../wireless_transmitter/cutouts/lime.png | Bin .../wireless_transmitter/cutouts/magenta.png | Bin .../wireless_transmitter/cutouts/orange.png | Bin .../wireless_transmitter/cutouts/pink.png | Bin .../wireless_transmitter/cutouts/purple.png | Bin .../wireless_transmitter/cutouts/red.png | Bin .../wireless_transmitter/cutouts/white.png | Bin .../wireless_transmitter/cutouts/yellow.png | Bin .../textures/gui/advancements.png | Bin .../textures/gui/amount_with_inventory.png | Bin .../refinedstorage}/textures/gui/book.png | Bin .../textures/gui/controller.png | Bin .../refinedstorage}/textures/gui/crafting.png | Bin .../textures/gui/crafting_grid.png | Bin .../textures/gui/disk_drive.png | Bin .../textures/gui/disk_interface.png | Bin .../textures/gui/generic_filter.png | Bin .../refinedstorage}/textures/gui/grid.png | Bin .../textures/gui/interface.png | Bin .../textures/gui/network_transmitter.png | Bin .../textures/gui/portable_grid.png | Bin .../refinedstorage}/textures/gui/priority.png | Bin .../textures/gui/resource_amount.png | Bin .../textures/gui/security_card.png | Bin .../textures/gui/security_manager.png | Bin .../textures/gui/sprites/widget/move_down.png | Bin .../gui/sprites/widget/move_down_disabled.png | Bin .../gui/sprites/widget/move_down_focused.png | Bin .../textures/gui/sprites/widget/move_up.png | Bin .../gui/sprites/widget/move_up_disabled.png | Bin .../gui/sprites/widget/move_up_focused.png | Bin .../refinedstorage}/textures/gui/storage.png | Bin .../textures/gui/storage_monitor.png | Bin .../refinedstorage}/textures/gui/widgets.png | Bin .../textures/gui/wireless_transmitter.png | Bin .../assets/refinedstorage}/textures/icons.png | Bin .../item/1024b_fluid_storage_disk.png | Bin .../item/1024b_fluid_storage_part.png | Bin .../textures/item/16k_storage_disk.png | Bin .../textures/item/16k_storage_part.png | Bin .../textures/item/1k_storage_disk.png | Bin .../textures/item/1k_storage_part.png | Bin .../textures/item/256b_fluid_storage_disk.png | Bin .../textures/item/256b_fluid_storage_part.png | Bin .../item/4096b_fluid_storage_disk.png | Bin .../item/4096b_fluid_storage_part.png | Bin .../textures/item/4k_storage_disk.png | Bin .../textures/item/4k_storage_part.png | Bin .../textures/item/64b_fluid_storage_disk.png | Bin .../textures/item/64b_fluid_storage_part.png | Bin .../textures/item/64k_storage_disk.png | Bin .../textures/item/64k_storage_part.png | Bin .../textures/item/advanced_processor.png | Bin .../textures/item/basic_processor.png | Bin .../refinedstorage}/textures/item/book.png | Bin .../item/configuration_card/active.png | Bin .../item/configuration_card/inactive.png | Bin .../textures/item/construction_core.png | Bin .../item/creative_fluid_storage_disk.png | Bin .../textures/item/creative_range_upgrade.png | Bin .../textures/item/creative_storage_disk.png | Bin .../textures/item/destruction_core.png | Bin .../textures/item/fortune_upgrade.png | Bin .../textures/item/improved_processor.png | Bin .../textures/item/network_card/active.png | Bin .../textures/item/network_card/inactive.png | Bin .../textures/item/processor_binding.png | Bin .../textures/item/quartz_enriched_copper.png | Bin .../textures/item/quartz_enriched_iron.png | Bin .../textures/item/range_upgrade.png | Bin .../textures/item/raw_advanced_processor.png | Bin .../textures/item/raw_basic_processor.png | Bin .../textures/item/raw_improved_processor.png | Bin .../textures/item/regulator_upgrade.png | Bin .../textures/item/security_card/active.png | Bin .../textures/item/security_card/fallback.png | Bin .../textures/item/security_card/inactive.png | Bin .../refinedstorage}/textures/item/silicon.png | Bin .../textures/item/silk_touch_upgrade.png | Bin .../textures/item/speed_upgrade.png | Bin .../textures/item/stack_upgrade.png | Bin .../textures/item/storage_housing.png | Bin .../refinedstorage}/textures/item/upgrade.png | Bin .../textures/item/wireless_grid/active.png | Bin .../textures/item/wireless_grid/inactive.png | Bin .../refinedstorage}/textures/item/wrench.png | Bin .../data/c/tags/item/tools/wrench.json | 6 + .../advancement/better_than_a_barrel.json | 26 + .../advancement/conditional_connecting.json | 26 + .../advancement/connecting.json | 26 + .../advancement/construction.json | 26 + .../advancement/destruction.json | 26 + .../refinedstorage/advancement/detecting.json | 26 + .../refinedstorage/advancement/drives.json | 26 + .../refinedstorage/advancement/exporting.json | 26 + .../refinedstorage/advancement/importing.json | 26 + .../advancement/interface_to_the_world.json | 26 + .../advancement/interfacing_with_disks.json | 26 + .../advancement/no_cables_required.json | 34 + .../advancement/portable_storage.json | 26 + .../data/refinedstorage/advancement/root.json | 26 + .../refinedstorage/advancement/security.json | 32 + .../advancement/storing_externally.json | 26 + .../advancement/storing_fluids.json | 26 + .../advancement/storing_items.json | 26 + .../refinedstorage/advancement/upgrading.json | 26 + .../advancement/upgrading_your_grid.json | 26 + .../advancement/viewing_your_storage.json | 26 + .../refinedstorage/advancement/wireless.json | 31 + .../blocks/1024b_fluid_storage_block.json | 19 + .../loot_table/blocks/16k_storage_block.json | 19 + .../loot_table/blocks/1k_storage_block.json | 19 + .../blocks/256b_fluid_storage_block.json | 19 + .../blocks/4096b_fluid_storage_block.json | 19 + .../loot_table/blocks/4k_storage_block.json | 19 + .../blocks/64b_fluid_storage_block.json | 19 + .../loot_table/blocks/64k_storage_block.json | 19 + .../blocks/creative_fluid_storage_block.json | 19 + .../blocks/creative_portable_grid.json | 19 + .../blocks/creative_storage_block.json | 19 + .../loot_table/blocks/disk_drive.json | 19 + .../loot_table/blocks/exporter.json | 19 + .../loot_table/blocks/external_storage.json | 19 + .../loot_table/blocks/importer.json | 19 + .../loot_table/blocks/interface.json | 19 + .../loot_table/blocks/machine_casing.json | 19 + .../loot_table/blocks/portable_grid.json | 19 + .../blocks/quartz_enriched_iron_block.json | 19 + .../loot_table/blocks/storage_monitor.json | 19 + .../recipe/1024b_fluid_storage_block.json | 25 + .../recipe/1024b_fluid_storage_disk.json | 25 + ...uid_storage_disk_from_storage_housing.json | 14 + .../recipe/1024b_fluid_storage_part.json | 25 + .../recipe/16k_storage_block.json | 25 + .../recipe/16k_storage_disk.json | 25 + ...16k_storage_disk_from_storage_housing.json | 14 + .../recipe/16k_storage_part.json | 25 + .../recipe/1k_storage_block.json | 25 + .../recipe/1k_storage_disk.json | 25 + .../1k_storage_disk_from_storage_housing.json | 14 + .../recipe/1k_storage_part.json | 25 + .../recipe/256b_fluid_storage_block.json | 25 + .../recipe/256b_fluid_storage_disk.json | 25 + ...uid_storage_disk_from_storage_housing.json | 14 + .../recipe/256b_fluid_storage_part.json | 25 + .../recipe/4096b_fluid_storage_block.json | 25 + .../recipe/4096b_fluid_storage_disk.json | 25 + ...uid_storage_disk_from_storage_housing.json | 14 + .../recipe/4096b_fluid_storage_part.json | 25 + .../recipe/4k_storage_block.json | 25 + .../recipe/4k_storage_disk.json | 25 + .../4k_storage_disk_from_storage_housing.json | 14 + .../recipe/4k_storage_part.json | 25 + .../recipe/64b_fluid_storage_block.json | 25 + .../recipe/64b_fluid_storage_disk.json | 25 + ...uid_storage_disk_from_storage_housing.json | 14 + .../recipe/64b_fluid_storage_part.json | 25 + .../recipe/64k_storage_block.json | 25 + .../recipe/64k_storage_disk.json | 25 + ...64k_storage_disk_from_storage_housing.json | 14 + .../recipe/64k_storage_part.json | 25 + .../recipe/advanced_processor.json | 10 + .../recipe/basic_processor.json | 10 + .../data/refinedstorage/recipe/cable.json | 23 + .../recipe/configuration_card.json | 22 + .../recipe/construction_core.json | 14 + .../refinedstorage/recipe/constructor.json | 28 + .../refinedstorage/recipe/controller.json | 25 + .../refinedstorage/recipe/crafting_grid.json | 17 + .../recipe/destruction_core.json | 14 + .../refinedstorage/recipe/destructor.json | 28 + .../data/refinedstorage/recipe/detector.json | 28 + .../refinedstorage/recipe/disk_drive.json | 25 + .../refinedstorage/recipe/disk_interface.json | 28 + .../data/refinedstorage/recipe/exporter.json | 17 + .../recipe/external_storage.json | 31 + .../recipe/fallback_security_card.json | 14 + .../recipe/fortune_1_upgrade.json | 8 + .../recipe/fortune_2_upgrade.json | 8 + .../recipe/fortune_3_upgrade.json | 8 + .../data/refinedstorage/recipe/grid.json | 31 + .../data/refinedstorage/recipe/importer.json | 17 + .../recipe/improved_processor.json | 10 + .../data/refinedstorage/recipe/interface.json | 28 + .../refinedstorage/recipe/machine_casing.json | 19 + .../refinedstorage/recipe/network_card.json | 22 + .../recipe/network_receiver.json | 31 + .../recipe/network_transmitter.json | 31 + .../refinedstorage/recipe/portable_grid.json | 22 + .../recipe/processor_binding.json | 20 + .../recipe/quartz_enriched_copper.json | 19 + .../recipe/quartz_enriched_copper_block.json | 16 + .../quartz_enriched_copper_from_block.json | 12 + .../recipe/quartz_enriched_iron.json | 19 + .../recipe/quartz_enriched_iron_block.json | 16 + .../quartz_enriched_iron_from_block.json | 12 + .../refinedstorage/recipe/range_upgrade.json | 22 + .../recipe/raw_advanced_processor.json | 20 + .../recipe/raw_basic_processor.json | 20 + .../recipe/raw_improved_processor.json | 20 + .../recipe/regulator_upgrade.json | 25 + .../data/refinedstorage/recipe/relay.json | 20 + .../refinedstorage/recipe/security_card.json | 22 + .../recipe/security_manager.json | 28 + .../data/refinedstorage/recipe/silicon.json | 10 + .../recipe/silk_touch_upgrade.json | 7 + .../refinedstorage/recipe/speed_upgrade.json | 22 + .../refinedstorage/recipe/stack_upgrade.json | 19 + .../recipe/storage_housing.json | 22 + .../recipe/storage_monitor.json | 31 + .../data/refinedstorage/recipe/upgrade.json | 22 + .../refinedstorage/recipe/wireless_grid.json | 25 + .../recipe/wireless_transmitter.json | 25 + .../data/refinedstorage/recipe/wrench.json | 19 + .../platform/common/SetupMinecraft.java | 2 +- .../platform/common/TestPlatform.java | 22 +- .../common/grid/GridSortingTypesTest.java | 24 +- .../common/grid/screen/LastModifiedTest.java | 2 +- .../storage/ClientStorageRepositoryTest.java | 4 +- .../storage/LimitedPlatformStorageTest.java | 29 + .../registry/PlatformRegistryImplTest.java | 4 +- .../resource/FluidResourceRenderingTest.java | 6 +- .../list/FuzzyResourceListImplTest.java | 12 +- .../common/support/widget/HistoryTest.java | 2 +- .../.gitignore | 0 refinedstorage-platform-fabric/build.gradle | 31 + .../fabric/ClientModInitializerImpl.java | 88 +- .../platform/fabric/ConfigImpl.java | 695 ++++++++++ .../platform/fabric/ModInitializerImpl.java | 1224 ++++++++--------- .../platform/fabric/PlatformImpl.java | 369 +++++ ...torageExporterTransferStrategyFactory.java | 63 + .../fabric/exporter/package-info.java | 7 + .../strategy/FluidGridExtractionStrategy.java | 149 ++ .../strategy/FluidGridInsertionStrategy.java | 112 ++ .../strategy/ItemGridExtractionStrategy.java | 62 + .../strategy/ItemGridInsertionStrategy.java | 86 ++ .../strategy/ItemGridScrollingStrategy.java | 86 ++ .../fabric/grid/strategy/package-info.java | 7 + .../view/FabricFluidGridResourceFactory.java | 8 +- .../view/FabricItemGridResourceFactory.java | 4 +- .../fabric/grid/view/package-info.java | 7 + .../importer/FabricStorageImporterSource.java | 16 +- ...torageImporterTransferStrategyFactory.java | 56 + .../fabric/importer/package-info.java | 7 + .../mixin/AbstractModelBakerImplMixin.java | 6 +- .../fabric/mixin/EditBoxAccessor.java | 2 +- .../fabric/mixin/ItemPropertiesAccessor.java | 2 +- .../fabric/mixin/KeyMappingAccessor.java | 2 +- .../fabric/mixin/ModelBakeryAccessor.java | 2 +- .../platform/fabric/mixin/package-info.java | 7 + .../fabric/modmenu/ModMenuApiImpl.java | 4 +- .../platform/fabric/modmenu/package-info.java | 7 + .../platform/fabric/package-info.java | 7 + ...NetworkNodeBreakSecurityEventListener.java | 8 +- .../fabric/security/package-info.java | 7 + .../AbstractDiskContainerBakedModel.java | 10 +- .../FabricStorageExtractableStorage.java | 12 +- .../FabricStorageInsertableStorage.java | 12 +- .../fabric/storage/FabricStorageUtil.java | 2 +- .../diskdrive/DiskDriveBakedModel.java | 74 + .../DiskDriveBlockEntityRendererImpl.java | 24 + .../diskdrive/DiskDriveUnbakedModel.java | 8 +- .../diskdrive/FabricDiskDriveBlockEntity.java | 20 + .../storage/diskdrive/package-info.java | 7 + .../DiskInterfaceBakedModel.java | 92 ++ .../DiskInterfaceBlockEntityRendererImpl.java | 24 + .../DiskInterfaceUnbakedModel.java | 8 +- .../FabricDiskInterfaceBlockEntity.java | 20 + .../storage/diskinterface/package-info.java | 7 + .../FabricStorageExternalStorageProvider.java | 18 +- ...latformExternalStorageProviderFactory.java | 86 +- .../storage/externalstorage/package-info.java | 7 + .../platform/fabric/storage/package-info.java | 7 + .../fabric/storage/portablegrid/DiskLeds.java | 4 +- .../FabricPortableGridBlockEntity.java | 21 + .../portablegrid/PortableGridBakedModel.java | 125 ++ .../PortableGridBlockEntityRendererImpl.java | 27 + .../PortableGridUnbakedModel.java | 8 +- .../storage/portablegrid/package-info.java | 7 + .../ContainerTransferDestination.java | 29 + .../support/containermenu/MenuOpenerImpl.java | 45 + .../support/containermenu/package-info.java | 7 + .../support/energy/EnergyStorageAdapter.java | 58 + .../fabric/support/energy/package-info.java | 7 + .../support/render/EmissiveBakedModel.java | 2 +- .../support/render/EmissiveModelRegistry.java | 2 +- .../support/render/EmissiveTransform.java | 2 +- .../render/FluidVariantFluidRenderer.java | 8 +- .../fabric/support/render/QuadRotator.java | 4 +- .../fabric/support/render/QuadRotators.java | 20 + .../fabric/support/render/QuadTranslator.java | 2 +- .../fabric/support/render/RenderTypes.java | 24 + .../fabric/support/render/package-info.java | 7 + .../ResourceContainerFluidStorageAdapter.java | 18 +- .../fabric/support/resource/VariantUtil.java | 28 + .../fabric/support/resource/package-info.java | 7 + .../fabric/util/SimpleSingleStackStorage.java | 2 +- .../platform/fabric/util/package-info.java | 7 + .../src/main/resources/fabric.mod.json | 51 + .../resources/refinedstorage.accesswidener | 0 .../main/resources/refinedstorage.mixins.json | 16 + .../.gitignore | 0 refinedstorage-platform-neoforge/build.gradle | 10 + .../neoforge/ClientModInitializer.java | 230 ++++ .../platform/neoforge/ConfigImpl.java | 873 ++++++++++++ .../platform/neoforge}/ModInitializer.java | 154 +-- .../platform/neoforge/PlatformImpl.java | 325 +++++ .../datagen/BlockModelProviderImpl.java | 10 +- .../datagen/BlockStateProviderImpl.java | 36 +- .../neoforge}/datagen/DataGenerators.java | 12 +- .../datagen/ItemModelProviderImpl.java | 30 +- .../datagen/loot/BlockDropProvider.java | 6 +- .../datagen/loot/LootTableProviderImpl.java | 2 +- .../neoforge/datagen/loot/package-info.java | 7 + .../neoforge/datagen/package-info.java | 7 + .../recipe/RecoloringRecipeProvider.java | 8 +- .../neoforge/datagen/recipe/package-info.java | 7 + .../datagen/tag/BlockTagsProvider.java | 4 +- .../datagen/tag/ItemTagsProviderImpl.java | 137 ++ .../neoforge/datagen/tag/package-info.java | 7 + ...andlerExporterTransferStrategyFactory.java | 39 + ...andlerExporterTransferStrategyFactory.java | 33 + .../neoforge/exporter/package-info.java | 7 + .../grid/strategy/CursorItemHandler.java | 2 +- .../strategy/FluidGridExtractionStrategy.java | 153 +++ .../strategy/FluidGridInsertionStrategy.java | 75 + .../strategy/ItemGridExtractionStrategy.java | 47 + .../strategy/ItemGridInsertionStrategy.java | 76 + .../strategy/ItemGridScrollingStrategy.java | 77 ++ .../neoforge/grid/strategy/package-info.java | 7 + .../view/ForgeFluidGridResourceFactory.java | 30 + .../view/ForgeItemGridResourceFactory.java | 4 +- .../neoforge/grid/view/package-info.java | 7 + .../importer/FluidHandlerImporterSource.java | 42 + ...andlerImporterTransferStrategyFactory.java | 34 + .../importer/ItemHandlerImporterSource.java | 42 + ...andlerImporterTransferStrategyFactory.java | 31 + .../neoforge/importer/package-info.java | 7 + .../platform/neoforge/package-info.java | 7 + .../neoforge}/storage/CapabilityCache.java | 10 +- .../storage/CapabilityCacheImpl.java | 2 +- .../storage/DiskContainerItemOverrides.java | 10 +- .../FluidHandlerExtractableStorage.java | 43 + .../FluidHandlerInsertableStorage.java | 51 + .../neoforge}/storage/ForgeHandlerUtil.java | 6 +- .../ItemHandlerExtractableStorage.java | 14 +- .../storage/ItemHandlerInsertableStorage.java | 14 +- .../diskdrive/DiskDriveBakedModel.java | 162 +++ .../DiskDriveBlockEntityRendererImpl.java | 18 + .../diskdrive/DiskDriveGeometryLoader.java | 2 +- .../diskdrive/DiskDriveUnbakedGeometry.java | 10 +- .../diskdrive/ForgeDiskDriveBlockEntity.java | 6 +- .../storage/diskdrive/package-info.java | 7 + .../DiskInterfaceBakedModel.java | 170 +++ .../DiskInterfaceBlockEntityRendererImpl.java | 18 + .../DiskInterfaceGeometryLoader.java | 2 +- .../DiskInterfaceUnbakedGeometry.java | 10 +- .../ForgeDiskInterfaceBlockEntity.java | 6 +- .../storage/diskinterface/package-info.java | 7 + .../FluidHandlerExternalStorageProvider.java | 42 + ...latformExternalStorageProviderFactory.java | 20 + .../ItemHandlerExternalStorageProvider.java | 42 + ...latformExternalStorageProviderFactory.java | 20 + .../storage/externalstorage/package-info.java | 7 + .../neoforge/storage/package-info.java | 7 + .../storage/portablegrid/DiskLedBakers.java | 20 + .../ForgePortableGridBlockEntity.java | 32 + .../portablegrid/PortableGridBakedModel.java | 140 ++ .../PortableGridBlockEntityRendererImpl.java | 21 + .../PortableGridGeometryLoader.java | 2 +- .../PortableGridUnbakedGeometry.java | 10 +- .../storage/portablegrid/package-info.java | 7 + .../ContainerTransferDestination.java | 16 + .../support/containermenu/MenuOpenerImpl.java | 26 + .../support/containermenu/package-info.java | 7 + .../support/energy/EnergyStorageAdapter.java | 48 + .../neoforge/support/energy/package-info.java | 7 + .../inventory/InsertExtractItemHandler.java | 2 +- .../support/inventory/package-info.java | 7 + .../support/render/DiskModelBaker.java | 4 +- .../render/FluidStackFluidRenderer.java | 6 +- .../support/render/ItemBakedModel.java | 2 +- .../neoforge/support/render/RenderTypes.java | 24 + .../render/RotationTranslationModelBaker.java | 2 +- .../support/render/TransformationBuilder.java | 4 +- .../neoforge/support/render/package-info.java | 7 + .../ResourceContainerFluidHandlerAdapter.java | 18 +- .../support/resource/VariantUtil.java | 49 + .../support/resource/package-info.java | 7 + .../resources/META-INF/accesstransformer.cfg | 0 .../resources/META-INF/neoforge.mods.toml | 6 +- .../src/main/resources/icon.png | Bin .../src/main/resources/pack.mcmeta | 0 .../platform/common}/GameTestUtil.java | 26 +- .../ConstructorTest.java | 20 +- .../ConstructorTestPlots.java | 10 +- .../constructordestructor/DestructorTest.java | 20 +- .../DestructorTestPlots.java | 10 +- .../common/exporter/ExporterTest.java | 20 +- .../common/exporter/ExporterTestPlots.java | 10 +- .../common/importer/ImporterTest.java | 24 +- .../common/importer/ImporterTestPlots.java | 10 +- .../refinedstorage}/structure/empty_15x15.nbt | Bin refinedstorage-query-parser/build.gradle | 21 + .../refinedstorage}/query/lexer/Lexer.java | 2 +- .../query/lexer/LexerException.java | 2 +- .../query/lexer/LexerPosition.java | 2 +- .../query/lexer/LexerTokenMapping.java | 5 + .../query/lexer/LexerTokenMappings.java | 2 +- .../refinedstorage}/query/lexer/Source.java | 2 +- .../lexer/SyntaxHighlightedCharacter.java | 2 +- .../query/lexer/SyntaxHighlighter.java | 2 +- .../query/lexer/SyntaxHighlighterColors.java | 2 +- .../refinedstorage}/query/lexer/Token.java | 2 +- .../query/lexer/TokenPosition.java | 2 +- .../query/lexer/TokenRange.java | 2 +- .../refinedstorage/query/lexer/TokenType.java | 11 + .../query/lexer/package-info.java | 7 + .../query/parser/Associativity.java | 6 + .../refinedstorage/query/parser/Operator.java | 4 + .../refinedstorage}/query/parser/Parser.java | 18 +- .../query/parser/ParserException.java | 16 + .../query/parser/ParserOperatorMappings.java | 4 +- .../query/parser/node/BinOpNode.java | 12 + .../query/parser/node/LiteralNode.java | 11 + .../query/parser/node/Node.java | 4 + .../query/parser/node/ParenNode.java | 2 +- .../query/parser/node/UnaryOpNode.java | 10 + .../query/parser/node/package-info.java | 7 + .../query/parser/package-info.java | 7 + .../src/main/resources/fabric.mod.json | 19 + .../query/lexer/LexerTest.java | 8 +- .../query/lexer/SyntaxHighlighterTest.java | 2 +- .../query/lexer/TokenAssertions.java | 2 +- .../query/parser/ParserBuilder.java | 39 + .../query/parser/ParserTest.java | 6 +- refinedstorage-resource-api/build.gradle | 21 + .../api/resource/ResourceAmount.java | 4 +- .../api/resource/ResourceKey.java | 7 + .../api/resource/filter/Filter.java | 4 +- .../api/resource/filter/FilterMode.java | 9 + .../api/resource/filter/package-info.java | 7 + .../list/AbstractProxyResourceList.java | 6 +- .../api/resource/list/ResourceList.java | 6 +- .../api/resource/list/ResourceListImpl.java | 6 +- .../listenable/ListenableResourceList.java | 8 +- .../list/listenable/ResourceListListener.java | 4 +- .../list/listenable/package-info.java | 7 + .../api/resource/list/package-info.java | 7 + .../api/resource/package-info.java | 7 + .../src/main/resources/fabric.mod.json | 19 + .../api/resource/ResourceAmountTest.java | 2 +- .../api/resource/TestResource.java | 7 + .../api/resource/filter/FilterTest.java | 8 +- .../list/AbstractResourceListTest.java | 6 +- .../resource/list/ProxyResourceListTest.java | 2 +- .../resource/list/ResourceListImplTest.java | 8 + .../ListenableResourceListTest.java | 8 +- refinedstorage-storage-api/build.gradle | 26 + .../api/storage/AbstractProxyStorage.java | 10 +- .../api/storage/AccessMode.java | 2 +- .../refinedstorage}/api/storage/Actor.java | 2 +- .../api/storage/EmptyActor.java | 2 +- .../api/storage/ExtractableStorage.java | 6 +- .../api/storage/InMemoryStorageImpl.java | 12 +- .../api/storage/InsertableStorage.java | 6 +- .../api/storage/NoopStorage.java | 33 + .../api/storage/StateTrackedStorage.java | 16 +- .../refinedstorage}/api/storage/Storage.java | 2 +- .../api/storage/StorageState.java | 2 +- .../api/storage/StorageView.java | 4 +- .../api/storage/TrackedResourceAmount.java | 12 + .../api/storage/TransferHelper.java | 6 +- .../api/storage/channel/StorageChannel.java | 67 + .../storage/channel/StorageChannelImpl.java | 95 ++ .../api/storage/channel/package-info.java | 7 + .../composite/CompositeAwareChild.java | 10 +- .../storage/composite/CompositeStorage.java | 6 +- .../composite/CompositeStorageImpl.java | 20 +- .../storage/composite/ParentComposite.java | 6 +- .../PrioritizedStorageComparator.java | 4 +- .../storage/composite/PriorityProvider.java | 17 + .../storage/composite/PriorityStorage.java | 6 +- .../api/storage/composite/package-info.java | 7 + .../api/storage/external/ExternalStorage.java | 20 +- .../external/ExternalStorageListener.java | 11 + .../external/ExternalStorageProvider.java | 14 + .../api/storage/external/package-info.java | 7 + .../api/storage/limited/LimitedStorage.java | 10 + .../storage/limited/LimitedStorageImpl.java | 55 + .../api/storage/limited/package-info.java | 7 + .../api/storage/package-info.java | 7 + .../InMemoryTrackedStorageRepository.java | 6 +- .../api/storage/tracked/TrackedResource.java | 2 +- .../api/storage/tracked/TrackedStorage.java | 24 + .../storage/tracked/TrackedStorageImpl.java | 14 +- .../tracked/TrackedStorageRepository.java | 15 + .../api/storage/tracked/package-info.java | 7 + .../src/main/resources/fabric.mod.json | 19 + .../api/storage/ActorCapturingStorage.java | 6 +- .../api/storage/FakeActors.java | 2 +- .../api/storage/InMemoryStorageImplTest.java | 6 +- .../api/storage/LimitedStorageImplTest.java | 8 +- .../api/storage/ProxyStorageTest.java | 6 +- .../api/storage/StateTrackedStorageTest.java | 10 +- .../api/storage/TestResource.java | 9 + .../api/storage/TransferHelperTest.java | 12 +- .../channel/StorageChannelImplTest.java | 28 +- .../composite/CompositeStorageImplTest.java | 32 +- .../ExtractCompositeStorageImplTest.java | 24 +- .../InsertCompositeStorageImplTest.java | 20 +- .../SubCompositeCompositeStorageImplTest.java | 18 +- .../external/ExternalStorageProviderImpl.java | 32 + .../storage/external/ExternalStorageTest.java | 22 +- .../external/ExternalTestResource.java | 11 + .../SpyingExternalStorageListener.java | 18 + .../StorageChannelExternalStorageTest.java | 24 +- .../storage/external/TransformingStorage.java | 39 + .../tracked/TrackedStorageImplTest.java | 14 +- refinedstorage2-core-api/build.gradle | 21 - .../refinedstorage2/api/core/Action.java | 9 - .../api/core/component/package-info.java | 7 - .../api/core/package-info.java | 5 - .../src/main/resources/fabric.mod.json | 19 - refinedstorage2-grid-api/build.gradle | 28 - .../grid/operations/NoopGridOperations.java | 21 - .../api/grid/operations/package-info.java | 7 - .../api/grid/query/GridQueryParser.java | 12 - .../api/grid/query/package-info.java | 7 - .../api/grid/view/package-info.java | 7 - .../api/grid/watcher/GridWatcherManager.java | 27 - .../api/grid/watcher/package-info.java | 7 - .../src/main/resources/fabric.mod.json | 19 - .../api/grid/TestResource.java | 10 - refinedstorage2-network-api/build.gradle | 16 - .../api/network/ConnectionProvider.java | 15 - .../refinedstorage2/api/network/Network.java | 21 - .../energy/EnergyNetworkComponent.java | 9 - .../api/network/energy/package-info.java | 7 - .../api/network/node/NetworkNode.java | 15 - .../api/network/node/NetworkNodeActor.java | 13 - .../network/node/container/package-info.java | 7 - .../exporter/ExporterTransferStrategy.java | 15 - .../network/node/exporter/package-info.java | 7 - .../ExternalStorageProviderFactory.java | 20 - .../node/externalstorage/package-info.java | 7 - .../importer/ImporterTransferStrategy.java | 15 - .../network/node/importer/package-info.java | 7 - .../api/network/node/package-info.java | 7 - .../api/network/node/task/Task.java | 9 - .../api/network/node/task/package-info.java | 7 - .../api/network/package-info.java | 7 - .../api/network/security/Permission.java | 7 - .../api/network/security/SecurityActor.java | 7 - .../security/SecurityNetworkComponent.java | 12 - .../api/network/security/package-info.java | 7 - .../storage/StorageNetworkComponent.java | 18 - .../api/network/storage/StorageProvider.java | 26 - .../api/network/storage/package-info.java | 7 - .../src/main/resources/fabric.mod.json | 19 - refinedstorage2-network-test/build.gradle | 25 - .../network/test/NetworkTest.java | 51 - .../network/test/NetworkTestFixtures.java | 45 - .../network/test/RegisterNetworkNode.java | 19 - .../network/test/fake/FakeActor.java | 15 - .../network/test/fake/FakePermissions.java | 7 - .../network/test/fake/FakeResources.java | 13 - .../network/test/fake/FakeSecurityActors.java | 7 - .../network/test/fake/package-info.java | 7 - .../ControllerNetworkNodeFactory.java | 14 - .../DetectorNetworkNodeFactory.java | 14 - .../ExporterNetworkNodeFactory.java | 14 - .../ExternalStorageNetworkNodeFactory.java | 20 - .../nodefactory/GridNetworkNodeFactory.java | 14 - .../ImporterNetworkNodeFactory.java | 14 - .../InterfaceNetworkNodeFactory.java | 14 - .../test/nodefactory/NetworkNodeFactory.java | 11 - .../RelayInputNetworkNodeFactory.java | 14 - .../RelayOutputNetworkNodeFactory.java | 14 - .../nodefactory/SimpleNetworkNodeFactory.java | 14 - .../StorageNetworkNodeFactory.java | 23 - .../StorageTransferNetworkNodeFactory.java | 23 - .../test/nodefactory/package-info.java | 7 - .../network/test/package-info.java | 7 - .../network/test/NetworkNodeFactoryTest.java | 53 - refinedstorage2-network/build.gradle | 28 - .../api/network/impl/NetworkFactory.java | 17 - .../api/network/impl/NetworkImpl.java | 47 - .../api/network/impl/energy/package-info.java | 7 - .../impl/node/container/package-info.java | 7 - .../controller/ControllerEnergyState.java | 8 - .../impl/node/controller/package-info.java | 7 - .../AbstractDetectorAmountStrategy.java | 11 - .../node/detector/DetectorAmountStrategy.java | 8 - .../detector/DetectorAmountStrategyImpl.java | 15 - .../impl/node/detector/DetectorMode.java | 7 - .../impl/node/detector/package-info.java | 7 - .../CompositeExporterTransferStrategy.java | 26 - .../impl/node/exporter/package-info.java | 7 - .../ExternalStorageNetworkNode.java | 76 - .../node/externalstorage/package-info.java | 7 - .../impl/node/grid/GridNetworkNode.java | 52 - .../network/impl/node/grid/package-info.java | 7 - .../InterfaceExternalStorageProvider.java | 11 - .../iface/externalstorage/package-info.java | 7 - .../network/impl/node/iface/package-info.java | 7 - .../node/importer/ImporterNetworkNode.java | 68 - .../impl/node/importer/ImporterSource.java | 24 - .../impl/node/importer/package-info.java | 7 - .../api/network/impl/node/package-info.java | 7 - .../impl/node/relay/RelayComponentType.java | 7 - .../network/impl/node/relay/package-info.java | 7 - .../impl/node/security/package-info.java | 7 - .../impl/node/storage/ExposedStorage.java | 76 - .../impl/node/storage/package-info.java | 7 - .../StorageTransferListener.java | 6 - .../storagetransfer/StorageTransferMode.java | 6 - .../node/storagetransfer/package-info.java | 7 - .../impl/node/task/DefaultTaskExecutor.java | 17 - .../network/impl/node/task/package-info.java | 7 - .../api/network/impl/package-info.java | 7 - .../network/impl/security/package-info.java | 7 - .../impl/storage/StorageConfiguration.java | 36 - .../storage/StorageNetworkComponentImpl.java | 54 - .../network/impl/storage/package-info.java | 7 - .../src/main/resources/fabric.mod.json | 19 - .../impl/node/SimpleNetworkNodeTest.java | 78 -- .../RandomExporterNetworkNodeTest.java | 96 -- .../ExternalStorageProviderFactoryImpl.java | 14 - .../StorageExternalStorageProvider.java | 33 - ...erfaceExternalStorageProviderImplTest.java | 64 - .../node/importer/FakeImporterSource.java | 47 - .../relay/RelayEnergyNetworkNodeTest.java | 106 -- .../PriorityStorageNetworkNodeTest.java | 76 - refinedstorage2-platform-api/build.gradle | 28 - .../platform/api/PlatformApi.java | 208 --- .../api/configurationcard/package-info.java | 7 - .../ConstructorStrategy.java | 14 - .../constructordestructor/package-info.java | 7 - .../ExporterTransferStrategyFactory.java | 22 - .../platform/api/exporter/package-info.java | 7 - .../platform/api/grid/Grid.java | 28 - .../api/grid/GridResourceAttributeKeys.java | 13 - .../platform/api/grid/GridScrollMode.java | 7 - .../platform/api/grid/package-info.java | 7 - .../grid/strategy/GridExtractionStrategy.java | 11 - .../GridExtractionStrategyFactory.java | 13 - .../grid/strategy/GridInsertionStrategy.java | 12 - .../GridInsertionStrategyFactory.java | 13 - .../grid/strategy/GridScrollingStrategy.java | 11 - .../GridScrollingStrategyFactory.java | 13 - .../api/grid/strategy/package-info.java | 7 - .../api/grid/view/PlatformGridResource.java | 45 - .../platform/api/grid/view/package-info.java | 7 - .../ImporterTransferStrategyFactory.java | 22 - .../platform/api/importer/package-info.java | 7 - .../platform/api/package-info.java | 7 - .../PlatformSecurityNetworkComponent.java | 12 - .../platform/api/security/package-info.java | 7 - .../api/storage/SerializableStorage.java | 18 - .../platform/api/storage/StorageInfo.java | 18 - .../storage/channel/FuzzyStorageChannel.java | 14 - .../api/storage/channel/package-info.java | 7 - ...latformExternalStorageProviderFactory.java | 19 - .../storage/externalstorage/package-info.java | 7 - .../platform/api/storage/package-info.java | 7 - .../StorageMonitorExtractionStrategy.java | 14 - .../StorageMonitorInsertionStrategy.java | 16 - .../api/storagemonitor/package-info.java | 7 - .../energy/TransferableBlockEntityEnergy.java | 10 - .../api/support/energy/package-info.java | 7 - .../network/InWorldNetworkNodeContainer.java | 21 - .../NetworkNodeContainerBlockEntity.java | 19 - .../bounditem/NetworkBoundItemSession.java | 16 - .../NetworkBoundItemTargetBlockEntity.java | 13 - .../network/bounditem/package-info.java | 7 - .../api/support/network/package-info.java | 7 - .../platform/api/support/package-info.java | 7 - .../api/support/registry/package-info.java | 7 - .../support/resource/FuzzyModeNormalizer.java | 10 - .../support/resource/PlatformResourceKey.java | 12 - .../api/support/resource/ResourceFactory.java | 16 - .../api/support/resource/ResourceType.java | 46 - .../resource/list/FuzzyResourceList.java | 21 - .../support/resource/list/package-info.java | 7 - .../api/support/resource/package-info.java | 7 - .../platform/api/upgrade/UpgradeItem.java | 8 - .../platform/api/upgrade/package-info.java | 7 - .../WirelessTransmitterRangeModifier.java | 15 - .../api/wirelesstransmitter/package-info.java | 7 - .../src/main/resources/fabric.mod.json | 19 - refinedstorage2-platform-common/build.gradle | 29 - .../blockstates/black_cable.json | 62 - .../blockstates/black_constructor.json | 180 --- .../blockstates/black_controller.json | 16 - .../blockstates/black_crafting_grid.json | 110 -- .../black_creative_controller.json | 16 - .../blockstates/black_destructor.json | 180 --- .../blockstates/black_detector.json | 56 - .../blockstates/black_disk_interface.json | 7 - .../blockstates/black_exporter.json | 115 -- .../blockstates/black_external_storage.json | 115 -- .../blockstates/black_grid.json | 110 -- .../blockstates/black_importer.json | 115 -- .../blockstates/black_network_receiver.json | 10 - .../black_network_transmitter.json | 13 - .../blockstates/black_relay.json | 52 - .../blockstates/black_security_manager.json | 34 - .../black_wireless_transmitter.json | 56 - .../blockstates/blue_cable.json | 62 - .../blockstates/blue_constructor.json | 180 --- .../blockstates/blue_controller.json | 16 - .../blockstates/blue_crafting_grid.json | 110 -- .../blockstates/blue_creative_controller.json | 16 - .../blockstates/blue_destructor.json | 180 --- .../blockstates/blue_detector.json | 56 - .../blockstates/blue_disk_interface.json | 7 - .../blockstates/blue_exporter.json | 115 -- .../blockstates/blue_external_storage.json | 115 -- .../blockstates/blue_grid.json | 110 -- .../blockstates/blue_importer.json | 115 -- .../blockstates/blue_network_receiver.json | 10 - .../blockstates/blue_network_transmitter.json | 13 - .../blockstates/blue_relay.json | 52 - .../blockstates/blue_security_manager.json | 34 - .../blue_wireless_transmitter.json | 56 - .../blockstates/brown_cable.json | 62 - .../blockstates/brown_constructor.json | 180 --- .../blockstates/brown_controller.json | 16 - .../blockstates/brown_crafting_grid.json | 110 -- .../brown_creative_controller.json | 16 - .../blockstates/brown_destructor.json | 180 --- .../blockstates/brown_detector.json | 56 - .../blockstates/brown_disk_interface.json | 7 - .../blockstates/brown_exporter.json | 115 -- .../blockstates/brown_external_storage.json | 115 -- .../blockstates/brown_grid.json | 110 -- .../blockstates/brown_importer.json | 115 -- .../blockstates/brown_network_receiver.json | 10 - .../brown_network_transmitter.json | 13 - .../blockstates/brown_relay.json | 52 - .../blockstates/brown_security_manager.json | 34 - .../brown_wireless_transmitter.json | 56 - .../refinedstorage2/blockstates/cable.json | 62 - .../blockstates/constructor.json | 180 --- .../blockstates/controller.json | 16 - .../blockstates/crafting_grid.json | 110 -- .../blockstates/creative_controller.json | 16 - .../blockstates/cyan_cable.json | 62 - .../blockstates/cyan_constructor.json | 180 --- .../blockstates/cyan_controller.json | 16 - .../blockstates/cyan_crafting_grid.json | 110 -- .../blockstates/cyan_creative_controller.json | 16 - .../blockstates/cyan_destructor.json | 180 --- .../blockstates/cyan_detector.json | 56 - .../blockstates/cyan_disk_interface.json | 7 - .../blockstates/cyan_exporter.json | 115 -- .../blockstates/cyan_external_storage.json | 115 -- .../blockstates/cyan_grid.json | 110 -- .../blockstates/cyan_importer.json | 115 -- .../blockstates/cyan_network_receiver.json | 10 - .../blockstates/cyan_network_transmitter.json | 13 - .../blockstates/cyan_relay.json | 52 - .../blockstates/cyan_security_manager.json | 34 - .../cyan_wireless_transmitter.json | 56 - .../blockstates/destructor.json | 180 --- .../refinedstorage2/blockstates/detector.json | 56 - .../blockstates/disk_interface.json | 7 - .../refinedstorage2/blockstates/exporter.json | 115 -- .../blockstates/external_storage.json | 115 -- .../blockstates/gray_controller.json | 16 - .../blockstates/gray_crafting_grid.json | 110 -- .../blockstates/gray_creative_controller.json | 16 - .../blockstates/gray_detector.json | 56 - .../blockstates/gray_disk_interface.json | 7 - .../blockstates/gray_grid.json | 110 -- .../blockstates/gray_network_receiver.json | 10 - .../blockstates/gray_network_transmitter.json | 13 - .../blockstates/gray_relay.json | 52 - .../blockstates/gray_security_manager.json | 34 - .../gray_wireless_transmitter.json | 56 - .../blockstates/green_cable.json | 62 - .../blockstates/green_constructor.json | 180 --- .../blockstates/green_controller.json | 16 - .../blockstates/green_crafting_grid.json | 110 -- .../green_creative_controller.json | 16 - .../blockstates/green_destructor.json | 180 --- .../blockstates/green_detector.json | 56 - .../blockstates/green_disk_interface.json | 7 - .../blockstates/green_exporter.json | 115 -- .../blockstates/green_external_storage.json | 115 -- .../blockstates/green_grid.json | 110 -- .../blockstates/green_importer.json | 115 -- .../blockstates/green_network_receiver.json | 10 - .../green_network_transmitter.json | 13 - .../blockstates/green_relay.json | 52 - .../blockstates/green_security_manager.json | 34 - .../green_wireless_transmitter.json | 56 - .../refinedstorage2/blockstates/grid.json | 110 -- .../refinedstorage2/blockstates/importer.json | 115 -- .../blockstates/light_blue_cable.json | 62 - .../blockstates/light_blue_constructor.json | 180 --- .../blockstates/light_blue_destructor.json | 180 --- .../blockstates/light_blue_exporter.json | 115 -- .../light_blue_external_storage.json | 115 -- .../blockstates/light_blue_importer.json | 115 -- .../blockstates/light_gray_cable.json | 62 - .../blockstates/light_gray_constructor.json | 180 --- .../blockstates/light_gray_controller.json | 16 - .../blockstates/light_gray_crafting_grid.json | 110 -- .../light_gray_creative_controller.json | 16 - .../blockstates/light_gray_destructor.json | 180 --- .../blockstates/light_gray_detector.json | 56 - .../light_gray_disk_interface.json | 7 - .../blockstates/light_gray_exporter.json | 115 -- .../light_gray_external_storage.json | 115 -- .../blockstates/light_gray_grid.json | 110 -- .../blockstates/light_gray_importer.json | 115 -- .../light_gray_network_receiver.json | 10 - .../light_gray_network_transmitter.json | 13 - .../blockstates/light_gray_relay.json | 52 - .../light_gray_security_manager.json | 34 - .../light_gray_wireless_transmitter.json | 56 - .../blockstates/lime_cable.json | 62 - .../blockstates/lime_constructor.json | 180 --- .../blockstates/lime_controller.json | 16 - .../blockstates/lime_crafting_grid.json | 110 -- .../blockstates/lime_creative_controller.json | 16 - .../blockstates/lime_destructor.json | 180 --- .../blockstates/lime_detector.json | 56 - .../blockstates/lime_disk_interface.json | 7 - .../blockstates/lime_exporter.json | 115 -- .../blockstates/lime_external_storage.json | 115 -- .../blockstates/lime_grid.json | 110 -- .../blockstates/lime_importer.json | 115 -- .../blockstates/lime_network_receiver.json | 10 - .../blockstates/lime_network_transmitter.json | 13 - .../blockstates/lime_relay.json | 52 - .../blockstates/lime_security_manager.json | 34 - .../lime_wireless_transmitter.json | 56 - .../blockstates/magenta_cable.json | 62 - .../blockstates/magenta_constructor.json | 180 --- .../blockstates/magenta_controller.json | 16 - .../blockstates/magenta_crafting_grid.json | 110 -- .../magenta_creative_controller.json | 16 - .../blockstates/magenta_destructor.json | 180 --- .../blockstates/magenta_detector.json | 56 - .../blockstates/magenta_disk_interface.json | 7 - .../blockstates/magenta_exporter.json | 115 -- .../blockstates/magenta_external_storage.json | 115 -- .../blockstates/magenta_grid.json | 110 -- .../blockstates/magenta_importer.json | 115 -- .../blockstates/magenta_network_receiver.json | 10 - .../magenta_network_transmitter.json | 13 - .../blockstates/magenta_relay.json | 52 - .../blockstates/magenta_security_manager.json | 34 - .../magenta_wireless_transmitter.json | 56 - .../blockstates/network_receiver.json | 10 - .../blockstates/network_transmitter.json | 13 - .../blockstates/orange_cable.json | 62 - .../blockstates/orange_constructor.json | 180 --- .../blockstates/orange_controller.json | 16 - .../blockstates/orange_crafting_grid.json | 110 -- .../orange_creative_controller.json | 16 - .../blockstates/orange_destructor.json | 180 --- .../blockstates/orange_detector.json | 56 - .../blockstates/orange_disk_interface.json | 7 - .../blockstates/orange_exporter.json | 115 -- .../blockstates/orange_external_storage.json | 115 -- .../blockstates/orange_grid.json | 110 -- .../blockstates/orange_importer.json | 115 -- .../blockstates/orange_network_receiver.json | 10 - .../orange_network_transmitter.json | 13 - .../blockstates/orange_relay.json | 52 - .../blockstates/orange_security_manager.json | 34 - .../orange_wireless_transmitter.json | 56 - .../blockstates/pink_cable.json | 62 - .../blockstates/pink_constructor.json | 180 --- .../blockstates/pink_controller.json | 16 - .../blockstates/pink_crafting_grid.json | 110 -- .../blockstates/pink_creative_controller.json | 16 - .../blockstates/pink_destructor.json | 180 --- .../blockstates/pink_detector.json | 56 - .../blockstates/pink_disk_interface.json | 7 - .../blockstates/pink_exporter.json | 115 -- .../blockstates/pink_external_storage.json | 115 -- .../blockstates/pink_grid.json | 110 -- .../blockstates/pink_importer.json | 115 -- .../blockstates/pink_network_receiver.json | 10 - .../blockstates/pink_network_transmitter.json | 13 - .../blockstates/pink_relay.json | 52 - .../blockstates/pink_security_manager.json | 34 - .../pink_wireless_transmitter.json | 56 - .../blockstates/purple_cable.json | 62 - .../blockstates/purple_constructor.json | 180 --- .../blockstates/purple_controller.json | 16 - .../blockstates/purple_crafting_grid.json | 110 -- .../purple_creative_controller.json | 16 - .../blockstates/purple_destructor.json | 180 --- .../blockstates/purple_detector.json | 56 - .../blockstates/purple_disk_interface.json | 7 - .../blockstates/purple_exporter.json | 115 -- .../blockstates/purple_external_storage.json | 115 -- .../blockstates/purple_grid.json | 110 -- .../blockstates/purple_importer.json | 115 -- .../blockstates/purple_network_receiver.json | 10 - .../purple_network_transmitter.json | 13 - .../blockstates/purple_relay.json | 52 - .../blockstates/purple_security_manager.json | 34 - .../purple_wireless_transmitter.json | 56 - .../blockstates/red_cable.json | 62 - .../blockstates/red_constructor.json | 180 --- .../blockstates/red_controller.json | 16 - .../blockstates/red_crafting_grid.json | 110 -- .../blockstates/red_creative_controller.json | 16 - .../blockstates/red_destructor.json | 180 --- .../blockstates/red_detector.json | 56 - .../blockstates/red_disk_interface.json | 7 - .../blockstates/red_exporter.json | 115 -- .../blockstates/red_external_storage.json | 115 -- .../refinedstorage2/blockstates/red_grid.json | 110 -- .../blockstates/red_importer.json | 115 -- .../blockstates/red_network_receiver.json | 10 - .../blockstates/red_network_transmitter.json | 13 - .../blockstates/red_relay.json | 52 - .../blockstates/red_security_manager.json | 34 - .../blockstates/red_wireless_transmitter.json | 56 - .../refinedstorage2/blockstates/relay.json | 52 - .../blockstates/security_manager.json | 34 - .../blockstates/white_cable.json | 62 - .../blockstates/white_constructor.json | 180 --- .../blockstates/white_controller.json | 16 - .../blockstates/white_crafting_grid.json | 110 -- .../white_creative_controller.json | 16 - .../blockstates/white_destructor.json | 180 --- .../blockstates/white_detector.json | 56 - .../blockstates/white_disk_interface.json | 7 - .../blockstates/white_exporter.json | 115 -- .../blockstates/white_external_storage.json | 115 -- .../blockstates/white_grid.json | 110 -- .../blockstates/white_importer.json | 115 -- .../blockstates/white_network_receiver.json | 10 - .../white_network_transmitter.json | 13 - .../blockstates/white_relay.json | 52 - .../blockstates/white_security_manager.json | 34 - .../white_wireless_transmitter.json | 56 - .../blockstates/wireless_transmitter.json | 56 - .../blockstates/yellow_cable.json | 62 - .../blockstates/yellow_constructor.json | 180 --- .../blockstates/yellow_controller.json | 16 - .../blockstates/yellow_crafting_grid.json | 110 -- .../yellow_creative_controller.json | 16 - .../blockstates/yellow_destructor.json | 180 --- .../blockstates/yellow_detector.json | 56 - .../blockstates/yellow_disk_interface.json | 7 - .../blockstates/yellow_exporter.json | 115 -- .../blockstates/yellow_external_storage.json | 115 -- .../blockstates/yellow_grid.json | 110 -- .../blockstates/yellow_importer.json | 115 -- .../blockstates/yellow_network_receiver.json | 10 - .../yellow_network_transmitter.json | 13 - .../blockstates/yellow_relay.json | 52 - .../blockstates/yellow_security_manager.json | 34 - .../yellow_wireless_transmitter.json | 56 - .../models/block/cable/core/black.json | 7 - .../models/block/cable/core/blue.json | 7 - .../models/block/cable/core/brown.json | 7 - .../models/block/cable/core/cyan.json | 7 - .../models/block/cable/core/gray.json | 7 - .../models/block/cable/core/green.json | 7 - .../models/block/cable/core/light_blue.json | 7 - .../models/block/cable/core/light_gray.json | 7 - .../models/block/cable/core/lime.json | 7 - .../models/block/cable/core/magenta.json | 7 - .../models/block/cable/core/orange.json | 7 - .../models/block/cable/core/pink.json | 7 - .../models/block/cable/core/purple.json | 7 - .../models/block/cable/core/red.json | 7 - .../models/block/cable/core/white.json | 7 - .../models/block/cable/core/yellow.json | 7 - .../models/block/cable/extension/black.json | 7 - .../models/block/cable/extension/blue.json | 7 - .../models/block/cable/extension/brown.json | 7 - .../models/block/cable/extension/cyan.json | 7 - .../models/block/cable/extension/gray.json | 7 - .../models/block/cable/extension/green.json | 7 - .../block/cable/extension/light_blue.json | 7 - .../block/cable/extension/light_gray.json | 7 - .../models/block/cable/extension/lime.json | 7 - .../models/block/cable/extension/magenta.json | 7 - .../models/block/cable/extension/orange.json | 7 - .../models/block/cable/extension/pink.json | 7 - .../models/block/cable/extension/purple.json | 7 - .../models/block/cable/extension/red.json | 7 - .../models/block/cable/extension/white.json | 7 - .../models/block/cable/extension/yellow.json | 7 - .../models/block/controller/black.json | 8 - .../models/block/controller/blue.json | 8 - .../models/block/controller/brown.json | 8 - .../models/block/controller/cyan.json | 8 - .../models/block/controller/gray.json | 8 - .../models/block/controller/green.json | 8 - .../models/block/controller/light_blue.json | 8 - .../models/block/controller/light_gray.json | 8 - .../models/block/controller/lime.json | 8 - .../models/block/controller/magenta.json | 8 - .../models/block/controller/orange.json | 8 - .../models/block/controller/pink.json | 8 - .../models/block/controller/purple.json | 8 - .../models/block/controller/red.json | 8 - .../models/block/controller/white.json | 8 - .../models/block/controller/yellow.json | 8 - .../models/block/crafting_grid/black.json | 13 - .../models/block/crafting_grid/blue.json | 13 - .../models/block/crafting_grid/brown.json | 13 - .../models/block/crafting_grid/cyan.json | 13 - .../models/block/crafting_grid/gray.json | 13 - .../models/block/crafting_grid/green.json | 13 - .../models/block/crafting_grid/inactive.json | 13 - .../block/crafting_grid/light_blue.json | 13 - .../block/crafting_grid/light_gray.json | 13 - .../models/block/crafting_grid/lime.json | 13 - .../models/block/crafting_grid/magenta.json | 13 - .../models/block/crafting_grid/orange.json | 13 - .../models/block/crafting_grid/pink.json | 13 - .../models/block/crafting_grid/purple.json | 13 - .../models/block/crafting_grid/red.json | 13 - .../models/block/crafting_grid/white.json | 13 - .../models/block/crafting_grid/yellow.json | 13 - .../models/block/detector/black.json | 10 - .../models/block/detector/blue.json | 10 - .../models/block/detector/brown.json | 10 - .../models/block/detector/cyan.json | 10 - .../models/block/detector/gray.json | 10 - .../models/block/detector/green.json | 10 - .../models/block/detector/light_blue.json | 10 - .../models/block/detector/light_gray.json | 10 - .../models/block/detector/lime.json | 10 - .../models/block/detector/magenta.json | 10 - .../models/block/detector/orange.json | 10 - .../models/block/detector/pink.json | 10 - .../models/block/detector/purple.json | 10 - .../models/block/detector/red.json | 10 - .../models/block/detector/white.json | 10 - .../models/block/detector/yellow.json | 10 - .../block/disk_interface/base_black.json | 13 - .../block/disk_interface/base_blue.json | 13 - .../block/disk_interface/base_brown.json | 13 - .../block/disk_interface/base_cyan.json | 13 - .../block/disk_interface/base_gray.json | 13 - .../block/disk_interface/base_green.json | 13 - .../block/disk_interface/base_light_blue.json | 13 - .../block/disk_interface/base_light_gray.json | 13 - .../block/disk_interface/base_lime.json | 13 - .../block/disk_interface/base_magenta.json | 13 - .../block/disk_interface/base_orange.json | 13 - .../block/disk_interface/base_pink.json | 13 - .../block/disk_interface/base_purple.json | 13 - .../models/block/disk_interface/base_red.json | 13 - .../block/disk_interface/base_white.json | 13 - .../block/disk_interface/base_yellow.json | 13 - .../models/block/disk_interface/black.json | 3 - .../models/block/disk_interface/blue.json | 3 - .../models/block/disk_interface/brown.json | 3 - .../models/block/disk_interface/cyan.json | 3 - .../models/block/disk_interface/gray.json | 3 - .../models/block/disk_interface/green.json | 3 - .../models/block/disk_interface/inactive.json | 13 - .../block/disk_interface/light_blue.json | 3 - .../block/disk_interface/light_gray.json | 3 - .../models/block/disk_interface/lime.json | 3 - .../models/block/disk_interface/magenta.json | 3 - .../models/block/disk_interface/orange.json | 3 - .../models/block/disk_interface/pink.json | 3 - .../models/block/disk_interface/purple.json | 3 - .../models/block/disk_interface/red.json | 3 - .../models/block/disk_interface/white.json | 3 - .../models/block/disk_interface/yellow.json | 3 - .../models/block/grid/black.json | 13 - .../models/block/grid/blue.json | 13 - .../models/block/grid/brown.json | 13 - .../models/block/grid/cyan.json | 13 - .../models/block/grid/gray.json | 13 - .../models/block/grid/green.json | 13 - .../models/block/grid/inactive.json | 13 - .../models/block/grid/light_blue.json | 13 - .../models/block/grid/light_gray.json | 13 - .../models/block/grid/lime.json | 13 - .../models/block/grid/magenta.json | 13 - .../models/block/grid/orange.json | 13 - .../models/block/grid/pink.json | 13 - .../models/block/grid/purple.json | 13 - .../models/block/grid/red.json | 13 - .../models/block/grid/white.json | 13 - .../models/block/grid/yellow.json | 13 - .../models/block/network_receiver/black.json | 8 - .../models/block/network_receiver/blue.json | 8 - .../models/block/network_receiver/brown.json | 8 - .../models/block/network_receiver/cyan.json | 8 - .../models/block/network_receiver/gray.json | 8 - .../models/block/network_receiver/green.json | 8 - .../block/network_receiver/inactive.json | 8 - .../block/network_receiver/light_blue.json | 8 - .../block/network_receiver/light_gray.json | 8 - .../models/block/network_receiver/lime.json | 8 - .../block/network_receiver/magenta.json | 8 - .../models/block/network_receiver/orange.json | 8 - .../models/block/network_receiver/pink.json | 8 - .../models/block/network_receiver/purple.json | 8 - .../models/block/network_receiver/red.json | 8 - .../models/block/network_receiver/white.json | 8 - .../models/block/network_receiver/yellow.json | 8 - .../block/network_transmitter/black.json | 8 - .../block/network_transmitter/blue.json | 8 - .../block/network_transmitter/brown.json | 8 - .../block/network_transmitter/cyan.json | 8 - .../block/network_transmitter/error.json | 8 - .../block/network_transmitter/gray.json | 8 - .../block/network_transmitter/green.json | 8 - .../block/network_transmitter/inactive.json | 8 - .../block/network_transmitter/light_blue.json | 8 - .../block/network_transmitter/light_gray.json | 8 - .../block/network_transmitter/lime.json | 8 - .../block/network_transmitter/magenta.json | 8 - .../block/network_transmitter/orange.json | 8 - .../block/network_transmitter/pink.json | 8 - .../block/network_transmitter/purple.json | 8 - .../models/block/network_transmitter/red.json | 8 - .../block/network_transmitter/white.json | 8 - .../block/network_transmitter/yellow.json | 8 - .../models/block/relay/black.json | 18 - .../models/block/relay/blue.json | 18 - .../models/block/relay/brown.json | 18 - .../models/block/relay/cyan.json | 18 - .../models/block/relay/gray.json | 18 - .../models/block/relay/green.json | 18 - .../models/block/relay/inactive.json | 18 - .../models/block/relay/light_blue.json | 18 - .../models/block/relay/light_gray.json | 18 - .../models/block/relay/lime.json | 18 - .../models/block/relay/magenta.json | 18 - .../models/block/relay/orange.json | 18 - .../models/block/relay/pink.json | 18 - .../models/block/relay/purple.json | 18 - .../models/block/relay/red.json | 18 - .../models/block/relay/white.json | 18 - .../models/block/relay/yellow.json | 18 - .../models/block/security_manager/black.json | 18 - .../models/block/security_manager/blue.json | 18 - .../models/block/security_manager/brown.json | 18 - .../models/block/security_manager/cyan.json | 18 - .../models/block/security_manager/gray.json | 18 - .../models/block/security_manager/green.json | 18 - .../block/security_manager/inactive.json | 18 - .../block/security_manager/light_blue.json | 18 - .../block/security_manager/light_gray.json | 18 - .../models/block/security_manager/lime.json | 18 - .../block/security_manager/magenta.json | 18 - .../models/block/security_manager/orange.json | 18 - .../models/block/security_manager/pink.json | 18 - .../models/block/security_manager/purple.json | 18 - .../models/block/security_manager/red.json | 18 - .../models/block/security_manager/white.json | 18 - .../models/block/security_manager/yellow.json | 18 - .../block/wireless_transmitter/black.json | 6 - .../block/wireless_transmitter/blue.json | 6 - .../block/wireless_transmitter/brown.json | 6 - .../block/wireless_transmitter/cyan.json | 6 - .../block/wireless_transmitter/gray.json | 6 - .../block/wireless_transmitter/green.json | 6 - .../wireless_transmitter/light_blue.json | 6 - .../wireless_transmitter/light_gray.json | 6 - .../block/wireless_transmitter/lime.json | 6 - .../block/wireless_transmitter/magenta.json | 6 - .../block/wireless_transmitter/orange.json | 6 - .../block/wireless_transmitter/pink.json | 6 - .../block/wireless_transmitter/purple.json | 6 - .../block/wireless_transmitter/red.json | 6 - .../block/wireless_transmitter/white.json | 6 - .../block/wireless_transmitter/yellow.json | 6 - .../models/item/black_cable.json | 6 - .../models/item/black_constructor.json | 6 - .../models/item/black_controller.json | 29 - .../models/item/black_crafting_grid.json | 3 - .../item/black_creative_controller.json | 3 - .../models/item/black_destructor.json | 6 - .../models/item/black_detector.json | 3 - .../models/item/black_disk_interface.json | 3 - .../models/item/black_exporter.json | 6 - .../models/item/black_external_storage.json | 6 - .../models/item/black_grid.json | 3 - .../models/item/black_importer.json | 6 - .../models/item/black_network_receiver.json | 6 - .../item/black_network_transmitter.json | 6 - .../models/item/black_relay.json | 3 - .../models/item/black_security_manager.json | 3 - .../item/black_wireless_transmitter.json | 6 - .../models/item/blue_cable.json | 6 - .../models/item/blue_constructor.json | 6 - .../models/item/blue_controller.json | 29 - .../models/item/blue_crafting_grid.json | 3 - .../models/item/blue_creative_controller.json | 3 - .../models/item/blue_destructor.json | 6 - .../models/item/blue_detector.json | 3 - .../models/item/blue_disk_interface.json | 3 - .../models/item/blue_exporter.json | 6 - .../models/item/blue_external_storage.json | 6 - .../models/item/blue_grid.json | 3 - .../models/item/blue_importer.json | 6 - .../models/item/blue_network_receiver.json | 6 - .../models/item/blue_network_transmitter.json | 6 - .../models/item/blue_relay.json | 3 - .../models/item/blue_security_manager.json | 3 - .../item/blue_wireless_transmitter.json | 6 - .../models/item/brown_cable.json | 6 - .../models/item/brown_constructor.json | 6 - .../models/item/brown_controller.json | 29 - .../models/item/brown_crafting_grid.json | 3 - .../item/brown_creative_controller.json | 3 - .../models/item/brown_destructor.json | 6 - .../models/item/brown_detector.json | 3 - .../models/item/brown_disk_interface.json | 3 - .../models/item/brown_exporter.json | 6 - .../models/item/brown_external_storage.json | 6 - .../models/item/brown_grid.json | 3 - .../models/item/brown_importer.json | 6 - .../models/item/brown_network_receiver.json | 6 - .../item/brown_network_transmitter.json | 6 - .../models/item/brown_relay.json | 3 - .../models/item/brown_security_manager.json | 3 - .../item/brown_wireless_transmitter.json | 6 - .../refinedstorage2/models/item/cable.json | 6 - .../models/item/constructor.json | 6 - .../models/item/controller.json | 29 - .../models/item/crafting_grid.json | 3 - .../models/item/creative_controller.json | 3 - .../models/item/cyan_cable.json | 6 - .../models/item/cyan_constructor.json | 6 - .../models/item/cyan_controller.json | 29 - .../models/item/cyan_crafting_grid.json | 3 - .../models/item/cyan_creative_controller.json | 3 - .../models/item/cyan_destructor.json | 6 - .../models/item/cyan_detector.json | 3 - .../models/item/cyan_disk_interface.json | 3 - .../models/item/cyan_exporter.json | 6 - .../models/item/cyan_external_storage.json | 6 - .../models/item/cyan_grid.json | 3 - .../models/item/cyan_importer.json | 6 - .../models/item/cyan_network_receiver.json | 6 - .../models/item/cyan_network_transmitter.json | 6 - .../models/item/cyan_relay.json | 3 - .../models/item/cyan_security_manager.json | 3 - .../item/cyan_wireless_transmitter.json | 6 - .../models/item/destructor.json | 6 - .../refinedstorage2/models/item/detector.json | 3 - .../models/item/disk_interface.json | 3 - .../refinedstorage2/models/item/exporter.json | 6 - .../models/item/external_storage.json | 6 - .../models/item/gray_controller.json | 29 - .../models/item/gray_crafting_grid.json | 3 - .../models/item/gray_creative_controller.json | 3 - .../models/item/gray_detector.json | 3 - .../models/item/gray_disk_interface.json | 3 - .../models/item/gray_grid.json | 3 - .../models/item/gray_network_receiver.json | 6 - .../models/item/gray_network_transmitter.json | 6 - .../models/item/gray_relay.json | 3 - .../models/item/gray_security_manager.json | 3 - .../item/gray_wireless_transmitter.json | 6 - .../models/item/green_cable.json | 6 - .../models/item/green_constructor.json | 6 - .../models/item/green_controller.json | 29 - .../models/item/green_crafting_grid.json | 3 - .../item/green_creative_controller.json | 3 - .../models/item/green_destructor.json | 6 - .../models/item/green_detector.json | 3 - .../models/item/green_disk_interface.json | 3 - .../models/item/green_exporter.json | 6 - .../models/item/green_external_storage.json | 6 - .../models/item/green_grid.json | 3 - .../models/item/green_importer.json | 6 - .../models/item/green_network_receiver.json | 6 - .../item/green_network_transmitter.json | 6 - .../models/item/green_relay.json | 3 - .../models/item/green_security_manager.json | 3 - .../item/green_wireless_transmitter.json | 6 - .../refinedstorage2/models/item/grid.json | 3 - .../refinedstorage2/models/item/importer.json | 6 - .../models/item/light_blue_cable.json | 6 - .../models/item/light_blue_constructor.json | 6 - .../models/item/light_blue_destructor.json | 6 - .../models/item/light_blue_exporter.json | 6 - .../item/light_blue_external_storage.json | 6 - .../models/item/light_blue_importer.json | 6 - .../models/item/light_gray_cable.json | 6 - .../models/item/light_gray_constructor.json | 6 - .../models/item/light_gray_controller.json | 29 - .../models/item/light_gray_crafting_grid.json | 3 - .../item/light_gray_creative_controller.json | 3 - .../models/item/light_gray_destructor.json | 6 - .../models/item/light_gray_detector.json | 3 - .../item/light_gray_disk_interface.json | 3 - .../models/item/light_gray_exporter.json | 6 - .../item/light_gray_external_storage.json | 6 - .../models/item/light_gray_grid.json | 3 - .../models/item/light_gray_importer.json | 6 - .../item/light_gray_network_receiver.json | 6 - .../item/light_gray_network_transmitter.json | 6 - .../models/item/light_gray_relay.json | 3 - .../item/light_gray_security_manager.json | 3 - .../item/light_gray_wireless_transmitter.json | 6 - .../models/item/lime_cable.json | 6 - .../models/item/lime_constructor.json | 6 - .../models/item/lime_controller.json | 29 - .../models/item/lime_crafting_grid.json | 3 - .../models/item/lime_creative_controller.json | 3 - .../models/item/lime_destructor.json | 6 - .../models/item/lime_detector.json | 3 - .../models/item/lime_disk_interface.json | 3 - .../models/item/lime_exporter.json | 6 - .../models/item/lime_external_storage.json | 6 - .../models/item/lime_grid.json | 3 - .../models/item/lime_importer.json | 6 - .../models/item/lime_network_receiver.json | 6 - .../models/item/lime_network_transmitter.json | 6 - .../models/item/lime_relay.json | 3 - .../models/item/lime_security_manager.json | 3 - .../item/lime_wireless_transmitter.json | 6 - .../models/item/magenta_cable.json | 6 - .../models/item/magenta_constructor.json | 6 - .../models/item/magenta_controller.json | 29 - .../models/item/magenta_crafting_grid.json | 3 - .../item/magenta_creative_controller.json | 3 - .../models/item/magenta_destructor.json | 6 - .../models/item/magenta_detector.json | 3 - .../models/item/magenta_disk_interface.json | 3 - .../models/item/magenta_exporter.json | 6 - .../models/item/magenta_external_storage.json | 6 - .../models/item/magenta_grid.json | 3 - .../models/item/magenta_importer.json | 6 - .../models/item/magenta_network_receiver.json | 6 - .../item/magenta_network_transmitter.json | 6 - .../models/item/magenta_relay.json | 3 - .../models/item/magenta_security_manager.json | 3 - .../item/magenta_wireless_transmitter.json | 6 - .../models/item/network_receiver.json | 6 - .../models/item/network_transmitter.json | 6 - .../models/item/orange_cable.json | 6 - .../models/item/orange_constructor.json | 6 - .../models/item/orange_controller.json | 29 - .../models/item/orange_crafting_grid.json | 3 - .../item/orange_creative_controller.json | 3 - .../models/item/orange_destructor.json | 6 - .../models/item/orange_detector.json | 3 - .../models/item/orange_disk_interface.json | 3 - .../models/item/orange_exporter.json | 6 - .../models/item/orange_external_storage.json | 6 - .../models/item/orange_grid.json | 3 - .../models/item/orange_importer.json | 6 - .../models/item/orange_network_receiver.json | 6 - .../item/orange_network_transmitter.json | 6 - .../models/item/orange_relay.json | 3 - .../models/item/orange_security_manager.json | 3 - .../item/orange_wireless_transmitter.json | 6 - .../models/item/pink_cable.json | 6 - .../models/item/pink_constructor.json | 6 - .../models/item/pink_controller.json | 29 - .../models/item/pink_crafting_grid.json | 3 - .../models/item/pink_creative_controller.json | 3 - .../models/item/pink_destructor.json | 6 - .../models/item/pink_detector.json | 3 - .../models/item/pink_disk_interface.json | 3 - .../models/item/pink_exporter.json | 6 - .../models/item/pink_external_storage.json | 6 - .../models/item/pink_grid.json | 3 - .../models/item/pink_importer.json | 6 - .../models/item/pink_network_receiver.json | 6 - .../models/item/pink_network_transmitter.json | 6 - .../models/item/pink_relay.json | 3 - .../models/item/pink_security_manager.json | 3 - .../item/pink_wireless_transmitter.json | 6 - .../models/item/purple_cable.json | 6 - .../models/item/purple_constructor.json | 6 - .../models/item/purple_controller.json | 29 - .../models/item/purple_crafting_grid.json | 3 - .../item/purple_creative_controller.json | 3 - .../models/item/purple_destructor.json | 6 - .../models/item/purple_detector.json | 3 - .../models/item/purple_disk_interface.json | 3 - .../models/item/purple_exporter.json | 6 - .../models/item/purple_external_storage.json | 6 - .../models/item/purple_grid.json | 3 - .../models/item/purple_importer.json | 6 - .../models/item/purple_network_receiver.json | 6 - .../item/purple_network_transmitter.json | 6 - .../models/item/purple_relay.json | 3 - .../models/item/purple_security_manager.json | 3 - .../item/purple_wireless_transmitter.json | 6 - .../models/item/red_cable.json | 6 - .../models/item/red_constructor.json | 6 - .../models/item/red_controller.json | 29 - .../models/item/red_crafting_grid.json | 3 - .../models/item/red_creative_controller.json | 3 - .../models/item/red_destructor.json | 6 - .../models/item/red_detector.json | 3 - .../models/item/red_disk_interface.json | 3 - .../models/item/red_exporter.json | 6 - .../models/item/red_external_storage.json | 6 - .../refinedstorage2/models/item/red_grid.json | 3 - .../models/item/red_importer.json | 6 - .../models/item/red_network_receiver.json | 6 - .../models/item/red_network_transmitter.json | 6 - .../models/item/red_relay.json | 3 - .../models/item/red_security_manager.json | 3 - .../models/item/red_wireless_transmitter.json | 6 - .../refinedstorage2/models/item/relay.json | 3 - .../models/item/security_manager.json | 3 - .../models/item/white_cable.json | 6 - .../models/item/white_constructor.json | 6 - .../models/item/white_controller.json | 29 - .../models/item/white_crafting_grid.json | 3 - .../item/white_creative_controller.json | 3 - .../models/item/white_destructor.json | 6 - .../models/item/white_detector.json | 3 - .../models/item/white_disk_interface.json | 3 - .../models/item/white_exporter.json | 6 - .../models/item/white_external_storage.json | 6 - .../models/item/white_grid.json | 3 - .../models/item/white_importer.json | 6 - .../models/item/white_network_receiver.json | 6 - .../item/white_network_transmitter.json | 6 - .../models/item/white_relay.json | 3 - .../models/item/white_security_manager.json | 3 - .../item/white_wireless_transmitter.json | 6 - .../models/item/wireless_transmitter.json | 6 - .../models/item/yellow_cable.json | 6 - .../models/item/yellow_constructor.json | 6 - .../models/item/yellow_controller.json | 29 - .../models/item/yellow_crafting_grid.json | 3 - .../item/yellow_creative_controller.json | 3 - .../models/item/yellow_destructor.json | 6 - .../models/item/yellow_detector.json | 3 - .../models/item/yellow_disk_interface.json | 3 - .../models/item/yellow_exporter.json | 6 - .../models/item/yellow_external_storage.json | 6 - .../models/item/yellow_grid.json | 3 - .../models/item/yellow_importer.json | 6 - .../models/item/yellow_network_receiver.json | 6 - .../item/yellow_network_transmitter.json | 6 - .../models/item/yellow_relay.json | 3 - .../models/item/yellow_security_manager.json | 3 - .../item/yellow_wireless_transmitter.json | 6 - .../recipes/misc/coloring/black_cable.json | 32 - .../misc/coloring/black_constructor.json | 32 - .../misc/coloring/black_controller.json | 32 - .../misc/coloring/black_crafting_grid.json | 32 - .../misc/coloring/black_destructor.json | 32 - .../recipes/misc/coloring/black_detector.json | 32 - .../misc/coloring/black_disk_interface.json | 32 - .../recipes/misc/coloring/black_exporter.json | 32 - .../misc/coloring/black_external_storage.json | 32 - .../recipes/misc/coloring/black_grid.json | 32 - .../recipes/misc/coloring/black_importer.json | 32 - .../misc/coloring/black_network_receiver.json | 32 - .../coloring/black_network_transmitter.json | 32 - .../recipes/misc/coloring/black_relay.json | 32 - .../misc/coloring/black_security_manager.json | 32 - .../coloring/black_wireless_transmitter.json | 32 - .../recipes/misc/coloring/blue_cable.json | 32 - .../misc/coloring/blue_constructor.json | 32 - .../misc/coloring/blue_controller.json | 32 - .../misc/coloring/blue_crafting_grid.json | 32 - .../misc/coloring/blue_destructor.json | 32 - .../recipes/misc/coloring/blue_detector.json | 32 - .../misc/coloring/blue_disk_interface.json | 32 - .../recipes/misc/coloring/blue_exporter.json | 32 - .../misc/coloring/blue_external_storage.json | 32 - .../recipes/misc/coloring/blue_grid.json | 32 - .../recipes/misc/coloring/blue_importer.json | 32 - .../misc/coloring/blue_network_receiver.json | 32 - .../coloring/blue_network_transmitter.json | 32 - .../recipes/misc/coloring/blue_relay.json | 32 - .../misc/coloring/blue_security_manager.json | 32 - .../coloring/blue_wireless_transmitter.json | 32 - .../recipes/misc/coloring/brown_cable.json | 32 - .../misc/coloring/brown_constructor.json | 32 - .../misc/coloring/brown_controller.json | 32 - .../misc/coloring/brown_crafting_grid.json | 32 - .../misc/coloring/brown_destructor.json | 32 - .../recipes/misc/coloring/brown_detector.json | 32 - .../misc/coloring/brown_disk_interface.json | 32 - .../recipes/misc/coloring/brown_exporter.json | 32 - .../misc/coloring/brown_external_storage.json | 32 - .../recipes/misc/coloring/brown_grid.json | 32 - .../recipes/misc/coloring/brown_importer.json | 32 - .../misc/coloring/brown_network_receiver.json | 32 - .../coloring/brown_network_transmitter.json | 32 - .../recipes/misc/coloring/brown_relay.json | 32 - .../misc/coloring/brown_security_manager.json | 32 - .../coloring/brown_wireless_transmitter.json | 32 - .../recipes/misc/coloring/cyan_cable.json | 32 - .../misc/coloring/cyan_constructor.json | 32 - .../misc/coloring/cyan_controller.json | 32 - .../misc/coloring/cyan_crafting_grid.json | 32 - .../misc/coloring/cyan_destructor.json | 32 - .../recipes/misc/coloring/cyan_detector.json | 32 - .../misc/coloring/cyan_disk_interface.json | 32 - .../recipes/misc/coloring/cyan_exporter.json | 32 - .../misc/coloring/cyan_external_storage.json | 32 - .../recipes/misc/coloring/cyan_grid.json | 32 - .../recipes/misc/coloring/cyan_importer.json | 32 - .../misc/coloring/cyan_network_receiver.json | 32 - .../coloring/cyan_network_transmitter.json | 32 - .../recipes/misc/coloring/cyan_relay.json | 32 - .../misc/coloring/cyan_security_manager.json | 32 - .../coloring/cyan_wireless_transmitter.json | 32 - .../recipes/misc/coloring/gray_cable.json | 32 - .../misc/coloring/gray_constructor.json | 32 - .../misc/coloring/gray_controller.json | 32 - .../misc/coloring/gray_crafting_grid.json | 32 - .../misc/coloring/gray_destructor.json | 32 - .../recipes/misc/coloring/gray_detector.json | 32 - .../misc/coloring/gray_disk_interface.json | 32 - .../recipes/misc/coloring/gray_exporter.json | 32 - .../misc/coloring/gray_external_storage.json | 32 - .../recipes/misc/coloring/gray_grid.json | 32 - .../recipes/misc/coloring/gray_importer.json | 32 - .../misc/coloring/gray_network_receiver.json | 32 - .../coloring/gray_network_transmitter.json | 32 - .../recipes/misc/coloring/gray_relay.json | 32 - .../misc/coloring/gray_security_manager.json | 32 - .../coloring/gray_wireless_transmitter.json | 32 - .../recipes/misc/coloring/green_cable.json | 32 - .../misc/coloring/green_constructor.json | 32 - .../misc/coloring/green_controller.json | 32 - .../misc/coloring/green_crafting_grid.json | 32 - .../misc/coloring/green_destructor.json | 32 - .../recipes/misc/coloring/green_detector.json | 32 - .../misc/coloring/green_disk_interface.json | 32 - .../recipes/misc/coloring/green_exporter.json | 32 - .../misc/coloring/green_external_storage.json | 32 - .../recipes/misc/coloring/green_grid.json | 32 - .../recipes/misc/coloring/green_importer.json | 32 - .../misc/coloring/green_network_receiver.json | 32 - .../coloring/green_network_transmitter.json | 32 - .../recipes/misc/coloring/green_relay.json | 32 - .../misc/coloring/green_security_manager.json | 32 - .../coloring/green_wireless_transmitter.json | 32 - .../misc/coloring/light_blue_cable.json | 32 - .../misc/coloring/light_blue_constructor.json | 32 - .../misc/coloring/light_blue_controller.json | 32 - .../coloring/light_blue_crafting_grid.json | 32 - .../misc/coloring/light_blue_destructor.json | 32 - .../misc/coloring/light_blue_detector.json | 32 - .../coloring/light_blue_disk_interface.json | 32 - .../misc/coloring/light_blue_exporter.json | 32 - .../coloring/light_blue_external_storage.json | 32 - .../misc/coloring/light_blue_grid.json | 32 - .../misc/coloring/light_blue_importer.json | 32 - .../coloring/light_blue_network_receiver.json | 32 - .../light_blue_network_transmitter.json | 32 - .../misc/coloring/light_blue_relay.json | 32 - .../coloring/light_blue_security_manager.json | 32 - .../light_blue_wireless_transmitter.json | 32 - .../misc/coloring/light_gray_cable.json | 32 - .../misc/coloring/light_gray_constructor.json | 32 - .../misc/coloring/light_gray_controller.json | 32 - .../coloring/light_gray_crafting_grid.json | 32 - .../misc/coloring/light_gray_destructor.json | 32 - .../misc/coloring/light_gray_detector.json | 32 - .../coloring/light_gray_disk_interface.json | 32 - .../misc/coloring/light_gray_exporter.json | 32 - .../coloring/light_gray_external_storage.json | 32 - .../misc/coloring/light_gray_grid.json | 32 - .../misc/coloring/light_gray_importer.json | 32 - .../coloring/light_gray_network_receiver.json | 32 - .../light_gray_network_transmitter.json | 32 - .../misc/coloring/light_gray_relay.json | 32 - .../coloring/light_gray_security_manager.json | 32 - .../light_gray_wireless_transmitter.json | 32 - .../recipes/misc/coloring/lime_cable.json | 32 - .../misc/coloring/lime_constructor.json | 32 - .../misc/coloring/lime_controller.json | 32 - .../misc/coloring/lime_crafting_grid.json | 32 - .../misc/coloring/lime_destructor.json | 32 - .../recipes/misc/coloring/lime_detector.json | 32 - .../misc/coloring/lime_disk_interface.json | 32 - .../recipes/misc/coloring/lime_exporter.json | 32 - .../misc/coloring/lime_external_storage.json | 32 - .../recipes/misc/coloring/lime_grid.json | 32 - .../recipes/misc/coloring/lime_importer.json | 32 - .../misc/coloring/lime_network_receiver.json | 32 - .../coloring/lime_network_transmitter.json | 32 - .../recipes/misc/coloring/lime_relay.json | 32 - .../misc/coloring/lime_security_manager.json | 32 - .../coloring/lime_wireless_transmitter.json | 32 - .../recipes/misc/coloring/magenta_cable.json | 32 - .../misc/coloring/magenta_constructor.json | 32 - .../misc/coloring/magenta_controller.json | 32 - .../misc/coloring/magenta_crafting_grid.json | 32 - .../misc/coloring/magenta_destructor.json | 32 - .../misc/coloring/magenta_detector.json | 32 - .../misc/coloring/magenta_disk_interface.json | 32 - .../misc/coloring/magenta_exporter.json | 32 - .../coloring/magenta_external_storage.json | 32 - .../recipes/misc/coloring/magenta_grid.json | 32 - .../misc/coloring/magenta_importer.json | 32 - .../coloring/magenta_network_receiver.json | 32 - .../coloring/magenta_network_transmitter.json | 32 - .../recipes/misc/coloring/magenta_relay.json | 32 - .../coloring/magenta_security_manager.json | 32 - .../magenta_wireless_transmitter.json | 32 - .../recipes/misc/coloring/orange_cable.json | 32 - .../misc/coloring/orange_constructor.json | 32 - .../misc/coloring/orange_controller.json | 32 - .../misc/coloring/orange_crafting_grid.json | 32 - .../misc/coloring/orange_destructor.json | 32 - .../misc/coloring/orange_detector.json | 32 - .../misc/coloring/orange_disk_interface.json | 32 - .../misc/coloring/orange_exporter.json | 32 - .../coloring/orange_external_storage.json | 32 - .../recipes/misc/coloring/orange_grid.json | 32 - .../misc/coloring/orange_importer.json | 32 - .../coloring/orange_network_receiver.json | 32 - .../coloring/orange_network_transmitter.json | 32 - .../recipes/misc/coloring/orange_relay.json | 32 - .../coloring/orange_security_manager.json | 32 - .../coloring/orange_wireless_transmitter.json | 32 - .../recipes/misc/coloring/pink_cable.json | 32 - .../misc/coloring/pink_constructor.json | 32 - .../misc/coloring/pink_controller.json | 32 - .../misc/coloring/pink_crafting_grid.json | 32 - .../misc/coloring/pink_destructor.json | 32 - .../recipes/misc/coloring/pink_detector.json | 32 - .../misc/coloring/pink_disk_interface.json | 32 - .../recipes/misc/coloring/pink_exporter.json | 32 - .../misc/coloring/pink_external_storage.json | 32 - .../recipes/misc/coloring/pink_grid.json | 32 - .../recipes/misc/coloring/pink_importer.json | 32 - .../misc/coloring/pink_network_receiver.json | 32 - .../coloring/pink_network_transmitter.json | 32 - .../recipes/misc/coloring/pink_relay.json | 32 - .../misc/coloring/pink_security_manager.json | 32 - .../coloring/pink_wireless_transmitter.json | 32 - .../recipes/misc/coloring/purple_cable.json | 32 - .../misc/coloring/purple_constructor.json | 32 - .../misc/coloring/purple_controller.json | 32 - .../misc/coloring/purple_crafting_grid.json | 32 - .../misc/coloring/purple_destructor.json | 32 - .../misc/coloring/purple_detector.json | 32 - .../misc/coloring/purple_disk_interface.json | 32 - .../misc/coloring/purple_exporter.json | 32 - .../coloring/purple_external_storage.json | 32 - .../recipes/misc/coloring/purple_grid.json | 32 - .../misc/coloring/purple_importer.json | 32 - .../coloring/purple_network_receiver.json | 32 - .../coloring/purple_network_transmitter.json | 32 - .../recipes/misc/coloring/purple_relay.json | 32 - .../coloring/purple_security_manager.json | 32 - .../coloring/purple_wireless_transmitter.json | 32 - .../recipes/misc/coloring/red_cable.json | 32 - .../misc/coloring/red_constructor.json | 32 - .../recipes/misc/coloring/red_controller.json | 32 - .../misc/coloring/red_crafting_grid.json | 32 - .../recipes/misc/coloring/red_destructor.json | 32 - .../recipes/misc/coloring/red_detector.json | 32 - .../misc/coloring/red_disk_interface.json | 32 - .../recipes/misc/coloring/red_exporter.json | 32 - .../misc/coloring/red_external_storage.json | 32 - .../recipes/misc/coloring/red_grid.json | 32 - .../recipes/misc/coloring/red_importer.json | 32 - .../misc/coloring/red_network_receiver.json | 32 - .../coloring/red_network_transmitter.json | 32 - .../recipes/misc/coloring/red_relay.json | 32 - .../misc/coloring/red_security_manager.json | 32 - .../coloring/red_wireless_transmitter.json | 32 - .../recipes/misc/coloring/white_cable.json | 32 - .../misc/coloring/white_constructor.json | 32 - .../misc/coloring/white_controller.json | 32 - .../misc/coloring/white_crafting_grid.json | 32 - .../misc/coloring/white_destructor.json | 32 - .../recipes/misc/coloring/white_detector.json | 32 - .../misc/coloring/white_disk_interface.json | 32 - .../recipes/misc/coloring/white_exporter.json | 32 - .../misc/coloring/white_external_storage.json | 32 - .../recipes/misc/coloring/white_grid.json | 32 - .../recipes/misc/coloring/white_importer.json | 32 - .../misc/coloring/white_network_receiver.json | 32 - .../coloring/white_network_transmitter.json | 32 - .../recipes/misc/coloring/white_relay.json | 32 - .../misc/coloring/white_security_manager.json | 32 - .../coloring/white_wireless_transmitter.json | 32 - .../recipes/misc/coloring/yellow_cable.json | 32 - .../misc/coloring/yellow_constructor.json | 32 - .../misc/coloring/yellow_controller.json | 32 - .../misc/coloring/yellow_crafting_grid.json | 32 - .../misc/coloring/yellow_destructor.json | 32 - .../misc/coloring/yellow_detector.json | 32 - .../misc/coloring/yellow_disk_interface.json | 32 - .../misc/coloring/yellow_exporter.json | 32 - .../coloring/yellow_external_storage.json | 32 - .../recipes/misc/coloring/yellow_grid.json | 32 - .../misc/coloring/yellow_importer.json | 32 - .../coloring/yellow_network_receiver.json | 32 - .../coloring/yellow_network_transmitter.json | 32 - .../recipes/misc/coloring/yellow_relay.json | 32 - .../coloring/yellow_security_manager.json | 32 - .../coloring/yellow_wireless_transmitter.json | 32 - .../loot_table/blocks/black_cable.json | 21 - .../loot_table/blocks/black_constructor.json | 21 - .../loot_table/blocks/black_controller.json | 26 - .../blocks/black_crafting_grid.json | 21 - .../blocks/black_creative_controller.json | 21 - .../loot_table/blocks/black_destructor.json | 21 - .../loot_table/blocks/black_detector.json | 21 - .../blocks/black_disk_interface.json | 21 - .../loot_table/blocks/black_grid.json | 21 - .../blocks/black_network_receiver.json | 21 - .../blocks/black_network_transmitter.json | 21 - .../loot_table/blocks/black_relay.json | 21 - .../blocks/black_security_manager.json | 21 - .../blocks/black_wireless_transmitter.json | 21 - .../loot_table/blocks/blue_cable.json | 21 - .../loot_table/blocks/blue_constructor.json | 21 - .../loot_table/blocks/blue_controller.json | 26 - .../loot_table/blocks/blue_crafting_grid.json | 21 - .../blocks/blue_creative_controller.json | 21 - .../loot_table/blocks/blue_destructor.json | 21 - .../loot_table/blocks/blue_detector.json | 21 - .../blocks/blue_disk_interface.json | 21 - .../loot_table/blocks/blue_grid.json | 21 - .../blocks/blue_network_receiver.json | 21 - .../blocks/blue_network_transmitter.json | 21 - .../loot_table/blocks/blue_relay.json | 21 - .../blocks/blue_security_manager.json | 21 - .../blocks/blue_wireless_transmitter.json | 21 - .../loot_table/blocks/brown_cable.json | 21 - .../loot_table/blocks/brown_constructor.json | 21 - .../loot_table/blocks/brown_controller.json | 26 - .../blocks/brown_crafting_grid.json | 21 - .../blocks/brown_creative_controller.json | 21 - .../loot_table/blocks/brown_destructor.json | 21 - .../loot_table/blocks/brown_detector.json | 21 - .../blocks/brown_disk_interface.json | 21 - .../loot_table/blocks/brown_grid.json | 21 - .../blocks/brown_network_receiver.json | 21 - .../blocks/brown_network_transmitter.json | 21 - .../loot_table/blocks/brown_relay.json | 21 - .../blocks/brown_security_manager.json | 21 - .../blocks/brown_wireless_transmitter.json | 21 - .../loot_table/blocks/cable.json | 21 - .../loot_table/blocks/constructor.json | 21 - .../loot_table/blocks/controller.json | 26 - .../loot_table/blocks/crafting_grid.json | 21 - .../blocks/creative_controller.json | 21 - .../loot_table/blocks/cyan_cable.json | 21 - .../loot_table/blocks/cyan_constructor.json | 21 - .../loot_table/blocks/cyan_controller.json | 26 - .../loot_table/blocks/cyan_crafting_grid.json | 21 - .../blocks/cyan_creative_controller.json | 21 - .../loot_table/blocks/cyan_destructor.json | 21 - .../loot_table/blocks/cyan_detector.json | 21 - .../blocks/cyan_disk_interface.json | 21 - .../loot_table/blocks/cyan_grid.json | 21 - .../blocks/cyan_network_receiver.json | 21 - .../blocks/cyan_network_transmitter.json | 21 - .../loot_table/blocks/cyan_relay.json | 21 - .../blocks/cyan_security_manager.json | 21 - .../blocks/cyan_wireless_transmitter.json | 21 - .../loot_table/blocks/destructor.json | 21 - .../loot_table/blocks/detector.json | 21 - .../loot_table/blocks/disk_interface.json | 21 - .../loot_table/blocks/gray_controller.json | 26 - .../loot_table/blocks/gray_crafting_grid.json | 21 - .../blocks/gray_creative_controller.json | 21 - .../loot_table/blocks/gray_detector.json | 21 - .../blocks/gray_disk_interface.json | 21 - .../loot_table/blocks/gray_grid.json | 21 - .../blocks/gray_network_receiver.json | 21 - .../blocks/gray_network_transmitter.json | 21 - .../loot_table/blocks/gray_relay.json | 21 - .../blocks/gray_security_manager.json | 21 - .../blocks/gray_wireless_transmitter.json | 21 - .../loot_table/blocks/green_cable.json | 21 - .../loot_table/blocks/green_constructor.json | 21 - .../loot_table/blocks/green_controller.json | 26 - .../blocks/green_crafting_grid.json | 21 - .../blocks/green_creative_controller.json | 21 - .../loot_table/blocks/green_destructor.json | 21 - .../loot_table/blocks/green_detector.json | 21 - .../blocks/green_disk_interface.json | 21 - .../loot_table/blocks/green_grid.json | 21 - .../blocks/green_network_receiver.json | 21 - .../blocks/green_network_transmitter.json | 21 - .../loot_table/blocks/green_relay.json | 21 - .../blocks/green_security_manager.json | 21 - .../blocks/green_wireless_transmitter.json | 21 - .../loot_table/blocks/grid.json | 21 - .../loot_table/blocks/light_blue_cable.json | 21 - .../blocks/light_blue_constructor.json | 21 - .../blocks/light_blue_destructor.json | 21 - .../loot_table/blocks/light_gray_cable.json | 21 - .../blocks/light_gray_constructor.json | 21 - .../blocks/light_gray_controller.json | 26 - .../blocks/light_gray_crafting_grid.json | 21 - .../light_gray_creative_controller.json | 21 - .../blocks/light_gray_destructor.json | 21 - .../blocks/light_gray_detector.json | 21 - .../blocks/light_gray_disk_interface.json | 21 - .../loot_table/blocks/light_gray_grid.json | 21 - .../blocks/light_gray_network_receiver.json | 21 - .../light_gray_network_transmitter.json | 21 - .../loot_table/blocks/light_gray_relay.json | 21 - .../blocks/light_gray_security_manager.json | 21 - .../light_gray_wireless_transmitter.json | 21 - .../loot_table/blocks/lime_cable.json | 21 - .../loot_table/blocks/lime_constructor.json | 21 - .../loot_table/blocks/lime_controller.json | 26 - .../loot_table/blocks/lime_crafting_grid.json | 21 - .../blocks/lime_creative_controller.json | 21 - .../loot_table/blocks/lime_destructor.json | 21 - .../loot_table/blocks/lime_detector.json | 21 - .../blocks/lime_disk_interface.json | 21 - .../loot_table/blocks/lime_grid.json | 21 - .../blocks/lime_network_receiver.json | 21 - .../blocks/lime_network_transmitter.json | 21 - .../loot_table/blocks/lime_relay.json | 21 - .../blocks/lime_security_manager.json | 21 - .../blocks/lime_wireless_transmitter.json | 21 - .../loot_table/blocks/magenta_cable.json | 21 - .../blocks/magenta_constructor.json | 21 - .../loot_table/blocks/magenta_controller.json | 26 - .../blocks/magenta_crafting_grid.json | 21 - .../blocks/magenta_creative_controller.json | 21 - .../loot_table/blocks/magenta_destructor.json | 21 - .../loot_table/blocks/magenta_detector.json | 21 - .../blocks/magenta_disk_interface.json | 21 - .../loot_table/blocks/magenta_grid.json | 21 - .../blocks/magenta_network_receiver.json | 21 - .../blocks/magenta_network_transmitter.json | 21 - .../loot_table/blocks/magenta_relay.json | 21 - .../blocks/magenta_security_manager.json | 21 - .../blocks/magenta_wireless_transmitter.json | 21 - .../loot_table/blocks/network_receiver.json | 21 - .../blocks/network_transmitter.json | 21 - .../loot_table/blocks/orange_cable.json | 21 - .../loot_table/blocks/orange_constructor.json | 21 - .../loot_table/blocks/orange_controller.json | 26 - .../blocks/orange_crafting_grid.json | 21 - .../blocks/orange_creative_controller.json | 21 - .../loot_table/blocks/orange_destructor.json | 21 - .../loot_table/blocks/orange_detector.json | 21 - .../blocks/orange_disk_interface.json | 21 - .../loot_table/blocks/orange_grid.json | 21 - .../blocks/orange_network_receiver.json | 21 - .../blocks/orange_network_transmitter.json | 21 - .../loot_table/blocks/orange_relay.json | 21 - .../blocks/orange_security_manager.json | 21 - .../blocks/orange_wireless_transmitter.json | 21 - .../loot_table/blocks/pink_cable.json | 21 - .../loot_table/blocks/pink_constructor.json | 21 - .../loot_table/blocks/pink_controller.json | 26 - .../loot_table/blocks/pink_crafting_grid.json | 21 - .../blocks/pink_creative_controller.json | 21 - .../loot_table/blocks/pink_destructor.json | 21 - .../loot_table/blocks/pink_detector.json | 21 - .../blocks/pink_disk_interface.json | 21 - .../loot_table/blocks/pink_grid.json | 21 - .../blocks/pink_network_receiver.json | 21 - .../blocks/pink_network_transmitter.json | 21 - .../loot_table/blocks/pink_relay.json | 21 - .../blocks/pink_security_manager.json | 21 - .../blocks/pink_wireless_transmitter.json | 21 - .../loot_table/blocks/purple_cable.json | 21 - .../loot_table/blocks/purple_constructor.json | 21 - .../loot_table/blocks/purple_controller.json | 26 - .../blocks/purple_crafting_grid.json | 21 - .../blocks/purple_creative_controller.json | 21 - .../loot_table/blocks/purple_destructor.json | 21 - .../loot_table/blocks/purple_detector.json | 21 - .../blocks/purple_disk_interface.json | 21 - .../loot_table/blocks/purple_grid.json | 21 - .../blocks/purple_network_receiver.json | 21 - .../blocks/purple_network_transmitter.json | 21 - .../loot_table/blocks/purple_relay.json | 21 - .../blocks/purple_security_manager.json | 21 - .../blocks/purple_wireless_transmitter.json | 21 - .../loot_table/blocks/red_cable.json | 21 - .../loot_table/blocks/red_constructor.json | 21 - .../loot_table/blocks/red_controller.json | 26 - .../loot_table/blocks/red_crafting_grid.json | 21 - .../blocks/red_creative_controller.json | 21 - .../loot_table/blocks/red_destructor.json | 21 - .../loot_table/blocks/red_detector.json | 21 - .../loot_table/blocks/red_disk_interface.json | 21 - .../loot_table/blocks/red_grid.json | 21 - .../blocks/red_network_receiver.json | 21 - .../blocks/red_network_transmitter.json | 21 - .../loot_table/blocks/red_relay.json | 21 - .../blocks/red_security_manager.json | 21 - .../blocks/red_wireless_transmitter.json | 21 - .../loot_table/blocks/relay.json | 21 - .../loot_table/blocks/security_manager.json | 21 - .../loot_table/blocks/white_cable.json | 21 - .../loot_table/blocks/white_constructor.json | 21 - .../loot_table/blocks/white_controller.json | 26 - .../blocks/white_crafting_grid.json | 21 - .../blocks/white_creative_controller.json | 21 - .../loot_table/blocks/white_destructor.json | 21 - .../loot_table/blocks/white_detector.json | 21 - .../blocks/white_disk_interface.json | 21 - .../loot_table/blocks/white_grid.json | 21 - .../blocks/white_network_receiver.json | 21 - .../blocks/white_network_transmitter.json | 21 - .../loot_table/blocks/white_relay.json | 21 - .../blocks/white_security_manager.json | 21 - .../blocks/white_wireless_transmitter.json | 21 - .../blocks/wireless_transmitter.json | 21 - .../loot_table/blocks/yellow_cable.json | 21 - .../loot_table/blocks/yellow_constructor.json | 21 - .../loot_table/blocks/yellow_controller.json | 26 - .../blocks/yellow_crafting_grid.json | 21 - .../blocks/yellow_creative_controller.json | 21 - .../loot_table/blocks/yellow_destructor.json | 21 - .../loot_table/blocks/yellow_detector.json | 21 - .../blocks/yellow_disk_interface.json | 21 - .../loot_table/blocks/yellow_grid.json | 21 - .../blocks/yellow_network_receiver.json | 21 - .../blocks/yellow_network_transmitter.json | 21 - .../loot_table/blocks/yellow_relay.json | 21 - .../blocks/yellow_security_manager.json | 21 - .../blocks/yellow_wireless_transmitter.json | 21 - .../recipe/coloring/black_cable.json | 16 - .../recipe/coloring/black_constructor.json | 16 - .../recipe/coloring/black_controller.json | 16 - .../recipe/coloring/black_crafting_grid.json | 16 - .../recipe/coloring/black_destructor.json | 16 - .../recipe/coloring/black_detector.json | 16 - .../recipe/coloring/black_disk_interface.json | 16 - .../recipe/coloring/black_exporter.json | 16 - .../coloring/black_external_storage.json | 16 - .../recipe/coloring/black_grid.json | 16 - .../recipe/coloring/black_importer.json | 16 - .../coloring/black_network_receiver.json | 16 - .../coloring/black_network_transmitter.json | 16 - .../recipe/coloring/black_relay.json | 16 - .../coloring/black_security_manager.json | 16 - .../coloring/black_wireless_transmitter.json | 16 - .../recipe/coloring/blue_cable.json | 16 - .../recipe/coloring/blue_constructor.json | 16 - .../recipe/coloring/blue_controller.json | 16 - .../recipe/coloring/blue_crafting_grid.json | 16 - .../recipe/coloring/blue_destructor.json | 16 - .../recipe/coloring/blue_detector.json | 16 - .../recipe/coloring/blue_disk_interface.json | 16 - .../recipe/coloring/blue_exporter.json | 16 - .../coloring/blue_external_storage.json | 16 - .../recipe/coloring/blue_grid.json | 16 - .../recipe/coloring/blue_importer.json | 16 - .../coloring/blue_network_receiver.json | 16 - .../coloring/blue_network_transmitter.json | 16 - .../recipe/coloring/blue_relay.json | 16 - .../coloring/blue_security_manager.json | 16 - .../coloring/blue_wireless_transmitter.json | 16 - .../recipe/coloring/brown_cable.json | 16 - .../recipe/coloring/brown_constructor.json | 16 - .../recipe/coloring/brown_controller.json | 16 - .../recipe/coloring/brown_crafting_grid.json | 16 - .../recipe/coloring/brown_destructor.json | 16 - .../recipe/coloring/brown_detector.json | 16 - .../recipe/coloring/brown_disk_interface.json | 16 - .../recipe/coloring/brown_exporter.json | 16 - .../coloring/brown_external_storage.json | 16 - .../recipe/coloring/brown_grid.json | 16 - .../recipe/coloring/brown_importer.json | 16 - .../coloring/brown_network_receiver.json | 16 - .../coloring/brown_network_transmitter.json | 16 - .../recipe/coloring/brown_relay.json | 16 - .../coloring/brown_security_manager.json | 16 - .../coloring/brown_wireless_transmitter.json | 16 - .../recipe/coloring/cyan_cable.json | 16 - .../recipe/coloring/cyan_constructor.json | 16 - .../recipe/coloring/cyan_controller.json | 16 - .../recipe/coloring/cyan_crafting_grid.json | 16 - .../recipe/coloring/cyan_destructor.json | 16 - .../recipe/coloring/cyan_detector.json | 16 - .../recipe/coloring/cyan_disk_interface.json | 16 - .../recipe/coloring/cyan_exporter.json | 16 - .../coloring/cyan_external_storage.json | 16 - .../recipe/coloring/cyan_grid.json | 16 - .../recipe/coloring/cyan_importer.json | 16 - .../coloring/cyan_network_receiver.json | 16 - .../coloring/cyan_network_transmitter.json | 16 - .../recipe/coloring/cyan_relay.json | 16 - .../coloring/cyan_security_manager.json | 16 - .../coloring/cyan_wireless_transmitter.json | 16 - .../recipe/coloring/gray_cable.json | 16 - .../recipe/coloring/gray_constructor.json | 16 - .../recipe/coloring/gray_controller.json | 16 - .../recipe/coloring/gray_crafting_grid.json | 16 - .../recipe/coloring/gray_destructor.json | 16 - .../recipe/coloring/gray_detector.json | 16 - .../recipe/coloring/gray_disk_interface.json | 16 - .../recipe/coloring/gray_exporter.json | 16 - .../coloring/gray_external_storage.json | 16 - .../recipe/coloring/gray_grid.json | 16 - .../recipe/coloring/gray_importer.json | 16 - .../coloring/gray_network_receiver.json | 16 - .../coloring/gray_network_transmitter.json | 16 - .../recipe/coloring/gray_relay.json | 16 - .../coloring/gray_security_manager.json | 16 - .../coloring/gray_wireless_transmitter.json | 16 - .../recipe/coloring/green_cable.json | 16 - .../recipe/coloring/green_constructor.json | 16 - .../recipe/coloring/green_controller.json | 16 - .../recipe/coloring/green_crafting_grid.json | 16 - .../recipe/coloring/green_destructor.json | 16 - .../recipe/coloring/green_detector.json | 16 - .../recipe/coloring/green_disk_interface.json | 16 - .../recipe/coloring/green_exporter.json | 16 - .../coloring/green_external_storage.json | 16 - .../recipe/coloring/green_grid.json | 16 - .../recipe/coloring/green_importer.json | 16 - .../coloring/green_network_receiver.json | 16 - .../coloring/green_network_transmitter.json | 16 - .../recipe/coloring/green_relay.json | 16 - .../coloring/green_security_manager.json | 16 - .../coloring/green_wireless_transmitter.json | 16 - .../recipe/coloring/light_blue_cable.json | 16 - .../coloring/light_blue_constructor.json | 16 - .../coloring/light_blue_controller.json | 16 - .../coloring/light_blue_crafting_grid.json | 16 - .../coloring/light_blue_destructor.json | 16 - .../recipe/coloring/light_blue_detector.json | 16 - .../coloring/light_blue_disk_interface.json | 16 - .../recipe/coloring/light_blue_exporter.json | 16 - .../coloring/light_blue_external_storage.json | 16 - .../recipe/coloring/light_blue_grid.json | 16 - .../recipe/coloring/light_blue_importer.json | 16 - .../coloring/light_blue_network_receiver.json | 16 - .../light_blue_network_transmitter.json | 16 - .../recipe/coloring/light_blue_relay.json | 16 - .../coloring/light_blue_security_manager.json | 16 - .../light_blue_wireless_transmitter.json | 16 - .../recipe/coloring/light_gray_cable.json | 16 - .../coloring/light_gray_constructor.json | 16 - .../coloring/light_gray_controller.json | 16 - .../coloring/light_gray_crafting_grid.json | 16 - .../coloring/light_gray_destructor.json | 16 - .../recipe/coloring/light_gray_detector.json | 16 - .../coloring/light_gray_disk_interface.json | 16 - .../recipe/coloring/light_gray_exporter.json | 16 - .../coloring/light_gray_external_storage.json | 16 - .../recipe/coloring/light_gray_grid.json | 16 - .../recipe/coloring/light_gray_importer.json | 16 - .../coloring/light_gray_network_receiver.json | 16 - .../light_gray_network_transmitter.json | 16 - .../recipe/coloring/light_gray_relay.json | 16 - .../coloring/light_gray_security_manager.json | 16 - .../light_gray_wireless_transmitter.json | 16 - .../recipe/coloring/lime_cable.json | 16 - .../recipe/coloring/lime_constructor.json | 16 - .../recipe/coloring/lime_controller.json | 16 - .../recipe/coloring/lime_crafting_grid.json | 16 - .../recipe/coloring/lime_destructor.json | 16 - .../recipe/coloring/lime_detector.json | 16 - .../recipe/coloring/lime_disk_interface.json | 16 - .../recipe/coloring/lime_exporter.json | 16 - .../coloring/lime_external_storage.json | 16 - .../recipe/coloring/lime_grid.json | 16 - .../recipe/coloring/lime_importer.json | 16 - .../coloring/lime_network_receiver.json | 16 - .../coloring/lime_network_transmitter.json | 16 - .../recipe/coloring/lime_relay.json | 16 - .../coloring/lime_security_manager.json | 16 - .../coloring/lime_wireless_transmitter.json | 16 - .../recipe/coloring/magenta_cable.json | 16 - .../recipe/coloring/magenta_constructor.json | 16 - .../recipe/coloring/magenta_controller.json | 16 - .../coloring/magenta_crafting_grid.json | 16 - .../recipe/coloring/magenta_destructor.json | 16 - .../recipe/coloring/magenta_detector.json | 16 - .../coloring/magenta_disk_interface.json | 16 - .../recipe/coloring/magenta_exporter.json | 16 - .../coloring/magenta_external_storage.json | 16 - .../recipe/coloring/magenta_grid.json | 16 - .../recipe/coloring/magenta_importer.json | 16 - .../coloring/magenta_network_receiver.json | 16 - .../coloring/magenta_network_transmitter.json | 16 - .../recipe/coloring/magenta_relay.json | 16 - .../coloring/magenta_security_manager.json | 16 - .../magenta_wireless_transmitter.json | 16 - .../recipe/coloring/orange_cable.json | 16 - .../recipe/coloring/orange_constructor.json | 16 - .../recipe/coloring/orange_controller.json | 16 - .../recipe/coloring/orange_crafting_grid.json | 16 - .../recipe/coloring/orange_destructor.json | 16 - .../recipe/coloring/orange_detector.json | 16 - .../coloring/orange_disk_interface.json | 16 - .../recipe/coloring/orange_exporter.json | 16 - .../coloring/orange_external_storage.json | 16 - .../recipe/coloring/orange_grid.json | 16 - .../recipe/coloring/orange_importer.json | 16 - .../coloring/orange_network_receiver.json | 16 - .../coloring/orange_network_transmitter.json | 16 - .../recipe/coloring/orange_relay.json | 16 - .../coloring/orange_security_manager.json | 16 - .../coloring/orange_wireless_transmitter.json | 16 - .../recipe/coloring/pink_cable.json | 16 - .../recipe/coloring/pink_constructor.json | 16 - .../recipe/coloring/pink_controller.json | 16 - .../recipe/coloring/pink_crafting_grid.json | 16 - .../recipe/coloring/pink_destructor.json | 16 - .../recipe/coloring/pink_detector.json | 16 - .../recipe/coloring/pink_disk_interface.json | 16 - .../recipe/coloring/pink_exporter.json | 16 - .../coloring/pink_external_storage.json | 16 - .../recipe/coloring/pink_grid.json | 16 - .../recipe/coloring/pink_importer.json | 16 - .../coloring/pink_network_receiver.json | 16 - .../coloring/pink_network_transmitter.json | 16 - .../recipe/coloring/pink_relay.json | 16 - .../coloring/pink_security_manager.json | 16 - .../coloring/pink_wireless_transmitter.json | 16 - .../recipe/coloring/purple_cable.json | 16 - .../recipe/coloring/purple_constructor.json | 16 - .../recipe/coloring/purple_controller.json | 16 - .../recipe/coloring/purple_crafting_grid.json | 16 - .../recipe/coloring/purple_destructor.json | 16 - .../recipe/coloring/purple_detector.json | 16 - .../coloring/purple_disk_interface.json | 16 - .../recipe/coloring/purple_exporter.json | 16 - .../coloring/purple_external_storage.json | 16 - .../recipe/coloring/purple_grid.json | 16 - .../recipe/coloring/purple_importer.json | 16 - .../coloring/purple_network_receiver.json | 16 - .../coloring/purple_network_transmitter.json | 16 - .../recipe/coloring/purple_relay.json | 16 - .../coloring/purple_security_manager.json | 16 - .../coloring/purple_wireless_transmitter.json | 16 - .../recipe/coloring/red_cable.json | 16 - .../recipe/coloring/red_constructor.json | 16 - .../recipe/coloring/red_controller.json | 16 - .../recipe/coloring/red_crafting_grid.json | 16 - .../recipe/coloring/red_destructor.json | 16 - .../recipe/coloring/red_detector.json | 16 - .../recipe/coloring/red_disk_interface.json | 16 - .../recipe/coloring/red_exporter.json | 16 - .../recipe/coloring/red_external_storage.json | 16 - .../recipe/coloring/red_grid.json | 16 - .../recipe/coloring/red_importer.json | 16 - .../recipe/coloring/red_network_receiver.json | 16 - .../coloring/red_network_transmitter.json | 16 - .../recipe/coloring/red_relay.json | 16 - .../recipe/coloring/red_security_manager.json | 16 - .../coloring/red_wireless_transmitter.json | 16 - .../recipe/coloring/white_cable.json | 16 - .../recipe/coloring/white_constructor.json | 16 - .../recipe/coloring/white_controller.json | 16 - .../recipe/coloring/white_crafting_grid.json | 16 - .../recipe/coloring/white_destructor.json | 16 - .../recipe/coloring/white_detector.json | 16 - .../recipe/coloring/white_disk_interface.json | 16 - .../recipe/coloring/white_exporter.json | 16 - .../coloring/white_external_storage.json | 16 - .../recipe/coloring/white_grid.json | 16 - .../recipe/coloring/white_importer.json | 16 - .../coloring/white_network_receiver.json | 16 - .../coloring/white_network_transmitter.json | 16 - .../recipe/coloring/white_relay.json | 16 - .../coloring/white_security_manager.json | 16 - .../coloring/white_wireless_transmitter.json | 16 - .../recipe/coloring/yellow_cable.json | 16 - .../recipe/coloring/yellow_constructor.json | 16 - .../recipe/coloring/yellow_controller.json | 16 - .../recipe/coloring/yellow_crafting_grid.json | 16 - .../recipe/coloring/yellow_destructor.json | 16 - .../recipe/coloring/yellow_detector.json | 16 - .../coloring/yellow_disk_interface.json | 16 - .../recipe/coloring/yellow_exporter.json | 16 - .../coloring/yellow_external_storage.json | 16 - .../recipe/coloring/yellow_grid.json | 16 - .../recipe/coloring/yellow_importer.json | 16 - .../coloring/yellow_network_receiver.json | 16 - .../coloring/yellow_network_transmitter.json | 16 - .../recipe/coloring/yellow_relay.json | 16 - .../coloring/yellow_security_manager.json | 16 - .../coloring/yellow_wireless_transmitter.json | 16 - .../refinedstorage2/tags/item/cables.json | 20 - .../tags/item/constructors.json | 20 - .../tags/item/controllers.json | 20 - .../tags/item/crafting_grids.json | 20 - .../tags/item/creative_controllers.json | 20 - .../tags/item/destructors.json | 20 - .../refinedstorage2/tags/item/detectors.json | 20 - .../tags/item/disk_interfaces.json | 20 - .../refinedstorage2/tags/item/exporters.json | 20 - .../tags/item/external_storages.json | 20 - .../tags/item/fluid_storage_disks.json | 8 - .../data/refinedstorage2/tags/item/grids.json | 20 - .../refinedstorage2/tags/item/importers.json | 20 - .../tags/item/network_receivers.json | 20 - .../tags/item/network_transmitters.json | 20 - .../refinedstorage2/tags/item/relays.json | 20 - .../tags/item/security_managers.json | 20 - .../tags/item/storage_disks.json | 8 - .../tags/item/wireless_transmitters.json | 20 - .../common/AbstractClientModInitializer.java | 135 -- .../common/AbstractModInitializer.java | 886 ------------ .../platform/common/PlatformApiImpl.java | 576 -------- .../configurationcard/package-info.java | 7 - .../CompositeConstructorStrategy.java | 32 - .../CompositeDestructorStrategy.java | 33 - .../ConstructorBlock.java | 49 - .../ConstructorContainerMenu.java | 65 - .../ConstructorDestructorPropertyTypes.java | 18 - .../ConstructorDropItemsSideButtonWidget.java | 22 - .../ConstructorScreen.java | 30 - .../DestructorBlock.java | 49 - .../DestructorContainerMenu.java | 78 -- ...DestructorPickupItemsSideButtonWidget.java | 22 - .../DestructorScreen.java | 29 - .../FluidBreakDestructorStrategyFactory.java | 22 - .../ItemDropConstructorStrategyFactory.java | 36 - .../ItemPickupDestructorStrategyFactory.java | 30 - .../PlaceFluidConstructorStrategy.java | 59 - .../constructordestructor/package-info.java | 7 - .../platform/common/content/package-info.java | 7 - .../controller/ControllerBlockItem.java | 66 - .../controller/ControllerContainerMenu.java | 59 - .../common/controller/ControllerScreen.java | 57 - .../common/controller/ControllerType.java | 6 - .../CreativeControllerBlockItem.java | 17 - .../common/controller/package-info.java | 7 - .../detector/DetectorContainerMenu.java | 59 - .../detector/DetectorPropertyTypes.java | 17 - .../common/detector/DetectorScreen.java | 24 - .../detector/FuzzyDetectorAmountStrategy.java | 29 - .../common/detector/package-info.java | 7 - .../common/exporter/ExporterBlock.java | 93 -- .../exporter/ExporterContainerMenu.java | 47 - .../common/exporter/ExporterScreen.java | 25 - .../FuzzyExporterTransferStrategy.java | 29 - .../common/exporter/package-info.java | 7 - .../common/grid/AbstractGridBlock.java | 30 - .../common/grid/AbstractGridBlockEntity.java | 107 -- .../common/grid/AbstractGridSynchronizer.java | 18 - .../common/grid/CraftingGridBlock.java | 61 - .../grid/CraftingGridMatrixCloseBehavior.java | 7 - .../grid/CraftingGridRefillContext.java | 12 - .../platform/common/grid/GridBlock.java | 61 - .../common/grid/GridContainerMenu.java | 27 - .../platform/common/grid/GridData.java | 45 - .../common/grid/GridSortingTypes.java | 37 - .../common/grid/PortableGridData.java | 20 - .../common/grid/SecuredGridOperations.java | 54 - .../platform/common/grid/WirelessGrid.java | 96 -- .../common/grid/WirelessGridData.java | 15 - .../common/grid/WirelessGridItem.java | 49 - .../common/grid/WirelessGridOperations.java | 56 - .../platform/common/grid/package-info.java | 7 - .../screen/AutoSelectedSideButtonWidget.java | 52 - .../common/grid/screen/GridScreen.java | 25 - .../screen/hint/FluidGridInsertionHint.java | 33 - .../screen/hint/ItemGridInsertionHint.java | 21 - .../hint/SingleItemGridInsertionHint.java | 20 - .../common/grid/screen/hint/package-info.java | 7 - .../common/grid/screen/package-info.java | 7 - .../ClientGridExtractionStrategy.java | 16 - .../strategy/ClientGridInsertionStrategy.java | 18 - .../strategy/ClientGridScrollingStrategy.java | 14 - .../CompositeGridExtractionStrategy.java | 28 - .../CompositeGridScrollingStrategy.java | 26 - .../common/grid/strategy/package-info.java | 7 - .../view/CompositeGridResourceFactory.java | 25 - .../common/grid/view/FluidGridResource.java | 106 -- .../common/grid/view/package-info.java | 7 - .../common/iface/InterfaceScreen.java | 40 - .../platform/common/iface/package-info.java | 7 - .../common/importer/ImporterBlock.java | 93 -- .../importer/ImporterContainerMenu.java | 78 -- .../common/importer/ImporterScreen.java | 31 - .../common/importer/package-info.java | 7 - .../platform/common/misc/WrenchItem.java | 25 - .../platform/common/misc/package-info.java | 7 - .../networking/NetworkReceiverBlock.java | 81 -- .../NetworkReceiverBlockEntity.java | 34 - .../NetworkTransmitterBlockEntityTicker.java | 25 - .../common/networking/RelayBlock.java | 71 - .../RelayPassEnergySideButtonWidget.java | 36 - .../RelayPassSecuritySideButtonWidget.java | 36 - .../RelayPassStorageSideButtonWidget.java | 36 - .../RelayPassThroughSideButtonWidget.java | 36 - .../common/networking/RelayPropertyTypes.java | 24 - .../common/networking/package-info.java | 7 - .../platform/common/package-info.java | 7 - ...tractSecurityCardExtendedMenuProvider.java | 32 - .../security/FallbackSecurityCardItem.java | 53 - .../PlatformSecurityNetworkComponentImpl.java | 31 - .../common/security/PlayerSecurityActor.java | 8 - .../common/security/SecurityCardData.java | 32 - .../common/security/SecurityManagerBlock.java | 75 - .../SecurityManagerContainerMenu.java | 72 - .../security/SecurityManagerScreen.java | 61 - .../common/security/package-info.java | 7 - .../platform/common/storage/Disk.java | 10 - .../storage/LimitedPlatformStorage.java | 23 - .../common/storage/PlatformStorage.java | 78 -- .../common/storage/StorageAccessor.java | 11 - .../StorageConfigurationContainer.java | 31 - .../common/storage/StoragePropertyTypes.java | 26 - .../platform/common/storage/StorageTypes.java | 34 - .../storage/VoidExcessSideButtonWidget.java | 46 - .../storage/diskdrive/DiskDriveBlock.java | 59 - .../storage/diskdrive/DiskDriveScreen.java | 32 - .../EmptyStorageDiskInfoAccessor.java | 14 - .../diskdrive/StorageDiskInfoAccessor.java | 11 - .../StorageDiskInfoAccessorImpl.java | 25 - .../storage/diskdrive/package-info.java | 7 - .../diskinterface/DiskInterfaceBlock.java | 83 -- .../DiskInterfaceContainerMenu.java | 128 -- .../DiskInterfacePropertyTypes.java | 17 - .../diskinterface/DiskInterfaceScreen.java | 66 - .../storage/diskinterface/package-info.java | 7 - .../ExternalStorageContainerMenu.java | 57 - .../ExternalStorageScreen.java | 24 - .../storage/externalstorage/package-info.java | 7 - .../platform/common/storage/package-info.java | 7 - .../AbstractPortableGridContainerMenu.java | 83 -- .../storage/portablegrid/PortableGrid.java | 122 -- .../PortableGridBlockContainerMenu.java | 39 - .../PortableGridBlockItemRenderInfo.java | 6 - .../PortableGridItemContainerMenu.java | 38 - .../PortableGridItemExtendedMenuProvider.java | 63 - .../portablegrid/PortableGridOperations.java | 49 - .../portablegrid/PortableGridStorage.java | 25 - .../portablegrid/PortableGridType.java | 6 - .../storage/portablegrid/package-info.java | 7 - .../AbstractStorageBlockContainerMenu.java | 87 -- .../AbstractStorageBlockScreen.java | 24 - .../storageblock/FluidStorageBlock.java | 27 - .../FluidStorageBlockContainerMenu.java | 35 - .../storageblock/ItemStorageBlock.java | 27 - .../ItemStorageBlockContainerMenu.java | 35 - .../storage/storageblock/package-info.java | 7 - .../storagedisk/FluidStorageDiskItem.java | 83 -- .../storagedisk/ItemStorageDiskItem.java | 73 - .../storage/storagedisk/package-info.java | 7 - ...ositeStorageMonitorExtractionStrategy.java | 33 - ...positeStorageMonitorInsertionStrategy.java | 32 - ...FluidStorageMonitorExtractionStrategy.java | 41 - .../FluidStorageMonitorInsertionStrategy.java | 64 - .../ItemStorageMonitorExtractionStrategy.java | 40 - .../ItemStorageMonitorInsertionStrategy.java | 40 - .../StorageMonitorContainerMenu.java | 56 - .../storagemonitor/StorageMonitorScreen.java | 40 - .../common/storagemonitor/package-info.java | 7 - .../common/support/AbstractFilterScreen.java | 38 - .../common/support/BlockEntityWithDrops.java | 9 - .../common/support/BlockItemProvider.java | 8 - .../common/support/CableShapeCacheKey.java | 23 - .../support/ClientToServerCommunications.java | 45 - .../common/support/ColorableBlock.java | 17 - .../support/PlayerAwareBlockEntity.java | 7 - .../platform/common/support/SimpleBlock.java | 11 - .../platform/common/support/SimpleItem.java | 9 - .../platform/common/support/TextureIds.java | 12 - .../common/support/amount/package-info.java | 7 - .../support/containermenu/MenuOpener.java | 8 - .../NetworkNodeExtendedMenuProvider.java | 4 - .../NetworkNodeMenuProvider.java | 18 - .../support/containermenu/Property.java | 11 - .../support/containermenu/PropertyTypes.java | 52 - .../containermenu/ResourceSlotType.java | 7 - .../containermenu/SingleAmountData.java | 22 - .../containermenu/TransferDestination.java | 11 - .../support/containermenu/package-info.java | 7 - .../support/direction/package-info.java | 7 - .../energy/BlockEntityEnergyStorage.java | 20 - .../support/energy/CreativeEnergyStorage.java | 31 - .../support/energy/EnergyContainerMenu.java | 6 - .../support/energy/ItemEnergyStorage.java | 26 - .../common/support/energy/package-info.java | 7 - ...dulingNetworkNodeContainerBlockEntity.java | 93 -- .../InventorySlotReferenceProvider.java | 27 - .../network/bounditem/package-info.java | 7 - .../PlatformStorageNetworkComponent.java | 29 - .../network/component/package-info.java | 7 - .../common/support/network/package-info.java | 7 - .../platform/common/support/package-info.java | 7 - .../common/support/packet/PacketContext.java | 8 - .../common/support/packet/PacketHandler.java | 6 - .../c2s/CraftingGridRecipeTransferPacket.java | 40 - .../support/packet/c2s/GridExtractPacket.java | 40 - .../support/packet/c2s/GridInsertPacket.java | 33 - .../support/packet/c2s/GridScrollPacket.java | 40 - .../c2s/ResourceFilterSlotChangePacket.java | 38 - .../c2s/SecurityCardPermissionPacket.java | 37 - .../SecurityCardResetPermissionPacket.java | 34 - .../packet/c2s/StorageInfoRequestPacket.java | 41 - .../packet/c2s/UseNetworkBoundItemPacket.java | 47 - .../support/packet/c2s/package-info.java | 7 - .../common/support/packet/package-info.java | 7 - .../support/packet/s2c/GridClearPacket.java | 32 - .../support/packet/s2c/GridUpdatePacket.java | 42 - .../packet/s2c/ResourceSlotUpdatePacket.java | 41 - .../support/packet/s2c/package-info.java | 7 - .../common/support/registry/package-info.java | 7 - .../common/support/render/package-info.java | 7 - .../support/resource/FluidResource.java | 39 - .../resource/FluidResourceFactory.java | 25 - .../support/resource/FluidResourceType.java | 87 -- .../support/resource/ItemResourceFactory.java | 24 - .../support/resource/ItemResourceType.java | 89 -- .../support/resource/ResourceTypes.java | 11 - .../support/resource/list/package-info.java | 7 - .../common/support/resource/package-info.java | 7 - .../stretching/ScreenSizeListener.java | 6 - .../support/stretching/package-info.java | 7 - .../common/support/tooltip/package-info.java | 7 - .../widget/AbstractYesNoSideButtonWidget.java | 33 - .../common/support/widget/package-info.java | 7 - .../BuiltinUpgradeDestinationsImpl.java | 31 - .../common/upgrade/RangeUpgradeItem.java | 40 - .../RegulatorUpgradeContainerMenu.java | 53 - .../upgrade/RegulatorUpgradeScreen.java | 14 - .../platform/common/upgrade/package-info.java | 7 - .../platform/common/util/package-info.java | 7 - .../BaseWirelessTransmitterRangeModifier.java | 12 - ...gradeWirelessTransmitterRangeModifier.java | 20 - ...gradeWirelessTransmitterRangeModifier.java | 15 - .../WirelessTransmitterScreen.java | 50 - .../wirelesstransmitter/package-info.java | 7 - .../1024b_fluid_storage_block.json | 7 - .../blockstates/16k_storage_block.json | 7 - .../blockstates/1k_storage_block.json | 7 - .../blockstates/256b_fluid_storage_block.json | 7 - .../4096b_fluid_storage_block.json | 7 - .../blockstates/4k_storage_block.json | 7 - .../blockstates/64b_fluid_storage_block.json | 7 - .../blockstates/64k_storage_block.json | 7 - .../creative_fluid_storage_block.json | 7 - .../blockstates/creative_portable_grid.json | 7 - .../blockstates/creative_storage_block.json | 7 - .../blockstates/disk_drive.json | 7 - .../blockstates/interface.json | 10 - .../blockstates/machine_casing.json | 7 - .../blockstates/portable_grid.json | 7 - .../quartz_enriched_copper_block.json | 7 - .../quartz_enriched_iron_block.json | 7 - .../blockstates/storage_monitor.json | 57 - .../assets/refinedstorage2/lang/de_de.json | 452 ------ .../assets/refinedstorage2/lang/en_us.json | 473 ------- .../assets/refinedstorage2/lang/es_es.json | 452 ------ .../assets/refinedstorage2/lang/fr_fr.json | 452 ------ .../assets/refinedstorage2/lang/hu_hu.json | 452 ------ .../assets/refinedstorage2/lang/id_id.json | 452 ------ .../assets/refinedstorage2/lang/it_it.json | 452 ------ .../assets/refinedstorage2/lang/ja_jp.json | 452 ------ .../assets/refinedstorage2/lang/ko_kr.json | 452 ------ .../assets/refinedstorage2/lang/nl_nl.json | 367 ----- .../assets/refinedstorage2/lang/pl_pl.json | 452 ------ .../assets/refinedstorage2/lang/pt_br.json | 452 ------ .../assets/refinedstorage2/lang/ru_ru.json | 452 ------ .../assets/refinedstorage2/lang/zh_cn.json | 452 ------ .../assets/refinedstorage2/lang/zh_tw.json | 452 ------ .../block/1024b_fluid_storage_block.json | 6 - .../models/block/16k_storage_block.json | 6 - .../models/block/1k_storage_block.json | 6 - .../block/256b_fluid_storage_block.json | 6 - .../block/4096b_fluid_storage_block.json | 6 - .../models/block/4k_storage_block.json | 6 - .../models/block/64b_fluid_storage_block.json | 6 - .../models/block/64k_storage_block.json | 6 - .../models/block/constructor/active.json | 8 - .../models/block/constructor/inactive.json | 8 - .../block/constructor_destructor/active.json | 165 --- .../constructor_destructor/inactive.json | 161 --- .../models/block/controller/nearly_off.json | 9 - .../models/block/controller/nearly_on.json | 9 - .../models/block/controller/off.json | 8 - .../block/creative_fluid_storage_block.json | 6 - .../models/block/creative_portable_grid.json | 4 - .../models/block/creative_storage_block.json | 6 - .../models/block/destructor/active.json | 8 - .../models/block/destructor/inactive.json | 8 - .../models/block/disk_drive.json | 4 - .../models/block/disk_drive/base.json | 50 - .../models/block/exporter.json | 215 --- .../models/block/external_storage.json | 137 -- .../models/block/importer.json | 215 --- .../models/block/interface_active.json | 6 - .../models/block/interface_inactive.json | 6 - .../models/block/machine_casing.json | 6 - .../models/block/portable_grid.json | 4 - .../models/block/portable_grid/active.json | 6 - .../models/block/portable_grid/base.json | 558 -------- .../models/block/portable_grid/inactive.json | 6 - .../block/quartz_enriched_copper_block.json | 6 - .../block/quartz_enriched_iron_block.json | 6 - .../models/block/storage_monitor.json | 12 - .../block/wireless_transmitter/active.json | 233 ---- .../block/wireless_transmitter/inactive.json | 210 --- .../item/1024b_fluid_storage_block.json | 3 - .../models/item/1024b_fluid_storage_disk.json | 6 - .../models/item/1024b_fluid_storage_part.json | 6 - .../models/item/16k_storage_block.json | 3 - .../models/item/16k_storage_disk.json | 6 - .../models/item/16k_storage_part.json | 6 - .../models/item/1k_storage_block.json | 3 - .../models/item/1k_storage_disk.json | 6 - .../models/item/1k_storage_part.json | 6 - .../models/item/256b_fluid_storage_block.json | 3 - .../models/item/256b_fluid_storage_disk.json | 6 - .../models/item/256b_fluid_storage_part.json | 6 - .../item/4096b_fluid_storage_block.json | 3 - .../models/item/4096b_fluid_storage_disk.json | 6 - .../models/item/4096b_fluid_storage_part.json | 6 - .../models/item/4k_storage_block.json | 3 - .../models/item/4k_storage_disk.json | 6 - .../models/item/4k_storage_part.json | 6 - .../models/item/64b_fluid_storage_block.json | 3 - .../models/item/64b_fluid_storage_disk.json | 6 - .../models/item/64b_fluid_storage_part.json | 6 - .../models/item/64k_storage_block.json | 3 - .../models/item/64k_storage_disk.json | 6 - .../models/item/64k_storage_part.json | 6 - .../models/item/advanced_processor.json | 6 - .../models/item/basic_processor.json | 6 - .../refinedstorage2/models/item/book.json | 6 - .../models/item/configuration_card.json | 17 - .../item/configuration_card/active.json | 6 - .../item/configuration_card/inactive.json | 6 - .../models/item/construction_core.json | 6 - .../models/item/constructor/base.json | 392 ------ .../item/creative_fluid_storage_block.json | 3 - .../item/creative_fluid_storage_disk.json | 6 - .../models/item/creative_portable_grid.json | 3 - .../models/item/creative_range_upgrade.json | 6 - .../models/item/creative_storage_block.json | 3 - .../models/item/creative_storage_disk.json | 6 - .../models/item/creative_wireless_grid.json | 17 - .../models/item/destruction_core.json | 6 - .../models/item/destructor/base.json | 392 ------ .../models/item/disk_drive.json | 4 - .../models/item/exporter/base.json | 440 ------ .../models/item/external_storage/base.json | 362 ----- .../models/item/fallback_security_card.json | 6 - .../models/item/fortune_1_upgrade.json | 6 - .../models/item/fortune_2_upgrade.json | 6 - .../models/item/fortune_3_upgrade.json | 6 - .../models/item/importer/base.json | 440 ------ .../models/item/improved_processor.json | 6 - .../models/item/interface.json | 3 - .../models/item/machine_casing.json | 3 - .../models/item/network_card.json | 17 - .../models/item/network_card/active.json | 6 - .../models/item/network_card/inactive.json | 6 - .../models/item/portable_grid.json | 3 - .../models/item/processor_binding.json | 6 - .../models/item/quartz_enriched_copper.json | 6 - .../item/quartz_enriched_copper_block.json | 3 - .../models/item/quartz_enriched_iron.json | 6 - .../item/quartz_enriched_iron_block.json | 3 - .../models/item/range_upgrade.json | 6 - .../models/item/raw_advanced_processor.json | 6 - .../models/item/raw_basic_processor.json | 6 - .../models/item/raw_improved_processor.json | 6 - .../models/item/regulator_upgrade.json | 6 - .../models/item/security_card.json | 17 - .../models/item/security_card/active.json | 6 - .../models/item/security_card/inactive.json | 6 - .../refinedstorage2/models/item/silicon.json | 6 - .../models/item/silk_touch_upgrade.json | 6 - .../models/item/speed_upgrade.json | 6 - .../models/item/stack_upgrade.json | 6 - .../models/item/storage_housing.json | 6 - .../models/item/storage_monitor.json | 3 - .../refinedstorage2/models/item/upgrade.json | 6 - .../models/item/wireless_grid.json | 17 - .../models/item/wireless_grid/active.json | 6 - .../models/item/wireless_grid/inactive.json | 6 - .../refinedstorage2/models/item/wrench.json | 6 - .../assets/refinedstorage2/sounds.json | 8 - .../block/relay/cutouts/out/black.png | Bin 2958 -> 0 bytes .../textures/block/relay/cutouts/out/blue.png | Bin 2957 -> 0 bytes .../block/relay/cutouts/out/brown.png | Bin 2975 -> 0 bytes .../textures/block/relay/cutouts/out/cyan.png | Bin 2985 -> 0 bytes .../textures/block/relay/cutouts/out/gray.png | Bin 2968 -> 0 bytes .../block/relay/cutouts/out/green.png | Bin 2978 -> 0 bytes .../block/relay/cutouts/out/inactive.png | Bin 268 -> 0 bytes .../block/relay/cutouts/out/light_blue.png | Bin 338 -> 0 bytes .../block/relay/cutouts/out/light_gray.png | Bin 2956 -> 0 bytes .../textures/block/relay/cutouts/out/lime.png | Bin 2974 -> 0 bytes .../block/relay/cutouts/out/magenta.png | Bin 2968 -> 0 bytes .../block/relay/cutouts/out/orange.png | Bin 2955 -> 0 bytes .../textures/block/relay/cutouts/out/pink.png | Bin 2930 -> 0 bytes .../block/relay/cutouts/out/purple.png | Bin 2988 -> 0 bytes .../textures/block/relay/cutouts/out/red.png | Bin 2961 -> 0 bytes .../block/relay/cutouts/out/white.png | Bin 2929 -> 0 bytes .../block/relay/cutouts/out/yellow.png | Bin 2955 -> 0 bytes .../data/c/tags/item/tools/wrench.json | 6 - .../advancement/better_than_a_barrel.json | 26 - .../advancement/conditional_connecting.json | 26 - .../advancement/connecting.json | 26 - .../advancement/construction.json | 26 - .../advancement/destruction.json | 26 - .../advancement/detecting.json | 26 - .../refinedstorage2/advancement/drives.json | 26 - .../advancement/exporting.json | 26 - .../advancement/importing.json | 26 - .../advancement/interface_to_the_world.json | 26 - .../advancement/interfacing_with_disks.json | 26 - .../advancement/no_cables_required.json | 34 - .../advancement/portable_storage.json | 26 - .../refinedstorage2/advancement/root.json | 26 - .../refinedstorage2/advancement/security.json | 32 - .../advancement/storing_externally.json | 26 - .../advancement/storing_fluids.json | 26 - .../advancement/storing_items.json | 26 - .../advancement/upgrading.json | 26 - .../advancement/upgrading_your_grid.json | 26 - .../advancement/viewing_your_storage.json | 26 - .../refinedstorage2/advancement/wireless.json | 31 - .../blocks/1024b_fluid_storage_block.json | 19 - .../loot_table/blocks/16k_storage_block.json | 19 - .../loot_table/blocks/1k_storage_block.json | 19 - .../blocks/256b_fluid_storage_block.json | 19 - .../blocks/4096b_fluid_storage_block.json | 19 - .../loot_table/blocks/4k_storage_block.json | 19 - .../blocks/64b_fluid_storage_block.json | 19 - .../loot_table/blocks/64k_storage_block.json | 19 - .../blocks/creative_fluid_storage_block.json | 19 - .../blocks/creative_portable_grid.json | 19 - .../blocks/creative_storage_block.json | 19 - .../loot_table/blocks/disk_drive.json | 19 - .../loot_table/blocks/exporter.json | 19 - .../loot_table/blocks/external_storage.json | 19 - .../loot_table/blocks/importer.json | 19 - .../loot_table/blocks/interface.json | 19 - .../loot_table/blocks/machine_casing.json | 19 - .../loot_table/blocks/portable_grid.json | 19 - .../blocks/quartz_enriched_iron_block.json | 19 - .../loot_table/blocks/storage_monitor.json | 19 - .../recipe/1024b_fluid_storage_block.json | 25 - .../recipe/1024b_fluid_storage_disk.json | 25 - ...uid_storage_disk_from_storage_housing.json | 14 - .../recipe/1024b_fluid_storage_part.json | 25 - .../recipe/16k_storage_block.json | 25 - .../recipe/16k_storage_disk.json | 25 - ...16k_storage_disk_from_storage_housing.json | 14 - .../recipe/16k_storage_part.json | 25 - .../recipe/1k_storage_block.json | 25 - .../recipe/1k_storage_disk.json | 25 - .../1k_storage_disk_from_storage_housing.json | 14 - .../recipe/1k_storage_part.json | 25 - .../recipe/256b_fluid_storage_block.json | 25 - .../recipe/256b_fluid_storage_disk.json | 25 - ...uid_storage_disk_from_storage_housing.json | 14 - .../recipe/256b_fluid_storage_part.json | 25 - .../recipe/4096b_fluid_storage_block.json | 25 - .../recipe/4096b_fluid_storage_disk.json | 25 - ...uid_storage_disk_from_storage_housing.json | 14 - .../recipe/4096b_fluid_storage_part.json | 25 - .../recipe/4k_storage_block.json | 25 - .../recipe/4k_storage_disk.json | 25 - .../4k_storage_disk_from_storage_housing.json | 14 - .../recipe/4k_storage_part.json | 25 - .../recipe/64b_fluid_storage_block.json | 25 - .../recipe/64b_fluid_storage_disk.json | 25 - ...uid_storage_disk_from_storage_housing.json | 14 - .../recipe/64b_fluid_storage_part.json | 25 - .../recipe/64k_storage_block.json | 25 - .../recipe/64k_storage_disk.json | 25 - ...64k_storage_disk_from_storage_housing.json | 14 - .../recipe/64k_storage_part.json | 25 - .../recipe/advanced_processor.json | 10 - .../recipe/basic_processor.json | 10 - .../data/refinedstorage2/recipe/cable.json | 23 - .../recipe/configuration_card.json | 22 - .../recipe/construction_core.json | 14 - .../refinedstorage2/recipe/constructor.json | 28 - .../refinedstorage2/recipe/controller.json | 25 - .../refinedstorage2/recipe/crafting_grid.json | 17 - .../recipe/destruction_core.json | 14 - .../refinedstorage2/recipe/destructor.json | 28 - .../data/refinedstorage2/recipe/detector.json | 28 - .../refinedstorage2/recipe/disk_drive.json | 25 - .../recipe/disk_interface.json | 28 - .../data/refinedstorage2/recipe/exporter.json | 17 - .../recipe/external_storage.json | 31 - .../recipe/fallback_security_card.json | 14 - .../recipe/fortune_1_upgrade.json | 8 - .../recipe/fortune_2_upgrade.json | 8 - .../recipe/fortune_3_upgrade.json | 8 - .../data/refinedstorage2/recipe/grid.json | 31 - .../data/refinedstorage2/recipe/importer.json | 17 - .../recipe/improved_processor.json | 10 - .../refinedstorage2/recipe/interface.json | 28 - .../recipe/machine_casing.json | 19 - .../refinedstorage2/recipe/network_card.json | 22 - .../recipe/network_receiver.json | 31 - .../recipe/network_transmitter.json | 31 - .../refinedstorage2/recipe/portable_grid.json | 22 - .../recipe/processor_binding.json | 20 - .../recipe/quartz_enriched_copper.json | 19 - .../recipe/quartz_enriched_copper_block.json | 16 - .../quartz_enriched_copper_from_block.json | 12 - .../recipe/quartz_enriched_iron.json | 19 - .../recipe/quartz_enriched_iron_block.json | 16 - .../quartz_enriched_iron_from_block.json | 12 - .../refinedstorage2/recipe/range_upgrade.json | 22 - .../recipe/raw_advanced_processor.json | 20 - .../recipe/raw_basic_processor.json | 20 - .../recipe/raw_improved_processor.json | 20 - .../recipe/regulator_upgrade.json | 25 - .../data/refinedstorage2/recipe/relay.json | 20 - .../refinedstorage2/recipe/security_card.json | 22 - .../recipe/security_manager.json | 28 - .../data/refinedstorage2/recipe/silicon.json | 10 - .../recipe/silk_touch_upgrade.json | 7 - .../refinedstorage2/recipe/speed_upgrade.json | 22 - .../refinedstorage2/recipe/stack_upgrade.json | 19 - .../recipe/storage_housing.json | 22 - .../recipe/storage_monitor.json | 31 - .../data/refinedstorage2/recipe/upgrade.json | 22 - .../refinedstorage2/recipe/wireless_grid.json | 25 - .../recipe/wireless_transmitter.json | 25 - .../data/refinedstorage2/recipe/wrench.json | 19 - .../storage/LimitedPlatformStorageTest.java | 29 - refinedstorage2-platform-fabric/build.gradle | 31 - .../platform/fabric/ConfigImpl.java | 695 ---------- .../platform/fabric/PlatformImpl.java | 369 ----- ...torageExporterTransferStrategyFactory.java | 63 - .../fabric/exporter/package-info.java | 7 - .../strategy/FluidGridExtractionStrategy.java | 149 -- .../strategy/FluidGridInsertionStrategy.java | 112 -- .../strategy/ItemGridExtractionStrategy.java | 62 - .../strategy/ItemGridInsertionStrategy.java | 86 -- .../strategy/ItemGridScrollingStrategy.java | 86 -- .../fabric/grid/strategy/package-info.java | 7 - .../fabric/grid/view/package-info.java | 7 - ...torageImporterTransferStrategyFactory.java | 56 - .../fabric/importer/package-info.java | 7 - .../platform/fabric/mixin/package-info.java | 7 - .../platform/fabric/modmenu/package-info.java | 7 - .../platform/fabric/package-info.java | 7 - .../fabric/security/package-info.java | 7 - .../diskdrive/DiskDriveBakedModel.java | 74 - .../DiskDriveBlockEntityRendererImpl.java | 24 - .../diskdrive/FabricDiskDriveBlockEntity.java | 20 - .../storage/diskdrive/package-info.java | 7 - .../DiskInterfaceBakedModel.java | 92 -- .../DiskInterfaceBlockEntityRendererImpl.java | 24 - .../FabricDiskInterfaceBlockEntity.java | 20 - .../storage/diskinterface/package-info.java | 7 - .../storage/externalstorage/package-info.java | 7 - .../platform/fabric/storage/package-info.java | 7 - .../FabricPortableGridBlockEntity.java | 21 - .../portablegrid/PortableGridBakedModel.java | 125 -- .../PortableGridBlockEntityRendererImpl.java | 27 - .../storage/portablegrid/package-info.java | 7 - .../ContainerTransferDestination.java | 29 - .../support/containermenu/MenuOpenerImpl.java | 45 - .../support/containermenu/package-info.java | 7 - .../support/energy/EnergyStorageAdapter.java | 58 - .../fabric/support/energy/package-info.java | 7 - .../fabric/support/render/QuadRotators.java | 20 - .../fabric/support/render/RenderTypes.java | 24 - .../fabric/support/render/package-info.java | 7 - .../fabric/support/resource/VariantUtil.java | 28 - .../fabric/support/resource/package-info.java | 7 - .../platform/fabric/util/package-info.java | 7 - .../src/main/resources/fabric.mod.json | 51 - .../resources/refinedstorage2.mixins.json | 16 - refinedstorage2-platform-forge/build.gradle | 10 - .../platform/forge/ClientModInitializer.java | 230 ---- .../platform/forge/ConfigImpl.java | 873 ------------ .../platform/forge/PlatformImpl.java | 325 ----- .../forge/datagen/loot/package-info.java | 7 - .../platform/forge/datagen/package-info.java | 7 - .../forge/datagen/recipe/package-info.java | 7 - .../datagen/tag/ItemTagsProviderImpl.java | 137 -- .../forge/datagen/tag/package-info.java | 7 - ...andlerExporterTransferStrategyFactory.java | 39 - ...andlerExporterTransferStrategyFactory.java | 33 - .../platform/forge/exporter/package-info.java | 7 - .../strategy/FluidGridExtractionStrategy.java | 153 --- .../strategy/FluidGridInsertionStrategy.java | 75 - .../strategy/ItemGridExtractionStrategy.java | 47 - .../strategy/ItemGridInsertionStrategy.java | 76 - .../strategy/ItemGridScrollingStrategy.java | 77 -- .../forge/grid/strategy/package-info.java | 7 - .../view/ForgeFluidGridResourceFactory.java | 30 - .../forge/grid/view/package-info.java | 7 - .../importer/FluidHandlerImporterSource.java | 42 - ...andlerImporterTransferStrategyFactory.java | 34 - .../importer/ItemHandlerImporterSource.java | 42 - ...andlerImporterTransferStrategyFactory.java | 31 - .../platform/forge/importer/package-info.java | 7 - .../platform/forge/package-info.java | 7 - .../FluidHandlerExtractableStorage.java | 43 - .../FluidHandlerInsertableStorage.java | 51 - .../diskdrive/DiskDriveBakedModel.java | 162 --- .../DiskDriveBlockEntityRendererImpl.java | 18 - .../forge/storage/diskdrive/package-info.java | 7 - .../DiskInterfaceBakedModel.java | 170 --- .../DiskInterfaceBlockEntityRendererImpl.java | 18 - .../storage/diskinterface/package-info.java | 7 - .../FluidHandlerExternalStorageProvider.java | 42 - ...latformExternalStorageProviderFactory.java | 20 - .../ItemHandlerExternalStorageProvider.java | 42 - ...latformExternalStorageProviderFactory.java | 20 - .../storage/externalstorage/package-info.java | 7 - .../platform/forge/storage/package-info.java | 7 - .../storage/portablegrid/DiskLedBakers.java | 20 - .../ForgePortableGridBlockEntity.java | 32 - .../portablegrid/PortableGridBakedModel.java | 140 -- .../PortableGridBlockEntityRendererImpl.java | 21 - .../storage/portablegrid/package-info.java | 7 - .../ContainerTransferDestination.java | 16 - .../support/containermenu/MenuOpenerImpl.java | 26 - .../support/containermenu/package-info.java | 7 - .../support/energy/EnergyStorageAdapter.java | 48 - .../forge/support/energy/package-info.java | 7 - .../forge/support/inventory/package-info.java | 7 - .../forge/support/render/RenderTypes.java | 24 - .../forge/support/render/package-info.java | 7 - .../forge/support/resource/VariantUtil.java | 49 - .../forge/support/resource/package-info.java | 7 - refinedstorage2-query-parser/build.gradle | 21 - .../query/lexer/LexerTokenMapping.java | 5 - .../query/lexer/TokenType.java | 11 - .../query/lexer/package-info.java | 7 - .../query/parser/Associativity.java | 6 - .../query/parser/Operator.java | 4 - .../query/parser/ParserException.java | 16 - .../query/parser/node/BinOpNode.java | 12 - .../query/parser/node/LiteralNode.java | 11 - .../query/parser/node/Node.java | 4 - .../query/parser/node/UnaryOpNode.java | 10 - .../query/parser/node/package-info.java | 7 - .../query/parser/package-info.java | 7 - .../src/main/resources/fabric.mod.json | 19 - .../query/parser/ParserBuilder.java | 39 - refinedstorage2-resource-api/build.gradle | 21 - .../api/resource/ResourceKey.java | 7 - .../api/resource/filter/FilterMode.java | 9 - .../api/resource/filter/package-info.java | 7 - .../list/listenable/package-info.java | 7 - .../api/resource/list/package-info.java | 7 - .../api/resource/package-info.java | 7 - .../src/main/resources/fabric.mod.json | 19 - .../api/resource/TestResource.java | 7 - .../resource/list/ResourceListImplTest.java | 8 - refinedstorage2-storage-api/build.gradle | 26 - .../api/storage/NoopStorage.java | 33 - .../api/storage/TrackedResourceAmount.java | 12 - .../api/storage/channel/StorageChannel.java | 67 - .../storage/channel/StorageChannelImpl.java | 95 -- .../api/storage/channel/package-info.java | 7 - .../storage/composite/PriorityProvider.java | 17 - .../api/storage/composite/package-info.java | 7 - .../external/ExternalStorageListener.java | 11 - .../external/ExternalStorageProvider.java | 14 - .../api/storage/external/package-info.java | 7 - .../api/storage/limited/LimitedStorage.java | 10 - .../storage/limited/LimitedStorageImpl.java | 55 - .../api/storage/limited/package-info.java | 7 - .../api/storage/package-info.java | 7 - .../api/storage/tracked/TrackedStorage.java | 24 - .../tracked/TrackedStorageRepository.java | 15 - .../api/storage/tracked/package-info.java | 7 - .../src/main/resources/fabric.mod.json | 19 - .../api/storage/TestResource.java | 9 - .../external/ExternalStorageProviderImpl.java | 32 - .../external/ExternalTestResource.java | 11 - .../SpyingExternalStorageListener.java | 18 - .../storage/external/TransformingStorage.java | 39 - settings.gradle | 26 +- 5814 files changed, 78321 insertions(+), 78328 deletions(-) delete mode 100644 .idea/dictionaries/refinedstorage2.xml create mode 100644 refinedstorage-core-api/build.gradle create mode 100644 refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/Action.java rename {refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage}/api/core/CoreValidations.java (97%) rename {refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage}/api/core/FieldsAndMethodsAreNonnullByDefault.java (88%) rename {refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage}/api/core/component/ComponentAccessor.java (76%) rename {refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage}/api/core/component/ComponentMap.java (93%) rename {refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage}/api/core/component/ComponentMapFactory.java (95%) create mode 100644 refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/package-info.java create mode 100644 refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/package-info.java create mode 100644 refinedstorage-core-api/src/main/resources/fabric.mod.json rename {refinedstorage2-core-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage}/api/core/CoreValidationsTest.java (99%) rename {refinedstorage2-core-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage}/api/core/component/ComponentMapFactoryTest.java (98%) create mode 100644 refinedstorage-grid-api/build.gradle rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/operations/GridExtractMode.java (88%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/operations/GridInsertMode.java (83%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/operations/GridOperations.java (79%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/operations/GridOperationsImpl.java (85%) create mode 100644 refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/NoopGridOperations.java create mode 100644 refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/package-info.java create mode 100644 refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParser.java rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/query/GridQueryParserException.java (85%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/query/GridQueryParserImpl.java (87%) create mode 100644 refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/package-info.java rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/view/GridResource.java (77%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/view/GridResourceAttributeKey.java (79%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/view/GridResourceFactory.java (84%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/view/GridSortingDirection.java (75%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/view/GridSortingType.java (83%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/view/GridView.java (91%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/view/GridViewBuilder.java (78%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/view/GridViewBuilderImpl.java (82%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/view/GridViewImpl.java (95%) create mode 100644 refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/package-info.java rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/watcher/GridWatcher.java (80%) create mode 100644 refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManager.java rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/watcher/GridWatcherManagerImpl.java (94%) rename {refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage}/api/grid/watcher/GridWatcherRegistration.java (83%) create mode 100644 refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/package-info.java create mode 100644 refinedstorage-grid-api/src/main/resources/fabric.mod.json create mode 100644 refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/TestResource.java rename {refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage}/api/grid/query/GridQueryParserImplTest.java (95%) rename {refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage}/api/grid/service/GridOperationsImplTest.java (92%) rename {refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage}/api/grid/view/FakeGridResourceAttributeKeys.java (86%) rename {refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage}/api/grid/view/GridResourceImpl.java (86%) rename {refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage}/api/grid/view/GridViewImplTest.java (97%) rename {refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage}/api/grid/watcher/GridWatcherManagerImplTest.java (89%) create mode 100644 refinedstorage-network-api/build.gradle create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/ConnectionProvider.java rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/Connections.java (84%) create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/Network.java rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/NetworkBuilder.java (90%) rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/NetworkComponent.java (77%) create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyNetworkComponent.java rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/energy/EnergyProvider.java (83%) rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/energy/EnergyStorage.java (86%) create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/package-info.java rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/node/GraphNetworkComponent.java (82%) create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/NetworkNode.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/NetworkNodeActor.java rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/node/container/NetworkNodeContainer.java (82%) create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/container/package-info.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/exporter/ExporterTransferStrategy.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/exporter/package-info.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/externalstorage/ExternalStorageProviderFactory.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/externalstorage/package-info.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/importer/ImporterTransferStrategy.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/importer/package-info.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/package-info.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/Task.java rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/node/task/TaskExecutor.java (79%) create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/package-info.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/package-info.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/Permission.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityActor.java rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/security/SecurityDecision.java (84%) rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/security/SecurityDecisionProvider.java (89%) create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityNetworkComponent.java rename {refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage}/api/network/security/SecurityPolicy.java (90%) create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/package-info.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageNetworkComponent.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageProvider.java create mode 100644 refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/package-info.java create mode 100644 refinedstorage-network-api/src/main/resources/fabric.mod.json create mode 100644 refinedstorage-network-test/build.gradle rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/AddNetworkNode.java (90%) rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/InjectNetwork.java (85%) rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/InjectNetworkEnergyComponent.java (85%) rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/InjectNetworkSecurityComponent.java (85%) rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/InjectNetworkStorageComponent.java (85%) create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTest.java rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/NetworkTestExtension.java (91%) create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestFixtures.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/RegisterNetworkNode.java rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/RegisterNetworkNodes.java (84%) rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/SetupNetwork.java (90%) rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/SetupNetworks.java (85%) create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeActor.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakePermissions.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeResources.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeSecurityActors.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/package-info.java rename {refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage}/network/test/nodefactory/AbstractNetworkNodeFactory.java (75%) create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ControllerNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/DetectorNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExporterNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/GridNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ImporterNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/InterfaceNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/NetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayInputNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayOutputNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/SimpleNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageTransferNetworkNodeFactory.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/package-info.java create mode 100644 refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/package-info.java rename {refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage}/network/test/InheritanceNetworkTestExtensionTest.java (77%) create mode 100644 refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkNodeFactoryTest.java rename {refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage}/network/test/NetworkTestExtensionTest.java (85%) create mode 100644 refinedstorage-network/build.gradle rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/NetworkBuilderImpl.java (92%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkFactory.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkImpl.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/energy/AbstractListeningEnergyStorage.java (80%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/energy/AbstractProxyEnergyStorage.java (78%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/energy/EnergyNetworkComponentImpl.java (85%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/energy/EnergyStorageImpl.java (81%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/package-info.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/AbstractNetworkNode.java (77%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/AbstractStorageContainerNetworkNode.java (93%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/GraphNetworkComponentImpl.java (93%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/SimpleNetworkNode.java (85%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/container/NetworkNodeContainerPriorities.java (93%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerEnergyState.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/controller/ControllerNetworkNode.java (83%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategy.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategyImpl.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorMode.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/detector/DetectorNetworkNode.java (87%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/CompositeExporterTransferStrategy.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/exporter/ExporterNetworkNode.java (75%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java (75%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/package-info.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/externalstorage/ExposedExternalStorage.java (79%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/GridNetworkNode.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/package-info.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/InterfaceExportState.java (76%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/InterfaceNetworkNode.java (88%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProvider.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImpl.java (80%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterNetworkNode.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterSource.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/importer/ImporterTransferStrategyImpl.java (80%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayComponentType.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/relay/RelayInputNetworkNode.java (83%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/relay/RelayOutputNetworkNode.java (75%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/relay/RelayOutputStorage.java (83%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/package-info.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/security/SecurityDecisionProviderProxyNetworkNode.java (79%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/security/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/ExposedStorage.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/storage/StorageNetworkNode.java (78%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferListener.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferMode.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java (84%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/DefaultTaskExecutor.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/task/RandomTaskExecutor.java (78%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/node/task/RoundRobinTaskExecutor.java (86%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/package-info.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/package-info.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/security/SecurityDecisionProviderImpl.java (76%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/security/SecurityNetworkComponentImpl.java (80%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/package-info.java rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/storage/AbstractConfiguredProxyStorage.java (84%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/storage/AbstractImmutableConfiguredProxyStorage.java (85%) rename {refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/main/java/com/refinedmods/refinedstorage}/api/network/impl/storage/NetworkNodeStorageConfiguration.java (78%) create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageConfiguration.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImpl.java create mode 100644 refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/package-info.java create mode 100644 refinedstorage-network/src/main/resources/fabric.mod.json rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/AbstractNetworkBuilderImplTest.java (88%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/FakeConnectionProvider.java (90%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/InitializeNetworkBuilderImplTest.java (97%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/PriorityNetworkBuilderImplTest.java (80%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/RemoveNetworkBuilderImplTest.java (97%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/SpyingNetworkNode.java (80%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/UpdateNetworkBuilderImplTest.java (98%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/energy/EnergyNetworkComponentImplTest.java (92%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/energy/EnergyStorageImplTest.java (95%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/energy/ListeningEnergyStorageTest.java (95%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/energy/ProxyEnergyStorageTest.java (87%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/GraphNetworkComponentImplTest.java (95%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/ProviderImpl.java (81%) create mode 100644 refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNodeTest.java rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/controller/ControllerNetworkNodeTest.java (90%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/detector/DetectorNetworkNodeTest.java (83%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/exporter/AbstractExporterNetworkNodeTest.java (88%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java (76%) create mode 100644 refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/RandomExporterNetworkNodeTest.java rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java (87%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java (93%) create mode 100644 refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageProviderFactoryImpl.java create mode 100644 refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/StorageExternalStorageProvider.java rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/grid/GridNetworkNodeTest.java (79%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/ClearSlotInterfaceNetworkNodeTest.java (87%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/ExportToEmptySlotInterfaceNetworkNodeTest.java (82%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/InterfaceExportStateImpl.java (90%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/InterfaceNetworkNodeTest.java (81%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/KeepExportingInterfaceNetworkNodeTest.java (92%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImplTest.java (87%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/iface/externalstorage/IoLoopInterfaceExternalStorageProviderImplTest.java (87%) create mode 100644 refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/SelfIoInterfaceExternalStorageProviderImplTest.java create mode 100644 refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/FakeImporterSource.java rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/importer/ImporterNetworkNodeTest.java (90%) create mode 100644 refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/relay/RelayNetworkNodeTest.java (89%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java (78%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java (92%) create mode 100644 refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/storage/StorageNetworkNodeTest.java (91%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java (94%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/security/SecurityNetworkComponentImplTest.java (92%) rename {refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-network/src/test/java/com/refinedmods/refinedstorage}/api/network/impl/storage/StorageNetworkComponentImplTest.java (76%) create mode 100644 refinedstorage-platform-api/build.gradle create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/PlatformApiProxy.java (77%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/RefinedStoragePlugin.java (78%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/configurationcard/ConfigurationCardTarget.java (90%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategy.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/constructordestructor/ConstructorStrategyFactory.java (81%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/constructordestructor/DestructorStrategy.java (75%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/constructordestructor/DestructorStrategyFactory.java (81%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/exporter/AmountOverride.java (83%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/ExporterTransferStrategyFactory.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/Grid.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/grid/GridInsertionHint.java (86%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/grid/GridInsertionHints.java (86%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridResourceAttributeKeys.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridScrollMode.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/grid/GridSynchronizer.java (90%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategy.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategyFactory.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategy.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategyFactory.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategy.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategyFactory.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/grid/view/AbstractPlatformGridResource.java (81%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/ImporterTransferStrategyFactory.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/security/BuiltinPermissions.java (84%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/security/PlatformPermission.java (84%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformSecurityNetworkComponent.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/security/SecurityHelper.java (75%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/security/SecurityPolicyContainerItem.java (82%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/storage/AbstractStorageContainerBlockItem.java (96%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/storage/AbstractStorageContainerItem.java (96%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/storage/PlayerActor.java (81%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/SerializableStorage.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/storage/StorageBlockEntity.java (87%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/storage/StorageContainerItem.java (90%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/storage/StorageContainerItemHelper.java (97%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageInfo.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/storage/StorageRepository.java (94%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/storage/StorageType.java (78%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/FuzzyStorageChannel.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/AmountFormatting.java (96%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/HelpTooltipComponent.java (88%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/energy/AbstractEnergyBlockItem.java (96%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/energy/AbstractEnergyItem.java (95%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java (86%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/energy/EnergyItemHelper.java (90%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/TransferableBlockEntityEnergy.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java (93%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/network/ConnectionLogic.java (82%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/network/ConnectionSink.java (83%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/InWorldNetworkNodeContainer.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/NetworkNodeContainerBlockEntity.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/network/bounditem/NetworkBoundItemHelper.java (91%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemSession.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/network/bounditem/SlotReference.java (83%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/network/bounditem/SlotReferenceFactory.java (88%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/network/bounditem/SlotReferenceProvider.java (80%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/registry/PlatformRegistry.java (95%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/resource/AbstractResourceType.java (95%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FuzzyModeNormalizer.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/PlatformResourceKey.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/resource/RecipeModIngredientConverter.java (81%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/resource/ResourceContainer.java (86%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceFactory.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/support/resource/ResourceRendering.java (84%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/FuzzyResourceList.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/package-info.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/upgrade/AbstractUpgradeItem.java (94%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/upgrade/BuiltinUpgradeDestinations.java (85%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/upgrade/UpgradeDestination.java (82%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeItem.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/upgrade/UpgradeMapping.java (90%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/upgrade/UpgradeRegistry.java (91%) rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/upgrade/UpgradeState.java (78%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/package-info.java rename {refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage}/platform/api/wirelesstransmitter/WirelessTransmitter.java (82%) create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java create mode 100644 refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/package-info.java create mode 100644 refinedstorage-platform-api/src/main/resources/fabric.mod.json rename {refinedstorage2-platform-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-api/src/test/java/com/refinedmods/refinedstorage}/platform/api/support/AmountFormattingTest.java (98%) create mode 100644 refinedstorage-platform-common/build.gradle create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/inactive.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/inactive.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/inactive.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/inactive.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/error.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/inactive.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/inactive.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/inactive.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/black.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/brown.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/cyan.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/green.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_blue.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_gray.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/lime.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/magenta.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/orange.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/pink.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/purple.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/red.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/white.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/yellow.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_creative_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_cable.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_constructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_controller.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafting_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_destructor.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_detector.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_disk_interface.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_exporter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_external_storage.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_grid.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_importer.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_receiver.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_relay.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_security_manager.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/cables.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/constructors.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/controllers.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/crafting_grids.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/creative_controllers.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/destructors.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/detectors.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/disk_interfaces.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/exporters.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/external_storages.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/fluid_storage_disks.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/grids.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/importers.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_receivers.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_transmitters.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/relays.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/security_managers.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/storage_disks.json create mode 100644 refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/wireless_transmitters.json create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/AbstractPlatform.java (75%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/Config.java (91%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/Platform.java (83%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/PlatformProxy.java (91%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/configurationcard/ConfigurationCardItem.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/configurationcard/ConfigurationCardState.java (96%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/AbstractItemConstructorStrategy.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/BlockBreakDestructorStrategy.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java (82%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeConstructorStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeDestructorStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/ConstructorBlockEntity.java (80%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/DestructorBlockEntity.java (77%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorScreen.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/FluidBreakDestructorStrategy.java (79%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/ItemDropConstructorStrategy.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/ItemPickupDestructorStrategy.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java (83%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/BlockColorMap.java (96%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/BlockConstants.java (89%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/BlockEntities.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/BlockEntityTypeFactory.java (89%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/BlockFactory.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/Blocks.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/ColorMap.java (97%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/ContentIds.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/ContentNames.java (90%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/CreativeModeTabItems.java (95%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/DataComponents.java (88%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/DefaultEnergyUsage.java (97%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/DirectRegistryCallback.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/ExtendedMenuTypeFactory.java (90%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/Items.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/KeyMappings.java (96%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/LootFunctions.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/MenuTypeFactory.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/Menus.java (78%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/RegistryCallback.java (77%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/Sounds.java (88%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/content/Tags.java (91%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/controller/AbstractControllerBlock.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/controller/ControllerBlock.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/controller/ControllerBlockEntity.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/controller/ControllerBlockEntityTicker.java (76%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockItem.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerContainerMenu.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/controller/ControllerData.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/controller/ControllerEnergyType.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/controller/ControllerItemPropertyFunction.java (86%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerType.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/controller/CreativeControllerBlock.java (79%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlockItem.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/detector/DetectorBlock.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/detector/DetectorBlockEntity.java (80%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorContainerMenu.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/detector/DetectorModeSettings.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/detector/DetectorModeSideButtonWidget.java (80%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorPropertyTypes.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/FuzzyDetectorAmountStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/exporter/ExporterBlockEntity.java (76%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/FuzzyExporterTransferStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlock.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlockEntity.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/AbstractGridContainerMenu.java (82%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridSynchronizer.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/ClientCraftingGridSource.java (88%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/CraftingGridBlockEntity.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/CraftingGridContainerMenu.java (88%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridMatrixCloseBehavior.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContext.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/CraftingGridRefillContextImpl.java (78%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/CraftingGridResultSlot.java (95%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/CraftingGridSource.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/CraftingGridSourceImpl.java (92%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/CraftingMatrix.java (88%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/CraftingMatrixContainerMenu.java (93%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/GridBlockEntity.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridData.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/GridSearchBox.java (79%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypes.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/NoopGridSynchronizer.java (85%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/PortableGridData.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SecuredGridOperations.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/SnapshotCraftingGridRefillContext.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGrid.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/WirelessGridContainerMenu.java (76%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridData.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/WirelessGridExtendedMenuProvider.java (77%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridItem.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridOperations.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/AbstractGridScreen.java (90%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AutoSelectedSideButtonWidget.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/CraftingGridScreen.java (89%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridScreen.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/GridSearchBoxWidget.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/LastModified.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/ResourceTypeSideButtonWidget.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/SortingDirectionSideButtonWidget.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/SortingTypeSideButtonWidget.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/SynchronizationSideButtonWidget.java (79%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/hint/GridInsertionHintsImpl.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridExtractionStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridInsertionStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridScrollingStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridExtractionStrategy.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/strategy/CompositeGridInsertionStrategy.java (83%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridScrollingStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/view/AbstractFluidGridResourceFactory.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/view/AbstractItemGridResourceFactory.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/CompositeGridResourceFactory.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/grid/view/ItemGridResource.java (79%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/iface/ExportedResourcesContainer.java (78%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/iface/InterfaceBlock.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/iface/InterfaceBlockEntity.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/iface/InterfaceContainerMenu.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/iface/InterfaceData.java (78%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java (75%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/iface/InterfaceProxyExternalStorageProvider.java (77%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/importer/ImporterBlockEntity.java (78%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/misc/ProcessorItem.java (89%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/WrenchItem.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/CableBlock.java (77%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkCardInventory.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkCardItem.java (90%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkCardItemPropertyFunction.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlock.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlockEntity.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkReceiverKey.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkTransmitterBlock.java (78%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkTransmitterBlockEntity.java (88%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntityTicker.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkTransmitterContainerMenu.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkTransmitterData.java (93%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkTransmitterScreen.java (75%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/NetworkTransmitterState.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/RelayBlockEntity.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/RelayContainerMenu.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/RelayInputNetworkNodeContainer.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/RelayOutputNetworkNodeContainer.java (81%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassEnergySideButtonWidget.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassSecuritySideButtonWidget.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassStorageSideButtonWidget.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassThroughSideButtonWidget.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPropertyTypes.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/networking/RelayScreen.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/AbstractSecurityCardContainerMenu.java (89%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/AbstractSecurityCardItem.java (88%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/AbstractSecurityCardScreen.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/BuiltinPermission.java (77%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/FallbackSecurityCardContainerMenu.java (77%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java (79%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardItem.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/FallbackSecurityCardScreen.java (87%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlatformSecurityNetworkComponentImpl.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/PlayerBoundSecurityCardData.java (96%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerSecurityActor.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/SecurityCardBoundPlayer.java (95%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/SecurityCardContainerMenu.java (85%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardData.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/SecurityCardExtendedMenuProvider.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/SecurityCardItem.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/SecurityCardItemPropertyFunction.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/SecurityCardPermissions.java (90%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/SecurityCardScreen.java (96%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/security/SecurityManagerBlockEntity.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/AbstractDiskContainerBlockEntity.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/AbstractProgressStorageScreen.java (92%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/AbstractStorageContainerMenu.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/AbstractStorageScreen.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/AccessModeSettings.java (85%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/AccessModeSideButtonWidget.java (85%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/BucketPlayerInventoryInsertableStorage.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/ClientStorageRepository.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/Disk.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/DiskContainerBlockEntityTicker.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/DiskInventory.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/DiskStateChangeListener.java (91%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/FilterModeSideButtonWidget.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/FluidStorageType.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/ItemStorageType.java (80%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorage.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PlatformStorage.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/PrioritySideButtonWidget.java (79%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageAccessor.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/StorageCodecs.java (89%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainer.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/StorageConfigurationContainerImpl.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/StorageContainerItemHelperImpl.java (91%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StoragePropertyTypes.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/StorageRepositoryImpl.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/StorageTooltipHelper.java (90%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/VoidExcessSideButtonWidget.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java (86%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/diskdrive/DiskDriveContainerMenu.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java (86%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceBlock.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceScreen.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/diskinterface/TransferModeSettings.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/externalstorage/ExternalStorageBlock.java (78%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java (84%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageScreen.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/externalstorage/ExternalStorageWorkRate.java (91%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java (86%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/portablegrid/InWorldPortableGrid.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGrid.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/portablegrid/PortableGridBlock.java (86%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/portablegrid/PortableGridBlockItem.java (85%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/portablegrid/PortableGridLootItemFunction.java (81%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridOperations.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/portablegrid/PortableGridScreen.java (89%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridStorage.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridType.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/AbstractStorageBlock.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java (81%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java (77%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java (76%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/FluidStorageBlockScreen.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java (77%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/ItemStorageBlockScreen.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/StorageBlockData.java (78%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storage/storageblock/StorageBlockLootItemFunction.java (77%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storagemonitor/StorageMonitorBlock.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storagemonitor/StorageMonitorBlockEntity.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java (90%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorContainerMenu.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/storagemonitor/StorageMonitorInsertTracker.java (87%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/AbstractActiveColoredDirectionalBlock.java (96%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/AbstractBaseBlock.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/AbstractBaseContainerMenu.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/AbstractBaseScreen.java (88%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/AbstractBlockEntityTicker.java (93%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/AbstractColoredBlock.java (92%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/AbstractDirectionalBlock.java (95%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/AbstractDirectionalCableBlock.java (94%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractFilterScreen.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/AbstractSafeSavedData.java (96%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/BaseBlockItem.java (89%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockEntityWithDrops.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockItemProvider.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/CableBlockSupport.java (96%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableShapeCacheKey.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ClientToServerCommunications.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ColorableBlock.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/DirectionalCableBlockShapes.java (98%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/FilterModeSettings.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/FilterWithFuzzyMode.java (92%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/FilteredContainer.java (88%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/NetworkNodeBlockItem.java (88%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/PlayerAwareBlockEntity.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/RedstoneMode.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/RedstoneModeSettings.java (91%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/SchedulingMode.java (93%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/SchedulingModeType.java (83%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleBlock.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleItem.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/TextureIds.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/amount/AbstractAmountScreen.java (97%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/amount/AbstractSingleAmountScreen.java (88%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/amount/AmountOperations.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/amount/AmountScreenConfiguration.java (99%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/amount/DoubleAmountOperations.java (96%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/amount/IntegerAmountOperations.java (95%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/amount/LongAmountOperations.java (91%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/amount/PriorityScreen.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/amount/ResourceAmountScreen.java (82%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/AbstractResourceContainerMenu.java (90%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java (77%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java (84%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/ClientProperty.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/DisabledSlot.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/ExtendedMenuProvider.java (78%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/MenuOpener.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeMenuProvider.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/Property.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/PropertyType.java (77%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyTypes.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/ResourceInventoryDestination.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/ResourceSlot.java (91%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlotType.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/ServerProperty.java (92%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/SingleAmountData.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferDestination.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/TransferManager.java (97%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/containermenu/ValidatedSlot.java (86%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/direction/BiDirection.java (97%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/direction/BiDirectionType.java (95%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/direction/DefaultDirectionType.java (95%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/direction/DirectionType.java (85%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/direction/HorizontalDirection.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/direction/HorizontalDirectionType.java (96%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/BlockEntityEnergyStorage.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/CreativeEnergyStorage.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyContainerMenu.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/energy/EnergyInfo.java (90%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/energy/EnergyItemHelperImpl.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/energy/EnergyLootItemFunction.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/energy/ItemBlockEnergyStorage.java (85%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemEnergyStorage.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java (92%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java (85%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/ConnectionProviderImpl.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/ConnectionSinkImpl.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/InWorldNetworkNodeContainerImpl.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/NetworkNodeBlockEntityTicker.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/bounditem/CompositeSlotReferenceProvider.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/bounditem/InventorySlotReference.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReferenceProvider.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java (78%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/PlatformStorageNetworkComponent.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketContext.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketHandler.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/c2s/C2SPackets.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/c2s/CraftingGridClearPacket.java (76%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridExtractPacket.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridInsertPacket.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridScrollPacket.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/c2s/PropertyChangePacket.java (77%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java (77%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/c2s/ResourceSlotChangePacket.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java (80%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/c2s/SingleAmountChangePacket.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/StorageInfoRequestPacket.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/s2c/EnergyInfoPacket.java (77%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/s2c/GridActivePacket.java (76%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridClearPacket.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridUpdatePacket.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/s2c/NoPermissionPacket.java (78%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/s2c/S2CPackets.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/s2c/StorageInfoResponsePacket.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/registry/PlatformRegistryImpl.java (93%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/render/AbstractFluidRenderer.java (98%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/render/CubeBuilder.java (98%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/render/FluidRenderer.java (76%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java (90%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/CompositeRecipeModIngredientConverter.java (77%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/FluidResourceRendering.java (88%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/ItemResource.java (79%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceFactory.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/ItemResourceRendering.java (91%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/ResourceCodecs.java (90%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/ResourceContainerData.java (81%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/ResourceContainerImpl.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/ResourceContainerSlot.java (83%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceTypes.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/resource/list/FuzzyResourceListImpl.java (80%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/stretching/AbstractStretchingScreen.java (94%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/stretching/ScreenSize.java (82%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeListener.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/stretching/ScreenSizeSideButtonWidget.java (86%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/tooltip/CompositeClientTooltipComponent.java (95%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/tooltip/HelpClientTooltipComponent.java (91%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java (93%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/tooltip/ResourceClientTooltipComponent.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/tooltip/SmallText.java (93%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/tooltip/SmallTextClientTooltipComponent.java (93%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/AbstractSideButtonWidget.java (90%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractYesNoSideButtonWidget.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/CustomCheckboxWidget.java (98%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/FuzzyModeSideButtonWidget.java (89%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/History.java (93%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/HoveredImageButton.java (93%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/ProgressWidget.java (91%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/RedstoneModeSideButtonWidget.java (89%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/SchedulingModeSideButtonWidget.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/ScrollbarWidget.java (96%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/support/widget/SearchFieldWidget.java (93%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/FortuneUpgradeItem.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RangeUpgradeItem.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeContainerMenu.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/RegulatorUpgradeItem.java (82%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeScreen.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/RegulatorUpgradeState.java (86%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/SimpleUpgradeItem.java (80%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/UpgradeContainer.java (88%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java (93%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/UpgradeDestinations.java (83%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/UpgradeItemClientTooltipComponent.java (89%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/UpgradeRegistryImpl.java (88%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/UpgradeSlot.java (82%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java (96%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java (90%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/package-info.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/util/ContainerUtil.java (96%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/util/CustomBlockPlaceContext.java (92%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/util/IdentifierUtil.java (91%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/util/MathUtil.java (76%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/util/PacketUtil.java (87%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/util/SecurityToastUtil.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/util/ServerEventQueue.java (90%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/package-info.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java (75%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java (75%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java (79%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java (75%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/wirelesstransmitter/WirelessTransmitterData.java (85%) rename {refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage}/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java (77%) create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java create mode 100644 refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/package-info.java create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1024b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/256b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4096b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_portable_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/interface.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/icon.png (100%) create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/nl_nl.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1024b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/256b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4096b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/all_cutout.json (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/cable/core/base.json (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/cable/extension/base.json (100%) create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/inactive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/inactive.json rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/controller/nearly.json (100%) create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_off.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_on.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/off.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_portable_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/cutout.json (100%) create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/inactive.json rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/detector/powered.json (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/detector/unpowered.json (91%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/disk/disk.json (98%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/disk/fluid_disk.json (98%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/disk/led_full.json (92%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/disk/led_inactive.json (91%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/disk/led_near_capacity.json (92%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/disk/led_normal.json (91%) create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive/base.json rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/emissive_all_cutout.json (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/emissive_cutout.json (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/emissive_north_cutout.json (100%) create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/exporter.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/external_storage.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/importer.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_inactive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/machine_casing.json rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/block/north_cutout.json (100%) create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/base.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/inactive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/storage_monitor.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/inactive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/basic_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/book.json rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/models/item/cable/base.json (100%) create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/inactive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/construction_core.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/constructor/base.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_portable_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_range_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destruction_core.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destructor/base.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/disk_drive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/exporter/base.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/external_storage/base.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fallback_security_card.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_1_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_2_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_3_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/importer/base.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/improved_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/interface.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/machine_casing.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/inactive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/portable_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/processor_binding.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/regulator_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/inactive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silicon.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silk_touch_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/stack_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_monitor.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/active.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/inactive.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wrench.json create mode 100644 refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds.json rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/sounds/wrench.ogg (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/bottom.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/part_border.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/cable/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/constructor/cutouts/active.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/constructor/cutouts/active.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/constructor/cutouts/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/constructor/front.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/black.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/blue.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/brown.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/cyan.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/gray.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/green.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/light_blue.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/light_gray.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/lime.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/magenta.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/nearly_off.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/nearly_off.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/nearly_off_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/nearly_on.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/nearly_on.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/nearly_on_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/off.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/on.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/orange.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/pink.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/purple.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/red.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/white.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/cutouts/yellow.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/off.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/controller/on.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/back.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/cutouts/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/front.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/left.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/right.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/crafting_grid/top.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/destructor/cutouts/active.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/destructor/cutouts/active.png.mcmeta (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/destructor/cutouts/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/destructor/front.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/bottom.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/unpowered.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/cutouts/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/side.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/detector/top.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk/disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk/fluid_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk/leds.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_drive/bottom.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_drive/front.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_drive/side.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_drive/top.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/back.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/cutouts/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/front.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/left.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/right.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/disk_interface/top.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/fluid_storage_block/1024b_fluid_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/fluid_storage_block/256b_fluid_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/fluid_storage_block/4096b_fluid_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/fluid_storage_block/64b_fluid_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/fluid_storage_block/creative_fluid_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/back.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/cutouts/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/front.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/left.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/right.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/grid/top.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/interface/active.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/interface/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/machine_casing.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/base.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_receiver/cutouts/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/base.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/error.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/network_transmitter/cutouts/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/portable_grid/portable_grid_1.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/portable_grid/portable_grid_2.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/portable_grid/portable_grid_2_inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/portable_grid/portable_grid_3.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/portable_grid/portable_grid_4.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/portable_grid/portable_grid_5.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/portable_grid/portable_grid_6.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/portable_grid/portable_grid_7.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/portable_grid/portable_grid_8.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/quartz_enriched_copper_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/quartz_enriched_iron_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/cutouts/in/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/in.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/relay/out.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/back.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/back/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/front/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/left/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/right/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/cutouts/top/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/front.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/left.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/right.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/security_manager/top.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/side.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_block/16k_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_block/1k_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_block/4k_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_block/64k_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_block/creative_storage_block.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_monitor/back.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_monitor/front.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_monitor/left.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_monitor/right.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/storage_monitor/top.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/base.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/black.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/brown.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/cyan.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/green.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/light_blue.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/light_gray.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/lime.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/magenta.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/orange.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/pink.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/purple.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/red.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/white.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/block/wireless_transmitter/cutouts/yellow.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/advancements.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/amount_with_inventory.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/book.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/controller.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/crafting.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/crafting_grid.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/disk_drive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/disk_interface.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/generic_filter.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/grid.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/interface.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/network_transmitter.png (100%) mode change 100755 => 100644 rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/portable_grid.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/priority.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/resource_amount.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/security_card.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/security_manager.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/sprites/widget/move_down.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/sprites/widget/move_down_disabled.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/sprites/widget/move_down_focused.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/sprites/widget/move_up.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/sprites/widget/move_up_disabled.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/sprites/widget/move_up_focused.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/storage.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/storage_monitor.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/widgets.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/gui/wireless_transmitter.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/icons.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/1024b_fluid_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/1024b_fluid_storage_part.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/16k_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/16k_storage_part.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/1k_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/1k_storage_part.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/256b_fluid_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/256b_fluid_storage_part.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/4096b_fluid_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/4096b_fluid_storage_part.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/4k_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/4k_storage_part.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/64b_fluid_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/64b_fluid_storage_part.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/64k_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/64k_storage_part.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/advanced_processor.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/basic_processor.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/book.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/configuration_card/active.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/configuration_card/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/construction_core.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/creative_fluid_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/creative_range_upgrade.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/creative_storage_disk.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/destruction_core.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/fortune_upgrade.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/improved_processor.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/network_card/active.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/network_card/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/processor_binding.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/quartz_enriched_copper.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/quartz_enriched_iron.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/range_upgrade.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/raw_advanced_processor.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/raw_basic_processor.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/raw_improved_processor.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/regulator_upgrade.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/security_card/active.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/security_card/fallback.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/security_card/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/silicon.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/silk_touch_upgrade.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/speed_upgrade.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/stack_upgrade.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/storage_housing.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/upgrade.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/wireless_grid/active.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/wireless_grid/inactive.png (100%) rename {refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2 => refinedstorage-platform-common/src/main/resources/assets/refinedstorage}/textures/item/wrench.png (100%) create mode 100644 refinedstorage-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/better_than_a_barrel.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/conditional_connecting.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/connecting.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/construction.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/destruction.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/detecting.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/drives.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/exporting.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/importing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interface_to_the_world.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interfacing_with_disks.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/no_cables_required.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/portable_storage.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/root.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/security.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_externally.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_fluids.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_items.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading_your_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/viewing_your_storage.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/wireless.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1024b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/16k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/256b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4096b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_portable_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/disk_drive.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/exporter.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/external_storage.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/importer.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/interface.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/machine_casing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/portable_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/storage_monitor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk_from_storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk_from_storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk_from_storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk_from_storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk_from_storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk_from_storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk_from_storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk_from_storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_part.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/advanced_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/basic_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/cable.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/configuration_card.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/construction_core.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/constructor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/controller.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/crafting_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destruction_core.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destructor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/detector.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_drive.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_interface.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/exporter.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/external_storage.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fallback_security_card.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_1_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_2_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_3_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/importer.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/improved_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/interface.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/machine_casing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_card.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_receiver.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_transmitter.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/portable_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/range_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/regulator_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/relay.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_card.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_manager.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silicon.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silk_touch_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/speed_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/stack_upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_housing.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_monitor.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/upgrade.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_grid.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_transmitter.json create mode 100644 refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wrench.json rename {refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage}/platform/common/SetupMinecraft.java (87%) rename {refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage}/platform/common/TestPlatform.java (89%) rename {refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage}/platform/common/grid/GridSortingTypesTest.java (85%) rename {refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage}/platform/common/grid/screen/LastModifiedTest.java (98%) rename {refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage}/platform/common/storage/ClientStorageRepositoryTest.java (91%) create mode 100644 refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorageTest.java rename {refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage}/platform/common/support/registry/PlatformRegistryImplTest.java (95%) rename {refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage}/platform/common/support/resource/FluidResourceRenderingTest.java (89%) rename {refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage}/platform/common/support/resource/list/FuzzyResourceListImplTest.java (94%) rename {refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage}/platform/common/support/widget/HistoryTest.java (97%) rename {refinedstorage2-platform-fabric => refinedstorage-platform-fabric}/.gitignore (100%) create mode 100644 refinedstorage-platform-fabric/build.gradle rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/ClientModInitializerImpl.java (82%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/ModInitializerImpl.java (76%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/package-info.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/grid/view/FabricFluidGridResourceFactory.java (76%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/grid/view/FabricItemGridResourceFactory.java (82%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/importer/FabricStorageImporterSource.java (83%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/mixin/AbstractModelBakerImplMixin.java (85%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/mixin/EditBoxAccessor.java (80%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/mixin/ItemPropertiesAccessor.java (89%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/mixin/KeyMappingAccessor.java (82%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/mixin/ModelBakeryAccessor.java (86%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/modmenu/ModMenuApiImpl.java (78%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/package-info.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java (79%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/AbstractDiskContainerBakedModel.java (92%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/FabricStorageExtractableStorage.java (86%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/FabricStorageInsertableStorage.java (86%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/FabricStorageUtil.java (89%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java (89%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/package-info.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java (90%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java (81%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java (80%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/package-info.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/portablegrid/DiskLeds.java (76%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBakedModel.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java (91%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/package-info.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/ContainerTransferDestination.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/MenuOpenerImpl.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/package-info.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/EnergyStorageAdapter.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/support/render/EmissiveBakedModel.java (96%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/support/render/EmissiveModelRegistry.java (95%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/support/render/EmissiveTransform.java (96%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/support/render/FluidVariantFluidRenderer.java (88%) rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/support/render/QuadRotator.java (92%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotators.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/support/render/QuadTranslator.java (91%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/RenderTypes.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java (86%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/VariantUtil.java create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/package-info.java rename {refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage}/platform/fabric/util/SimpleSingleStackStorage.java (91%) create mode 100644 refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/package-info.java create mode 100644 refinedstorage-platform-fabric/src/main/resources/fabric.mod.json rename refinedstorage2-platform-fabric/src/main/resources/refinedstorage2.accesswidener => refinedstorage-platform-fabric/src/main/resources/refinedstorage.accesswidener (100%) create mode 100644 refinedstorage-platform-fabric/src/main/resources/refinedstorage.mixins.json rename {refinedstorage2-platform-forge => refinedstorage-platform-neoforge}/.gitignore (100%) create mode 100644 refinedstorage-platform-neoforge/build.gradle create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ClientModInitializer.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/ModInitializer.java (77%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/datagen/BlockModelProviderImpl.java (97%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/datagen/BlockStateProviderImpl.java (92%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/datagen/DataGenerators.java (87%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/datagen/ItemModelProviderImpl.java (87%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/datagen/loot/BlockDropProvider.java (92%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/datagen/loot/LootTableProviderImpl.java (90%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/package-info.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/datagen/recipe/RecoloringRecipeProvider.java (95%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/package-info.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/datagen/tag/BlockTagsProvider.java (85%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/package-info.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/grid/strategy/CursorItemHandler.java (97%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridExtractionStrategy.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridInsertionStrategy.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridExtractionStrategy.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridInsertionStrategy.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridScrollingStrategy.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeFluidGridResourceFactory.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/grid/view/ForgeItemGridResourceFactory.java (78%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterSource.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterSource.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/package-info.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/CapabilityCache.java (91%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/CapabilityCacheImpl.java (95%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/DiskContainerItemOverrides.java (90%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerExtractableStorage.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerInsertableStorage.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/ForgeHandlerUtil.java (81%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/ItemHandlerExtractableStorage.java (81%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/ItemHandlerInsertableStorage.java (79%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBakedModel.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/diskdrive/DiskDriveGeometryLoader.java (86%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/diskdrive/DiskDriveUnbakedGeometry.java (84%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/diskdrive/ForgeDiskDriveBlockEntity.java (77%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/diskinterface/DiskInterfaceGeometryLoader.java (89%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/diskinterface/DiskInterfaceUnbakedGeometry.java (86%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java (76%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/DiskLedBakers.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBakedModel.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/portablegrid/PortableGridGeometryLoader.java (86%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/storage/portablegrid/PortableGridUnbakedGeometry.java (88%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/ContainerTransferDestination.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/MenuOpenerImpl.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/package-info.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/package-info.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/support/inventory/InsertExtractItemHandler.java (96%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/package-info.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/support/render/DiskModelBaker.java (89%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/support/render/FluidStackFluidRenderer.java (92%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/support/render/ItemBakedModel.java (96%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RenderTypes.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/support/render/RotationTranslationModelBaker.java (96%) rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/support/render/TransformationBuilder.java (86%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/package-info.java rename {refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge}/support/resource/ResourceContainerFluidHandlerAdapter.java (77%) create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/VariantUtil.java create mode 100644 refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/package-info.java rename {refinedstorage2-platform-forge => refinedstorage-platform-neoforge}/src/main/resources/META-INF/accesstransformer.cfg (100%) rename {refinedstorage2-platform-forge => refinedstorage-platform-neoforge}/src/main/resources/META-INF/neoforge.mods.toml (77%) rename {refinedstorage2-platform-forge => refinedstorage-platform-neoforge}/src/main/resources/icon.png (100%) rename {refinedstorage2-platform-forge => refinedstorage-platform-neoforge}/src/main/resources/pack.mcmeta (100%) rename {refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/forge => refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common}/GameTestUtil.java (89%) rename {refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/ConstructorTest.java (87%) rename {refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/ConstructorTestPlots.java (78%) rename {refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/DestructorTest.java (93%) rename {refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage}/platform/common/constructordestructor/DestructorTestPlots.java (78%) rename {refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage}/platform/common/exporter/ExporterTest.java (88%) rename {refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage}/platform/common/exporter/ExporterTestPlots.java (81%) rename {refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage}/platform/common/importer/ImporterTest.java (92%) rename {refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage}/platform/common/importer/ImporterTestPlots.java (84%) rename {refinedstorage2-platform-forge/src/test/resources/data/refinedstorage2 => refinedstorage-platform-neoforge/src/test/resources/data/refinedstorage}/structure/empty_15x15.nbt (100%) create mode 100644 refinedstorage-query-parser/build.gradle rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/Lexer.java (98%) rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/LexerException.java (85%) rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/LexerPosition.java (94%) create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerTokenMapping.java rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/LexerTokenMappings.java (97%) rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/Source.java (77%) rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/SyntaxHighlightedCharacter.java (89%) rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/SyntaxHighlighter.java (95%) rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/SyntaxHighlighterColors.java (95%) rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/Token.java (84%) rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/TokenPosition.java (81%) rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/lexer/TokenRange.java (80%) create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenType.java create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/package-info.java create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Associativity.java create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Operator.java rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/parser/Parser.java (88%) create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/ParserException.java rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/parser/ParserOperatorMappings.java (86%) create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/BinOpNode.java create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/LiteralNode.java create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/Node.java rename {refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage}/query/parser/node/ParenNode.java (82%) create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/UnaryOpNode.java create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/package-info.java create mode 100644 refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/package-info.java create mode 100644 refinedstorage-query-parser/src/main/resources/fabric.mod.json rename {refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage}/query/lexer/LexerTest.java (96%) rename {refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage}/query/lexer/SyntaxHighlighterTest.java (98%) rename {refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage}/query/lexer/TokenAssertions.java (96%) create mode 100644 refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserBuilder.java rename {refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage}/query/parser/ParserTest.java (98%) create mode 100644 refinedstorage-resource-api/build.gradle rename {refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage}/api/resource/ResourceAmount.java (94%) create mode 100644 refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/ResourceKey.java rename {refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage}/api/resource/filter/Filter.java (90%) create mode 100644 refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/FilterMode.java create mode 100644 refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/package-info.java rename {refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage}/api/resource/list/AbstractProxyResourceList.java (84%) rename {refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage}/api/resource/list/ResourceList.java (94%) rename {refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage}/api/resource/list/ResourceListImpl.java (93%) rename {refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage}/api/resource/list/listenable/ListenableResourceList.java (84%) rename {refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage}/api/resource/list/listenable/ResourceListListener.java (75%) create mode 100644 refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/package-info.java create mode 100644 refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/package-info.java create mode 100644 refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/package-info.java create mode 100644 refinedstorage-resource-api/src/main/resources/fabric.mod.json rename {refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage}/api/resource/ResourceAmountTest.java (98%) create mode 100644 refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/TestResource.java rename {refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage}/api/resource/filter/FilterTest.java (92%) rename {refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage}/api/resource/list/AbstractResourceListTest.java (98%) rename {refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage}/api/resource/list/ProxyResourceListTest.java (78%) create mode 100644 refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/ResourceListImplTest.java rename {refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage}/api/resource/list/listenable/ListenableResourceListTest.java (93%) create mode 100644 refinedstorage-storage-api/build.gradle rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/AbstractProxyStorage.java (79%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/AccessMode.java (90%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/Actor.java (84%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/EmptyActor.java (87%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/ExtractableStorage.java (76%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/InMemoryStorageImpl.java (81%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/InsertableStorage.java (76%) create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/NoopStorage.java rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/StateTrackedStorage.java (87%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/Storage.java (83%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/StorageState.java (92%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/StorageView.java (76%) create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/TrackedResourceAmount.java rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/TransferHelper.java (95%) create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannel.java create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImpl.java create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/package-info.java rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/composite/CompositeAwareChild.java (88%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/composite/CompositeStorage.java (80%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/composite/CompositeStorageImpl.java (92%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/composite/ParentComposite.java (85%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/composite/PrioritizedStorageComparator.java (81%) create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PriorityProvider.java rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/composite/PriorityStorage.java (77%) create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/package-info.java rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/external/ExternalStorage.java (89%) create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageListener.java create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageProvider.java create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/package-info.java create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/LimitedStorage.java create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/LimitedStorageImpl.java create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/package-info.java create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/package-info.java rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/tracked/InMemoryTrackedStorageRepository.java (88%) rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/tracked/TrackedResource.java (92%) create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorage.java rename {refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage}/api/storage/tracked/TrackedStorageImpl.java (84%) create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageRepository.java create mode 100644 refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/package-info.java create mode 100644 refinedstorage-storage-api/src/main/resources/fabric.mod.json rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/ActorCapturingStorage.java (81%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/FakeActors.java (90%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/InMemoryStorageImplTest.java (96%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/LimitedStorageImplTest.java (94%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/ProxyStorageTest.java (94%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/StateTrackedStorageTest.java (95%) create mode 100644 refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TestResource.java rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/TransferHelperTest.java (97%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/channel/StorageChannelImplTest.java (90%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/composite/CompositeStorageImplTest.java (88%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/composite/ExtractCompositeStorageImplTest.java (93%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/composite/InsertCompositeStorageImplTest.java (91%) rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/composite/SubCompositeCompositeStorageImplTest.java (85%) create mode 100644 refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageProviderImpl.java rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/external/ExternalStorageTest.java (94%) create mode 100644 refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalTestResource.java create mode 100644 refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/SpyingExternalStorageListener.java rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/external/StorageChannelExternalStorageTest.java (90%) create mode 100644 refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/TransformingStorage.java rename {refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2 => refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage}/api/storage/tracked/TrackedStorageImplTest.java (96%) delete mode 100644 refinedstorage2-core-api/build.gradle delete mode 100644 refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/Action.java delete mode 100644 refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/package-info.java delete mode 100644 refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/package-info.java delete mode 100644 refinedstorage2-core-api/src/main/resources/fabric.mod.json delete mode 100644 refinedstorage2-grid-api/build.gradle delete mode 100644 refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/NoopGridOperations.java delete mode 100644 refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/package-info.java delete mode 100644 refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParser.java delete mode 100644 refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/package-info.java delete mode 100644 refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/package-info.java delete mode 100644 refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManager.java delete mode 100644 refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/package-info.java delete mode 100644 refinedstorage2-grid-api/src/main/resources/fabric.mod.json delete mode 100644 refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/TestResource.java delete mode 100644 refinedstorage2-network-api/build.gradle delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/ConnectionProvider.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/Network.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyNetworkComponent.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/NetworkNode.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/NetworkNodeActor.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/container/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/exporter/ExporterTransferStrategy.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/exporter/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/externalstorage/ExternalStorageProviderFactory.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/externalstorage/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/importer/ImporterTransferStrategy.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/importer/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/Task.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/Permission.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityActor.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityNetworkComponent.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/StorageNetworkComponent.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/StorageProvider.java delete mode 100644 refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/package-info.java delete mode 100644 refinedstorage2-network-api/src/main/resources/fabric.mod.json delete mode 100644 refinedstorage2-network-test/build.gradle delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTest.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTestFixtures.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/RegisterNetworkNode.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeActor.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakePermissions.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeResources.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeSecurityActors.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/package-info.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ControllerNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/DetectorNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ExporterNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/GridNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ImporterNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/InterfaceNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/NetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/RelayInputNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/RelayOutputNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/SimpleNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/StorageNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/StorageTransferNetworkNodeFactory.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/package-info.java delete mode 100644 refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/package-info.java delete mode 100644 refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/NetworkNodeFactoryTest.java delete mode 100644 refinedstorage2-network/build.gradle delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkFactory.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkImpl.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/container/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerEnergyState.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorAmountStrategy.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorAmountStrategyImpl.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorMode.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/CompositeExporterTransferStrategy.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridNetworkNode.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProvider.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterNetworkNode.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterSource.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayComponentType.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/security/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/ExposedStorage.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferListener.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferMode.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/DefaultTaskExecutor.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/package-info.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageConfiguration.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageNetworkComponentImpl.java delete mode 100644 refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/package-info.java delete mode 100644 refinedstorage2-network/src/main/resources/fabric.mod.json delete mode 100644 refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/SimpleNetworkNodeTest.java delete mode 100644 refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RandomExporterNetworkNodeTest.java delete mode 100644 refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageProviderFactoryImpl.java delete mode 100644 refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/StorageExternalStorageProvider.java delete mode 100644 refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/SelfIoInterfaceExternalStorageProviderImplTest.java delete mode 100644 refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/FakeImporterSource.java delete mode 100644 refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java delete mode 100644 refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java delete mode 100644 refinedstorage2-platform-api/build.gradle delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/ConstructorStrategy.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/ExporterTransferStrategyFactory.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/Grid.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridResourceAttributeKeys.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridScrollMode.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategy.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategyFactory.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategy.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategyFactory.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategy.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategyFactory.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/PlatformGridResource.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/ImporterTransferStrategyFactory.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/PlatformSecurityNetworkComponent.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/SerializableStorage.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageInfo.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/channel/FuzzyStorageChannel.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/channel/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/externalstorage/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/TransferableBlockEntityEnergy.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/InWorldNetworkNodeContainer.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/NetworkNodeContainerBlockEntity.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemSession.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/FuzzyModeNormalizer.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/PlatformResourceKey.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceFactory.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceType.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/list/FuzzyResourceList.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/list/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeItem.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java delete mode 100644 refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/package-info.java delete mode 100644 refinedstorage2-platform-api/src/main/resources/fabric.mod.json delete mode 100644 refinedstorage2-platform-common/build.gradle delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/inactive.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/inactive.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/inactive.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/inactive.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/error.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/inactive.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/inactive.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/inactive.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/black.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/brown.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/cyan.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/green.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_blue.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_gray.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/lime.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/magenta.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/orange.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/pink.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/purple.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/red.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/white.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/yellow.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_creative_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/cables.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/constructors.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/controllers.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/crafting_grids.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/creative_controllers.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/destructors.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/detectors.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/disk_interfaces.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/exporters.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/external_storages.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/fluid_storage_disks.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/grids.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/importers.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_receivers.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_transmitters.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/relays.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/security_managers.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/storage_disks.json delete mode 100644 refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/wireless_transmitters.json delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/CompositeConstructorStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/CompositeDestructorStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockItem.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerType.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/CreativeControllerBlockItem.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorPropertyTypes.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/FuzzyDetectorAmountStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/FuzzyExporterTransferStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridSynchronizer.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridMatrixCloseBehavior.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridRefillContext.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridData.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypes.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/PortableGridData.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/SecuredGridOperations.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGrid.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridData.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridItem.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridOperations.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/AutoSelectedSideButtonWidget.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/GridScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/FluidGridInsertionHint.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/ItemGridInsertionHint.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridExtractionStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridInsertionStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridScrollingStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridExtractionStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridScrollingStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/CompositeGridResourceFactory.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/FluidGridResource.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/WrenchItem.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlockEntity.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntityTicker.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassEnergySideButtonWidget.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassSecuritySideButtonWidget.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassStorageSideButtonWidget.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassThroughSideButtonWidget.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPropertyTypes.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardItem.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlatformSecurityNetworkComponentImpl.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerSecurityActor.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardData.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/Disk.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/LimitedPlatformStorage.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorage.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageAccessor.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageConfigurationContainer.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StoragePropertyTypes.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTypes.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/VoidExcessSideButtonWidget.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGrid.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridOperations.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridStorage.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridType.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/FluidStorageDiskItem.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/ItemStorageDiskItem.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractFilterScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockEntityWithDrops.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockItemProvider.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/CableShapeCacheKey.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ClientToServerCommunications.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ColorableBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/PlayerAwareBlockEntity.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleBlock.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleItem.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/TextureIds.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/MenuOpener.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeMenuProvider.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/Property.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/PropertyTypes.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlotType.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/SingleAmountData.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/TransferDestination.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/BlockEntityEnergyStorage.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/CreativeEnergyStorage.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemEnergyStorage.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceProvider.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/component/PlatformStorageNetworkComponent.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/component/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketContext.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketHandler.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridExtractPacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridInsertPacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridScrollPacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/StorageInfoRequestPacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridClearPacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridUpdatePacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResource.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceFactory.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceType.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceFactory.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceType.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceTypes.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSizeListener.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractYesNoSideButtonWidget.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RangeUpgradeItem.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeContainerMenu.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java delete mode 100644 refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/package-info.java delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/1024b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/16k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/1k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/256b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/4096b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/4k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/64b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/64k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_portable_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/disk_drive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/interface.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/machine_casing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/portable_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_copper_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_iron_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/storage_monitor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/de_de.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/es_es.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/fr_fr.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/hu_hu.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/id_id.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/it_it.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ja_jp.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ko_kr.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/nl_nl.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/pl_pl.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/pt_br.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ru_ru.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/zh_cn.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/zh_tw.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/1024b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/16k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/1k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/256b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/4096b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/4k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/64b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/64k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor/active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor/inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor_destructor/active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor_destructor/inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly_off.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly_on.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/off.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_portable_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/destructor/active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/destructor/inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk_drive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk_drive/base.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/exporter.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/external_storage.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/importer.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/interface_active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/interface_inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/machine_casing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/base.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_copper_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_iron_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/storage_monitor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/wireless_transmitter/active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/wireless_transmitter/inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/advanced_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/basic_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/book.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card/active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card/inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/construction_core.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/constructor/base.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_fluid_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_portable_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_range_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_wireless_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/destruction_core.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/destructor/base.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/disk_drive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/exporter/base.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/external_storage/base.json delete mode 100755 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fallback_security_card.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_1_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_2_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_3_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/importer/base.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/improved_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/interface.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/machine_casing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card/active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card/inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/portable_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/processor_binding.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_iron.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_iron_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/range_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_advanced_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_basic_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_improved_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/regulator_upgrade.json delete mode 100755 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card/active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card/inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/silicon.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/silk_touch_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/speed_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/stack_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/storage_monitor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid/active.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid/inactive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wrench.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/sounds.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/black.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/blue.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/brown.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/cyan.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/gray.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/green.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/inactive.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/light_blue.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/light_gray.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/lime.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/magenta.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/orange.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/pink.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/purple.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/red.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/white.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/yellow.png delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1024b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/16k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/256b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4096b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_portable_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/disk_drive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/exporter.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/external_storage.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/importer.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/interface.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/machine_casing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/portable_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/quartz_enriched_iron_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/storage_monitor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk_from_storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk_from_storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk_from_storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk_from_storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk_from_storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk_from_storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk_from_storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk_from_storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/advanced_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/basic_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/configuration_card.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/controller.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/detector.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_interface.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/exporter.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fallback_security_card.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_1_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_2_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_3_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/importer.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/improved_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_card.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/portable_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_from_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_from_block.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/relay.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_card.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silk_touch_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/speed_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/stack_upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json delete mode 100644 refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wrench.json delete mode 100644 refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/LimitedPlatformStorageTest.java delete mode 100644 refinedstorage2-platform-fabric/build.gradle delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/PlatformImpl.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/exporter/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/modmenu/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/security/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBakedModel.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/ContainerTransferDestination.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/MenuOpenerImpl.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/energy/EnergyStorageAdapter.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/energy/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadRotators.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/RenderTypes.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/VariantUtil.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/util/package-info.java delete mode 100644 refinedstorage2-platform-fabric/src/main/resources/fabric.mod.json delete mode 100644 refinedstorage2-platform-fabric/src/main/resources/refinedstorage2.mixins.json delete mode 100644 refinedstorage2-platform-forge/build.gradle delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/PlatformImpl.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/ItemTagsProviderImpl.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/FluidHandlerExporterTransferStrategyFactory.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/ItemHandlerExporterTransferStrategyFactory.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridExtractionStrategy.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridInsertionStrategy.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridExtractionStrategy.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridInsertionStrategy.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridScrollingStrategy.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeFluidGridResourceFactory.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/FluidHandlerImporterSource.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/FluidHandlerImporterTransferStrategyFactory.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/ItemHandlerImporterSource.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/ItemHandlerImporterTransferStrategyFactory.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/FluidHandlerExtractableStorage.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/FluidHandlerInsertableStorage.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBakedModel.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceBakedModel.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/FluidHandlerExternalStorageProvider.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/ItemHandlerExternalStorageProvider.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/DiskLedBakers.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/ForgePortableGridBlockEntity.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/ContainerTransferDestination.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/MenuOpenerImpl.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/energy/EnergyStorageAdapter.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/energy/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RenderTypes.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/package-info.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/VariantUtil.java delete mode 100644 refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/package-info.java delete mode 100644 refinedstorage2-query-parser/build.gradle delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerTokenMapping.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenType.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/package-info.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Associativity.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Operator.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/ParserException.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/BinOpNode.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/LiteralNode.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/Node.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/UnaryOpNode.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/package-info.java delete mode 100644 refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/package-info.java delete mode 100644 refinedstorage2-query-parser/src/main/resources/fabric.mod.json delete mode 100644 refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/parser/ParserBuilder.java delete mode 100644 refinedstorage2-resource-api/build.gradle delete mode 100644 refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/ResourceKey.java delete mode 100644 refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/FilterMode.java delete mode 100644 refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/package-info.java delete mode 100644 refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/package-info.java delete mode 100644 refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/package-info.java delete mode 100644 refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/package-info.java delete mode 100644 refinedstorage2-resource-api/src/main/resources/fabric.mod.json delete mode 100644 refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/TestResource.java delete mode 100644 refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceListImplTest.java delete mode 100644 refinedstorage2-storage-api/build.gradle delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/NoopStorage.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/TrackedResourceAmount.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannel.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannelImpl.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/package-info.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityProvider.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/package-info.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageListener.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageProvider.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/package-info.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/LimitedStorage.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/LimitedStorageImpl.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/package-info.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/package-info.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorage.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageRepository.java delete mode 100644 refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/package-info.java delete mode 100644 refinedstorage2-storage-api/src/main/resources/fabric.mod.json delete mode 100644 refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/TestResource.java delete mode 100644 refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageProviderImpl.java delete mode 100644 refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalTestResource.java delete mode 100644 refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/SpyingExternalStorageListener.java delete mode 100644 refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/TransformingStorage.java diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index df8672e38..d929057b3 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -13,7 +13,8 @@ These are the most important things to know before contributing (also explained Category must match a category [used in our Commitlint config](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum). - We use [Checkstyle](https://checkstyle.sourceforge.io/) in our build workflow to validate coding style. It is - recommended to import the [config/checkstyle/checkstyle.xml](../config/checkstyle/checkstyle.xml) or [config/intellij-code-style.xml](../config/intellij-code-style.xml) file into your + recommended to import the [config/checkstyle/checkstyle.xml](../config/checkstyle/checkstyle.xml) + or [config/intellij-code-style.xml](../config/intellij-code-style.xml) file into your IDE, so that formatting rules are respected. - Branches are kept up to date by rebasing, not by merging. - For non-technical changes, adding a changelog entry is required. @@ -98,7 +99,8 @@ from [API Guardian](https://github.com/apiguardian-team/apiguardian). We use [Checkstyle](https://checkstyle.sourceforge.io/) in our build workflow to validate coding style. -It is recommended to import the [config/checkstyle/checkstyle.xml](../config/checkstyle/checkstyle.xml) or [config/intellij-code-style.xml](../config/intellij-code-style.xml) file into your +It is recommended to import the [config/checkstyle/checkstyle.xml](../config/checkstyle/checkstyle.xml) +or [config/intellij-code-style.xml](../config/intellij-code-style.xml) file into your IDE, so that formatting rules are respected. Moreover, the [CheckStyle-IDEA plugin](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) can be used to check @@ -132,13 +134,13 @@ Tests in the API modules are regular unit tests. Don't see a "unit" here as a co These tests don't rely on, nor know about, Minecraft. -Additionally, tests in the `refinedstorage2-network` module use the `refinedstorage2-network-test` JUnit plugin to +Additionally, tests in the `refinedstorage-network` module use the `refinedstorage-network-test` JUnit plugin to easily set up networks for testing. ### Integration testing To test the entire chain from Minecraft to the API modules, we use integration tests. These tests are located in the -test source set of the `refinedstorage2-platform-forge` module. +test source set of the `refinedstorage-platform-neoforge` module. We write these integration tests as Minecraft gametests. @@ -148,7 +150,7 @@ Our [SonarQube quality gate](https://sonarcloud.io/organizations/refinedmods/qua test coverage percentage of 80%. This an aggregated percentage over all the API modules, with an exclusion for the platform modules. -> The `refinedstorage2-platform-*` modules are excluded because they contain a lot of Minecraft-specific code and are +> The `refinedstorage-platform-*` modules are excluded because they contain a lot of Minecraft-specific code and are > harder to test. ### Mutation testing @@ -258,22 +260,22 @@ The workflow takes care of the following: ## Modules -Refined Storage 2 is split up into various modules. +Refined Storage is split up into various modules. Most modules aren't dependent on Minecraft or a mod loader. Only modules that start -with `refinedstorage2-platform-*` have dependencies on Minecraft. - -| Name | Use in addons | Description | -|-----------------------------------|---------------|----------------------------------------------------------------------------------------------------| -| `refinedstorage2-core-api` | ✔️ | Contains some utility classes and enums. | -| `refinedstorage2-grid-api` | ✔️ | Contains Grid related functionality. | -| `refinedstorage2-network-api` | ✔️ | Contains storage network related functionality. | -| `refinedstorage2-network` | ❌ | Contains implementations of `refinedstorage2-network-api`. | -| `refinedstorage2-network-test` | ✔️ | JUnit extension which helps with setting up a network and a network node for testing. | -| `refinedstorage2-query-parser` | ✔️ | A query parser, contains a lexer and parser. Only used for Grid query parsing. | -| `refinedstorage2-resource-api` | ✔️ | Contains API for handling resources. | -| `refinedstorage2-storage-api` | ✔️ | Contains storage related functionality. | -| `refinedstorage2-platform-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. | -| `refinedstorage2-platform-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. | -| `refinedstorage2-platform-forge` | ❌ | The platform module for Forge. This module contains Forge specific code and the integration tests. | -| `refinedstorage2-platform-common` | ❌ | Common mod code. Most gameplay code is in here. | +with `refinedstorage-platform-*` have dependencies on Minecraft. + +| Name | Use in addons | Description | +|----------------------------------|---------------|----------------------------------------------------------------------------------------------------| +| `refinedstorage-core-api` | ✔️ | Contains some utility classes and enums. | +| `refinedstorage-grid-api` | ✔️ | Contains Grid related functionality. | +| `refinedstorage-network-api` | ✔️ | Contains storage network related functionality. | +| `refinedstorage-network` | ❌ | Contains implementations of `refinedstorage-network-api`. | +| `refinedstorage-network-test` | ✔️ | JUnit extension which helps with setting up a network and a network node for testing. | +| `refinedstorage-query-parser` | ✔️ | A query parser, contains a lexer and parser. Only used for Grid query parsing. | +| `refinedstorage-resource-api` | ✔️ | Contains API for handling resources. | +| `refinedstorage-storage-api` | ✔️ | Contains storage related functionality. | +| `refinedstorage-platform-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. | +| `refinedstorage-platform-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. | +| `refinedstorage-platform-forge` | ❌ | The platform module for Forge. This module contains Forge specific code and the integration tests. | +| `refinedstorage-platform-common` | ❌ | Common mod code. Most gameplay code is in here. | diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index de53558c3..9216935a1 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -21,7 +21,7 @@ body: label: How can we reproduce this bug or crash? description: | Provide us with steps on how to reproduce this issue. - Try to reproduce the issue with only Refined Storage 2 installed, if possible. + Try to reproduce the issue with only Refined Storage installed, if possible. placeholder: | 1. 2. diff --git a/.gitignore b/.gitignore index ae1892911..0521ad558 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ eclipse/ *.ipr *.iws .idea/ -!.idea/dictionaries/refinedstorage2.xml +!.idea/dictionaries/refinedstorage.xml !.idea/icon.png out/ /bin/ diff --git a/.idea/dictionaries/refinedstorage2.xml b/.idea/dictionaries/refinedstorage2.xml deleted file mode 100644 index aeda850ec..000000000 --- a/.idea/dictionaries/refinedstorage2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - autocrafting - emissive - redstone - - - \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f665072b..c52c14de8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Changed -- Internal data format for storages. Storages from milestone 3 are incompatible and will not be transferred. +- The mod ID has been changed to "refinedstorage". Worlds that used milestone 3 on Minecraft 1.20.4 are no longer compatible. - Recipes now use common tag conventions from NeoForge and Fabric. ## [2.0.0-milestone.3.14] - 2024-06-28 diff --git a/build.gradle b/build.gradle index cbdf95842..8de0cef5e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,19 @@ apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v${gradle.ext.refinedArchitectVersion}/helper.gradle" subprojects { - group = 'com.refinedmods.refinedstorage2' + group = 'com.refinedmods.refinedstorage' ext { apis = [ - ':refinedstorage2-core-api', - ':refinedstorage2-resource-api', - ':refinedstorage2-storage-api', - ':refinedstorage2-network-api', - ':refinedstorage2-network', - ':refinedstorage2-grid-api', - ':refinedstorage2-query-parser' + ':refinedstorage-core-api', + ':refinedstorage-resource-api', + ':refinedstorage-storage-api', + ':refinedstorage-network-api', + ':refinedstorage-network', + ':refinedstorage-grid-api', + ':refinedstorage-query-parser' ] - compileApis = [':refinedstorage2-platform-api'] + compileApis = [':refinedstorage-platform-api'] } } @@ -21,6 +21,6 @@ enableSonarQube("refinedmods_refinedstorage2") sonarqube { properties { - property "sonar.coverage.exclusions", "refinedstorage2-platform-forge/**/*,refinedstorage2-platform-fabric/**/*,refinedstorage2-platform-common/**/*,refinedstorage2-platform-api/**/*" + property "sonar.coverage.exclusions", "refinedstorage-platform-neoforge/**/*,refinedstorage-platform-fabric/**/*,refinedstorage-platform-common/**/*,refinedstorage-platform-api/**/*" } } diff --git a/config/checkstyle/checkstyle-imports.xml b/config/checkstyle/checkstyle-imports.xml index 56b69ba8c..2bf1e046c 100644 --- a/config/checkstyle/checkstyle-imports.xml +++ b/config/checkstyle/checkstyle-imports.xml @@ -1,7 +1,7 @@ - + diff --git a/crowdin.yml b/crowdin.yml index 638d88a8d..5bb3deca0 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -6,8 +6,8 @@ base_path: . pull_request_labels: - skip-changelog files: - - source: /refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json - translation: /refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/%locale_with_underscore%.json + - source: /refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json + translation: /refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/%locale_with_underscore%.json languages_mapping: locale_with_underscore: af: af_za diff --git a/doc/architecture/decision/001-multi-loader-architecture.md b/doc/architecture/decision/001-multi-loader-architecture.md index d0a6bc5d0..f8a43dd89 100644 --- a/doc/architecture/decision/001-multi-loader-architecture.md +++ b/doc/architecture/decision/001-multi-loader-architecture.md @@ -13,13 +13,13 @@ should support this design goal in a maintainable way. ## Decision -Refined Storage 2 will have a modular structure with a module per modloader. +Refined Storage will have a modular structure with a module per modloader. There will be a common module, and most code should reside in there. The modloader specific (platform) modules should be reserved for platform specific functionality, like registration, networking, etc. -The module naming follows the standard of `refinedstorage2-platform-{name}`. +The module naming follows the standard of `refinedstorage-platform-{name}`. ## Consequences diff --git a/doc/architecture/decision/002-api-modules.md b/doc/architecture/decision/002-api-modules.md index 2010edc9a..dccd5efa3 100644 --- a/doc/architecture/decision/002-api-modules.md +++ b/doc/architecture/decision/002-api-modules.md @@ -17,7 +17,7 @@ business logic shouldn't change due to a Minecraft update. ## Decision -Refined Storage 2 will have multiple API modules that have no dependency on Minecraft whatsoever. +Refined Storage will have multiple API modules that have no dependency on Minecraft whatsoever. These modules can depend on each other, but the dependency chain should be logical. These API modules can be consumed by platform modules (to bundle them) [[1]](#1) and addon developers. @@ -25,7 +25,7 @@ These API modules can be consumed by platform modules (to bundle them) [[1]](#1) The platform modules [[1]](#1) are responsible for integrating the modules with Minecraft, by implementing interfaces on their end that the API modules can use. -The API modules have the name `refinedstorage2-{name}-api`. +The API modules have the name `refinedstorage-{name}-api`. ## Consequences diff --git a/doc/architecture/decision/003-the-platform-api-module.md b/doc/architecture/decision/003-the-platform-api-module.md index 58349b1ef..d335110af 100644 --- a/doc/architecture/decision/003-the-platform-api-module.md +++ b/doc/architecture/decision/003-the-platform-api-module.md @@ -16,12 +16,12 @@ Refined Storage 1). ## Decision -Refined Storage 2 will have a modloader-neutral (just like the common module) platform API module which addon mods can +Refined Storage will have a modloader-neutral (just like the common module) platform API module which addon mods can use to integrate with Refined Storage. -Moreover, Refined Storage 2 itself will use this platform API module. +Moreover, Refined Storage itself will use this platform API module. -The module is named `refinedstorage2-platform-api`. +The module is named `refinedstorage-platform-api`. ## Consequences diff --git a/doc/architecture/decision/004-coverage-requirements.md b/doc/architecture/decision/004-coverage-requirements.md index 8bb07452a..d7679dda5 100644 --- a/doc/architecture/decision/004-coverage-requirements.md +++ b/doc/architecture/decision/004-coverage-requirements.md @@ -20,7 +20,7 @@ Luckily, since our most important (business-logic) code resides in the API modul our testing focus there and establish coverage requirements. However, sometimes it is still advised to write a test for platform code, even if there are no coverage requirements for -it. For that reason, the `refinedstorage2-platform-test` module exists, to provide helpers to deal with Minecraft code. +it. For that reason, the `refinedstorage-platform-test` module exists, to provide helpers to deal with Minecraft code. ## Consequences diff --git a/doc/architecture/decision/005-unit-testing.md b/doc/architecture/decision/005-unit-testing.md index b1fc190fc..550e67451 100644 --- a/doc/architecture/decision/005-unit-testing.md +++ b/doc/architecture/decision/005-unit-testing.md @@ -11,7 +11,7 @@ Accepted The coverage requirements [[1]](#1) for the API modules [[2]](#2) state that we need unit test coverage. Hence, we need to clarify what "unit" in unit test means. -The API modules in Refined Storage 2 are already disconnected from reality (Minecraft), so we need unit tests that +The API modules in Refined Storage are already disconnected from reality (Minecraft), so we need unit tests that closely mimick real situations and assert real behavior if we want to get any value out of them. This eliminates the definition that most @@ -19,7 +19,7 @@ people have of unit tests, which is to test "a single method" and to mock depend ## Decision -Refined Storage 2 unit testing will follow a behavior driven approach, where "unit" in unit test means "unit of +Refined Storage unit testing will follow a behavior driven approach, where "unit" in unit test means "unit of behavior" and not "unit of method". ## Consequences diff --git a/doc/architecture/decision/006-no-persistent-networks.md b/doc/architecture/decision/006-no-persistent-networks.md index 37a5588d7..15e0c9ee5 100644 --- a/doc/architecture/decision/006-no-persistent-networks.md +++ b/doc/architecture/decision/006-no-persistent-networks.md @@ -18,9 +18,9 @@ with block entities in non-conventional ways. ## Decision -Networks cannot be persisted in Refined Storage 2. They need to be loaded in memory. +Networks cannot be persisted in Refined Storage. They need to be loaded in memory. -Network nodes cannot be persisted in Refined Storage 2. All persistent data should be stored on corresponding the block +Network nodes cannot be persisted in Refined Storage. All persistent data should be stored on corresponding the block entity. ## Consequences diff --git a/doc/architecture/decision/010-shared-storage.md b/doc/architecture/decision/010-shared-storage.md index f4843306a..971450fd9 100644 --- a/doc/architecture/decision/010-shared-storage.md +++ b/doc/architecture/decision/010-shared-storage.md @@ -8,10 +8,10 @@ Accepted ## Context -Refined Storage 2 has the concept of a storage channel. A storage channel is the highest-level storage of a network. It +Refined Storage has the concept of a storage channel. A storage channel is the highest-level storage of a network. It is used by other network devices to interact with the storage network. -As Refined Storage 2 supports multiple resource types, we must decide how we partition those resource types. +As Refined Storage supports multiple resource types, we must decide how we partition those resource types. ## Decision diff --git a/refinedstorage-core-api/build.gradle b/refinedstorage-core-api/build.gradle new file mode 100644 index 000000000..df2d720ac --- /dev/null +++ b/refinedstorage-core-api/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'java-library' +} + +archivesBaseName = 'refinedstorage-core-api' + +dependencies { + api libs.apiguardian + testImplementation libs.junit.api + testImplementation libs.junit.params + testRuntimeOnly libs.junit.engine + testImplementation libs.assertj +} + +test { + useJUnitPlatform() +} + +enableMutationTesting() +enableJavadoc() +enablePublishing() diff --git a/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/Action.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/Action.java new file mode 100644 index 000000000..231ecf20d --- /dev/null +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/Action.java @@ -0,0 +1,9 @@ +package com.refinedmods.refinedstorage.api.core; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public enum Action { + SIMULATE, + EXECUTE +} diff --git a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/CoreValidations.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/CoreValidations.java similarity index 97% rename from refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/CoreValidations.java rename to refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/CoreValidations.java index a87965f75..ac7b681df 100644 --- a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/CoreValidations.java +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/CoreValidations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.core; +package com.refinedmods.refinedstorage.api.core; import java.util.Collection; import java.util.Objects; diff --git a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/FieldsAndMethodsAreNonnullByDefault.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/FieldsAndMethodsAreNonnullByDefault.java similarity index 88% rename from refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/FieldsAndMethodsAreNonnullByDefault.java rename to refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/FieldsAndMethodsAreNonnullByDefault.java index bda524b9c..75ea16faf 100644 --- a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/FieldsAndMethodsAreNonnullByDefault.java +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/FieldsAndMethodsAreNonnullByDefault.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.core; +package com.refinedmods.refinedstorage.api.core; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/ComponentAccessor.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentAccessor.java similarity index 76% rename from refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/ComponentAccessor.java rename to refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentAccessor.java index 770ef551b..08ca2b91f 100644 --- a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/ComponentAccessor.java +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.core.component; +package com.refinedmods.refinedstorage.api.core.component; import org.apiguardian.api.API; diff --git a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/ComponentMap.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMap.java similarity index 93% rename from refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/ComponentMap.java rename to refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMap.java index 7cc9d3fdb..1019f5802 100644 --- a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/ComponentMap.java +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMap.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.core.component; +package com.refinedmods.refinedstorage.api.core.component; import java.util.Collection; import java.util.Collections; diff --git a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/ComponentMapFactory.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactory.java similarity index 95% rename from refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/ComponentMapFactory.java rename to refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactory.java index 370f57cf1..8f1579162 100644 --- a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/ComponentMapFactory.java +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.core.component; +package com.refinedmods.refinedstorage.api.core.component; import java.util.LinkedHashMap; import java.util.Map; diff --git a/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/package-info.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/package-info.java new file mode 100644 index 000000000..612d3767c --- /dev/null +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/component/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.core.component; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/package-info.java b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/package-info.java new file mode 100644 index 000000000..e1a64fc25 --- /dev/null +++ b/refinedstorage-core-api/src/main/java/com/refinedmods/refinedstorage/api/core/package-info.java @@ -0,0 +1,5 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.core; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-core-api/src/main/resources/fabric.mod.json b/refinedstorage-core-api/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..28fec6e52 --- /dev/null +++ b/refinedstorage-core-api/src/main/resources/fabric.mod.json @@ -0,0 +1,19 @@ +{ + "schemaVersion": 1, + "id": "refinedstorage-core-api", + "version": "${version}", + "name": "Refined Storage Core API", + "authors": [ + "Refined Mods" + ], + "license": "MIT", + "environment": "*", + "custom": { + "modmenu": { + "parent": "refinedstorage", + "badges": [ + "library" + ] + } + } +} diff --git a/refinedstorage2-core-api/src/test/java/com/refinedmods/refinedstorage2/api/core/CoreValidationsTest.java b/refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/CoreValidationsTest.java similarity index 99% rename from refinedstorage2-core-api/src/test/java/com/refinedmods/refinedstorage2/api/core/CoreValidationsTest.java rename to refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/CoreValidationsTest.java index 9c14a34d1..3bcb34c4a 100644 --- a/refinedstorage2-core-api/src/test/java/com/refinedmods/refinedstorage2/api/core/CoreValidationsTest.java +++ b/refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/CoreValidationsTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.core; +package com.refinedmods.refinedstorage.api.core; import java.util.List; diff --git a/refinedstorage2-core-api/src/test/java/com/refinedmods/refinedstorage2/api/core/component/ComponentMapFactoryTest.java b/refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactoryTest.java similarity index 98% rename from refinedstorage2-core-api/src/test/java/com/refinedmods/refinedstorage2/api/core/component/ComponentMapFactoryTest.java rename to refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactoryTest.java index 4f89f4d38..c9d3701b1 100644 --- a/refinedstorage2-core-api/src/test/java/com/refinedmods/refinedstorage2/api/core/component/ComponentMapFactoryTest.java +++ b/refinedstorage-core-api/src/test/java/com/refinedmods/refinedstorage/api/core/component/ComponentMapFactoryTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.core.component; +package com.refinedmods.refinedstorage.api.core.component; import org.junit.jupiter.api.Test; diff --git a/refinedstorage-grid-api/build.gradle b/refinedstorage-grid-api/build.gradle new file mode 100644 index 000000000..3cc5d8671 --- /dev/null +++ b/refinedstorage-grid-api/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java-library' +} + +archivesBaseName = 'refinedstorage-grid-api' + +dependencies { + api libs.apiguardian + api project(':refinedstorage-resource-api') + api project(':refinedstorage-core-api') + api project(':refinedstorage-storage-api') + api project(':refinedstorage-query-parser') + implementation libs.slf4j.api + testImplementation libs.junit.api + testImplementation libs.junit.params + testRuntimeOnly libs.junit.engine + testRuntimeOnly libs.slf4j.impl + testImplementation libs.assertj + testImplementation libs.mockito +} + +test { + useJUnitPlatform() +} + +enableMutationTesting() +enableJavadoc() +enablePublishing() diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridExtractMode.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridExtractMode.java similarity index 88% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridExtractMode.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridExtractMode.java index 1bfe449d2..bf915dbd5 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridExtractMode.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridExtractMode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.grid.operations; +package com.refinedmods.refinedstorage.api.grid.operations; import org.apiguardian.api.API; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridInsertMode.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridInsertMode.java similarity index 83% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridInsertMode.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridInsertMode.java index d714701ac..773dd5295 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridInsertMode.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridInsertMode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.grid.operations; +package com.refinedmods.refinedstorage.api.grid.operations; import org.apiguardian.api.API; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridOperations.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperations.java similarity index 79% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridOperations.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperations.java index 6aa6abb48..9e048c0ca 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridOperations.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperations.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.grid.operations; +package com.refinedmods.refinedstorage.api.grid.operations; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; import org.apiguardian.api.API; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridOperationsImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperationsImpl.java similarity index 85% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridOperationsImpl.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperationsImpl.java index bd4bd156e..5893dd500 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridOperationsImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/GridOperationsImpl.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.api.grid.operations; +package com.refinedmods.refinedstorage.api.grid.operations; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.api.storage.TransferHelper; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.api.storage.TransferHelper; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; import java.util.function.ToLongFunction; diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/NoopGridOperations.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/NoopGridOperations.java new file mode 100644 index 000000000..be2a80b8a --- /dev/null +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/NoopGridOperations.java @@ -0,0 +1,21 @@ +package com.refinedmods.refinedstorage.api.grid.operations; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; + +public class NoopGridOperations implements GridOperations { + @Override + public boolean extract(final ResourceKey resource, + final GridExtractMode extractMode, + final InsertableStorage destination) { + return false; + } + + @Override + public boolean insert(final ResourceKey resource, + final GridInsertMode insertMode, + final ExtractableStorage source) { + return false; + } +} diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/package-info.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/package-info.java new file mode 100644 index 000000000..713dcdeb5 --- /dev/null +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/operations/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.grid.operations; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParser.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParser.java new file mode 100644 index 000000000..d188611e1 --- /dev/null +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParser.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.api.grid.query; + +import com.refinedmods.refinedstorage.api.grid.view.GridResource; + +import java.util.function.Predicate; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public interface GridQueryParser { + Predicate parse(String query) throws GridQueryParserException; +} diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParserException.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserException.java similarity index 85% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParserException.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserException.java index 7475e10f9..8c00f63dc 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParserException.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserException.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.grid.query; +package com.refinedmods.refinedstorage.api.grid.query; import javax.annotation.Nullable; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParserImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImpl.java similarity index 87% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParserImpl.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImpl.java index db0208610..6a86c42ae 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParserImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImpl.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage2.api.grid.query; - -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceAttributeKey; -import com.refinedmods.refinedstorage2.query.lexer.Lexer; -import com.refinedmods.refinedstorage2.query.lexer.LexerException; -import com.refinedmods.refinedstorage2.query.lexer.LexerTokenMappings; -import com.refinedmods.refinedstorage2.query.lexer.Source; -import com.refinedmods.refinedstorage2.query.lexer.Token; -import com.refinedmods.refinedstorage2.query.lexer.TokenType; -import com.refinedmods.refinedstorage2.query.parser.Parser; -import com.refinedmods.refinedstorage2.query.parser.ParserException; -import com.refinedmods.refinedstorage2.query.parser.ParserOperatorMappings; -import com.refinedmods.refinedstorage2.query.parser.node.BinOpNode; -import com.refinedmods.refinedstorage2.query.parser.node.LiteralNode; -import com.refinedmods.refinedstorage2.query.parser.node.Node; -import com.refinedmods.refinedstorage2.query.parser.node.ParenNode; -import com.refinedmods.refinedstorage2.query.parser.node.UnaryOpNode; +package com.refinedmods.refinedstorage.api.grid.query; + +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceAttributeKey; +import com.refinedmods.refinedstorage.query.lexer.Lexer; +import com.refinedmods.refinedstorage.query.lexer.LexerException; +import com.refinedmods.refinedstorage.query.lexer.LexerTokenMappings; +import com.refinedmods.refinedstorage.query.lexer.Source; +import com.refinedmods.refinedstorage.query.lexer.Token; +import com.refinedmods.refinedstorage.query.lexer.TokenType; +import com.refinedmods.refinedstorage.query.parser.Parser; +import com.refinedmods.refinedstorage.query.parser.ParserException; +import com.refinedmods.refinedstorage.query.parser.ParserOperatorMappings; +import com.refinedmods.refinedstorage.query.parser.node.BinOpNode; +import com.refinedmods.refinedstorage.query.parser.node.LiteralNode; +import com.refinedmods.refinedstorage.query.parser.node.Node; +import com.refinedmods.refinedstorage.query.parser.node.ParenNode; +import com.refinedmods.refinedstorage.query.parser.node.UnaryOpNode; import java.util.ArrayList; import java.util.Arrays; diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/package-info.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/package-info.java new file mode 100644 index 000000000..0fcf93531 --- /dev/null +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/query/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.grid.query; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridResource.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResource.java similarity index 77% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridResource.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResource.java index b2cc7a397..2407f4987 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridResource.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResource.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import java.util.Optional; import java.util.Set; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridResourceAttributeKey.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceAttributeKey.java similarity index 79% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridResourceAttributeKey.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceAttributeKey.java index 72cd94ca9..74504848d 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridResourceAttributeKey.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceAttributeKey.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; import org.apiguardian.api.API; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridResourceFactory.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceFactory.java similarity index 84% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridResourceFactory.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceFactory.java index 1b4ef0d60..14bde3f3b 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridResourceFactory.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import java.util.Optional; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridSortingDirection.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridSortingDirection.java similarity index 75% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridSortingDirection.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridSortingDirection.java index 26150e5b5..6b5e20ca8 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridSortingDirection.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridSortingDirection.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; import org.apiguardian.api.API; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridSortingType.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridSortingType.java similarity index 83% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridSortingType.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridSortingType.java index 239398f6b..b7612f40f 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridSortingType.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridSortingType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; import java.util.Comparator; import java.util.function.Function; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridView.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java similarity index 91% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridView.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java index d8e5f3c10..d995757e9 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridView.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import java.util.List; import java.util.Optional; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewBuilder.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilder.java similarity index 78% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewBuilder.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilder.java index 056234a13..9bd00df04 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewBuilder.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilder.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import javax.annotation.Nullable; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewBuilderImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilderImpl.java similarity index 82% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewBuilderImpl.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilderImpl.java index 3ee9bd1e1..e38890ba5 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewBuilderImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilderImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java similarity index 95% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewImpl.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java index 412f5bb9c..abdf96a5c 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.api.grid.view; - -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +package com.refinedmods.refinedstorage.api.grid.view; + +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import java.util.ArrayList; import java.util.Collections; diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/package-info.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/package-info.java new file mode 100644 index 000000000..0471f3d61 --- /dev/null +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.grid.view; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcher.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcher.java similarity index 80% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcher.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcher.java index 1b070f92b..94379ffb2 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcher.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcher.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.grid.watcher; +package com.refinedmods.refinedstorage.api.grid.watcher; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import javax.annotation.Nullable; diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManager.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManager.java new file mode 100644 index 000000000..3287bbc6b --- /dev/null +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManager.java @@ -0,0 +1,27 @@ +package com.refinedmods.refinedstorage.api.grid.watcher; + +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; + +import javax.annotation.Nullable; + +import org.apiguardian.api.API; + +/** + * This manager helps with attaching and detaching listeners to + * {@link com.refinedmods.refinedstorage.api.storage.channel.StorageChannel}s. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.3") +public interface GridWatcherManager { + void addWatcher(GridWatcher watcher, + Class actorType, + @Nullable StorageChannel storageChannel); + + void attachAll(@Nullable StorageChannel storageChannel); + + void removeWatcher(GridWatcher watcher, @Nullable StorageChannel storageChannel); + + void detachAll(StorageChannel storageChannel); + + void activeChanged(boolean active); +} diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManagerImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImpl.java similarity index 94% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManagerImpl.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImpl.java index a5b85402f..1b5f8b937 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManagerImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.grid.watcher; +package com.refinedmods.refinedstorage.api.grid.watcher; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherRegistration.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherRegistration.java similarity index 83% rename from refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherRegistration.java rename to refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherRegistration.java index a7a54ef0e..7fc89b970 100644 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherRegistration.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherRegistration.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.grid.watcher; +package com.refinedmods.refinedstorage.api.grid.watcher; -import com.refinedmods.refinedstorage2.api.resource.list.listenable.ResourceListListener; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.resource.list.listenable.ResourceListListener; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; import javax.annotation.Nullable; diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/package-info.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/package-info.java new file mode 100644 index 000000000..685602060 --- /dev/null +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/watcher/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.grid.watcher; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-grid-api/src/main/resources/fabric.mod.json b/refinedstorage-grid-api/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..30ce310b3 --- /dev/null +++ b/refinedstorage-grid-api/src/main/resources/fabric.mod.json @@ -0,0 +1,19 @@ +{ + "schemaVersion": 1, + "id": "refinedstorage-grid-api", + "version": "${version}", + "name": "Refined Storage Grid API", + "authors": [ + "Refined Mods" + ], + "license": "MIT", + "environment": "*", + "custom": { + "modmenu": { + "parent": "refinedstorage", + "badges": [ + "library" + ] + } + } +} diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/TestResource.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/TestResource.java new file mode 100644 index 000000000..f33d3cbe5 --- /dev/null +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/TestResource.java @@ -0,0 +1,10 @@ +package com.refinedmods.refinedstorage.api.grid; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +public enum TestResource implements ResourceKey { + A, + B, + C, + D +} diff --git a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParserImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImplTest.java similarity index 95% rename from refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParserImplTest.java rename to refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImplTest.java index 2951c16e4..21879ac19 100644 --- a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParserImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImplTest.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.api.grid.query; - -import com.refinedmods.refinedstorage2.api.grid.view.FakeGridResourceAttributeKeys; -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceAttributeKey; -import com.refinedmods.refinedstorage2.api.grid.view.GridView; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.query.lexer.LexerTokenMappings; -import com.refinedmods.refinedstorage2.query.parser.ParserOperatorMappings; +package com.refinedmods.refinedstorage.api.grid.query; + +import com.refinedmods.refinedstorage.api.grid.view.FakeGridResourceAttributeKeys; +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceAttributeKey; +import com.refinedmods.refinedstorage.api.grid.view.GridView; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.query.lexer.LexerTokenMappings; +import com.refinedmods.refinedstorage.query.parser.ParserOperatorMappings; import java.util.Map; import java.util.Optional; diff --git a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/service/GridOperationsImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java similarity index 92% rename from refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/service/GridOperationsImplTest.java rename to refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java index fb8a08f09..e6e5647d5 100644 --- a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/service/GridOperationsImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/service/GridOperationsImplTest.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage2.api.grid.service; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperationsImpl; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannelImpl; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; +package com.refinedmods.refinedstorage.api.grid.service; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperationsImpl; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -21,8 +21,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.A; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.B; +import static com.refinedmods.refinedstorage.api.grid.TestResource.A; +import static com.refinedmods.refinedstorage.api.grid.TestResource.B; import static org.assertj.core.api.Assertions.assertThat; class GridOperationsImplTest { diff --git a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/view/FakeGridResourceAttributeKeys.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/FakeGridResourceAttributeKeys.java similarity index 86% rename from refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/view/FakeGridResourceAttributeKeys.java rename to refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/FakeGridResourceAttributeKeys.java index 4edaa8e8c..4a8b7a59e 100644 --- a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/view/FakeGridResourceAttributeKeys.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/FakeGridResourceAttributeKeys.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; import java.util.Map; import java.util.Set; diff --git a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/view/GridResourceImpl.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceImpl.java similarity index 86% rename from refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/view/GridResourceImpl.java rename to refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceImpl.java index 9b4581044..28ef989e6 100644 --- a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/view/GridResourceImpl.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceImpl.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import java.util.Collections; import java.util.Map; diff --git a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java similarity index 97% rename from refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewImplTest.java rename to refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java index 6bbf024f0..32679b515 100644 --- a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.api.grid.view; +package com.refinedmods.refinedstorage.api.grid.view; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import java.util.Comparator; import java.util.Optional; @@ -12,10 +12,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.A; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.B; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.C; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.D; +import static com.refinedmods.refinedstorage.api.grid.TestResource.A; +import static com.refinedmods.refinedstorage.api.grid.TestResource.B; +import static com.refinedmods.refinedstorage.api.grid.TestResource.C; +import static com.refinedmods.refinedstorage.api.grid.TestResource.D; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManagerImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImplTest.java similarity index 89% rename from refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManagerImplTest.java rename to refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImplTest.java index 77c5f2ced..efcfbf5da 100644 --- a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManagerImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/watcher/GridWatcherManagerImplTest.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage2.api.grid.watcher; +package com.refinedmods.refinedstorage.api.grid.watcher; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannelImpl; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.A; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.B; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.C; -import static com.refinedmods.refinedstorage2.api.grid.TestResource.D; +import static com.refinedmods.refinedstorage.api.grid.TestResource.A; +import static com.refinedmods.refinedstorage.api.grid.TestResource.B; +import static com.refinedmods.refinedstorage.api.grid.TestResource.C; +import static com.refinedmods.refinedstorage.api.grid.TestResource.D; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; diff --git a/refinedstorage-network-api/build.gradle b/refinedstorage-network-api/build.gradle new file mode 100644 index 000000000..6f39e6024 --- /dev/null +++ b/refinedstorage-network-api/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'java-library' +} + +archivesBaseName = 'refinedstorage-network-api' + +dependencies { + api libs.apiguardian + api project(':refinedstorage-core-api') + api project(':refinedstorage-resource-api') + api project(':refinedstorage-storage-api') + api project(':refinedstorage-grid-api') +} + +enableJavadoc() +enablePublishing() diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/ConnectionProvider.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/ConnectionProvider.java new file mode 100644 index 000000000..7283b7523 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/ConnectionProvider.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.api.network; + +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; + +import java.util.List; +import java.util.Set; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public interface ConnectionProvider { + Connections findConnections(NetworkNodeContainer pivot, Set existingConnections); + + List sortDeterministically(Set containers); +} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/Connections.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/Connections.java similarity index 84% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/Connections.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/Connections.java index 9456db1de..1c242fe14 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/Connections.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/Connections.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.network; +package com.refinedmods.refinedstorage.api.network; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import java.util.Collections; import java.util.Set; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/Network.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/Network.java new file mode 100644 index 000000000..58e1c2995 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/Network.java @@ -0,0 +1,21 @@ +package com.refinedmods.refinedstorage.api.network; + +import com.refinedmods.refinedstorage.api.core.component.ComponentAccessor; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; + +import java.util.Set; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public interface Network extends ComponentAccessor { + void addContainer(NetworkNodeContainer container); + + void removeContainer(NetworkNodeContainer container); + + void remove(); + + void split(Set networks); + + void merge(Network network); +} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/NetworkBuilder.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/NetworkBuilder.java similarity index 90% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/NetworkBuilder.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/NetworkBuilder.java index e4bedcf21..13e07f3f0 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/NetworkBuilder.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/NetworkBuilder.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.api.network; +package com.refinedmods.refinedstorage.api.network; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import org.apiguardian.api.API; /** - * Manages the network state of a {@link com.refinedmods.refinedstorage2.api.network.node.NetworkNode}. + * Manages the network state of a {@link com.refinedmods.refinedstorage.api.network.node.NetworkNode}. * Performs merge, split and remove operations as necessary. */ @API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/NetworkComponent.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/NetworkComponent.java similarity index 77% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/NetworkComponent.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/NetworkComponent.java index 6795743a1..d2d409754 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/NetworkComponent.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/NetworkComponent.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.network; +package com.refinedmods.refinedstorage.api.network; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import java.util.Set; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyNetworkComponent.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyNetworkComponent.java new file mode 100644 index 000000000..ccc7253db --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyNetworkComponent.java @@ -0,0 +1,9 @@ +package com.refinedmods.refinedstorage.api.network.energy; + +import com.refinedmods.refinedstorage.api.network.NetworkComponent; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.1") +public interface EnergyNetworkComponent extends NetworkComponent, EnergyProvider { +} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyProvider.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyProvider.java similarity index 83% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyProvider.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyProvider.java index 8af73c121..984f856d8 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyProvider.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.network.energy; +package com.refinedmods.refinedstorage.api.network.energy; import org.apiguardian.api.API; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyStorage.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyStorage.java similarity index 86% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyStorage.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyStorage.java index 858c86c4a..153e001eb 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyStorage.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/EnergyStorage.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.network.energy; +package com.refinedmods.refinedstorage.api.network.energy; -import com.refinedmods.refinedstorage2.api.core.Action; +import com.refinedmods.refinedstorage.api.core.Action; import org.apiguardian.api.API; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/package-info.java new file mode 100644 index 000000000..ea331cd8e --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/energy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.energy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/GraphNetworkComponent.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/GraphNetworkComponent.java similarity index 82% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/GraphNetworkComponent.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/GraphNetworkComponent.java index 4da9fa7f0..03c3aed19 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/GraphNetworkComponent.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/GraphNetworkComponent.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.network.node; +package com.refinedmods.refinedstorage.api.network.node; -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.NetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import java.util.Set; import javax.annotation.Nullable; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/NetworkNode.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/NetworkNode.java new file mode 100644 index 000000000..1100f0d8c --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/NetworkNode.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.api.network.node; + +import com.refinedmods.refinedstorage.api.network.Network; + +import javax.annotation.Nullable; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public interface NetworkNode { + @Nullable + Network getNetwork(); + + void setNetwork(@Nullable Network network); +} diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/NetworkNodeActor.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/NetworkNodeActor.java new file mode 100644 index 000000000..43f7567b9 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/NetworkNodeActor.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.api.network.node; + +import com.refinedmods.refinedstorage.api.storage.Actor; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") +public record NetworkNodeActor(NetworkNode networkNode) implements Actor { + @Override + public String getName() { + return networkNode.getClass().getName(); + } +} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/container/NetworkNodeContainer.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/container/NetworkNodeContainer.java similarity index 82% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/container/NetworkNodeContainer.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/container/NetworkNodeContainer.java index de14588a4..1b414c0a2 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/container/NetworkNodeContainer.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/container/NetworkNodeContainer.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.network.node.container; +package com.refinedmods.refinedstorage.api.network.node.container; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; import javax.annotation.Nullable; @@ -18,7 +18,7 @@ public interface NetworkNodeContainer { * If it changes after adding it into the graph, the container would not be removed from the key index when the * container is removed! * The container can be queried by - * {@link com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent#getContainer(Object)}. + * {@link com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent#getContainer(Object)}. * * @return the key, or null if indexing is not required */ diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/container/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/container/package-info.java new file mode 100644 index 000000000..8c0763a46 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/container/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.node.container; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/exporter/ExporterTransferStrategy.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/exporter/ExporterTransferStrategy.java new file mode 100644 index 000000000..6ce09c613 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/exporter/ExporterTransferStrategy.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.api.network.node.exporter; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import org.apiguardian.api.API; + +/** + * A transfer strategy that transfers a resource from the network to a destination. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") +public interface ExporterTransferStrategy { + boolean transfer(ResourceKey resource, Actor actor, Network network); +} diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/exporter/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/exporter/package-info.java new file mode 100644 index 000000000..ce347aea1 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.node.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/externalstorage/ExternalStorageProviderFactory.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/externalstorage/ExternalStorageProviderFactory.java new file mode 100644 index 000000000..69340873a --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/externalstorage/ExternalStorageProviderFactory.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.api.network.node.externalstorage; + +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; + +import java.util.Optional; + +import org.apiguardian.api.API; + +/** + * Provides the {@link com.refinedmods.refinedstorage.api.storage.external.ExternalStorage} + * with an {@link ExternalStorageProvider}. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") +@FunctionalInterface +public interface ExternalStorageProviderFactory { + /** + * @return the external storage provider, if present + */ + Optional create(); +} diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/externalstorage/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/externalstorage/package-info.java new file mode 100644 index 000000000..0042178e8 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.node.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/importer/ImporterTransferStrategy.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/importer/ImporterTransferStrategy.java new file mode 100644 index 000000000..da68a629c --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/importer/ImporterTransferStrategy.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.api.network.node.importer; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import org.apiguardian.api.API; + +/** + * An importer transfer strategy transfers resources from a source to the network. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") +public interface ImporterTransferStrategy { + boolean transfer(Filter filter, Actor actor, Network network); +} diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/importer/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/importer/package-info.java new file mode 100644 index 000000000..6fd0ac2a4 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.node.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/package-info.java new file mode 100644 index 000000000..e359ac89c --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.node; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/Task.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/Task.java new file mode 100644 index 000000000..2812ed456 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/Task.java @@ -0,0 +1,9 @@ +package com.refinedmods.refinedstorage.api.network.node.task; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.11") +@FunctionalInterface +public interface Task { + boolean run(C context); +} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/TaskExecutor.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/TaskExecutor.java similarity index 79% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/TaskExecutor.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/TaskExecutor.java index 84ebec8ee..f29d55b0f 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/TaskExecutor.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/TaskExecutor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.network.node.task; +package com.refinedmods.refinedstorage.api.network.node.task; import java.util.List; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/package-info.java new file mode 100644 index 000000000..4499b3e43 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/node/task/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.node.task; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/package-info.java new file mode 100644 index 000000000..deab398e8 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/Permission.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/Permission.java new file mode 100644 index 000000000..8236a6d90 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/Permission.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.api.network.security; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") +public interface Permission { +} diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityActor.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityActor.java new file mode 100644 index 000000000..5c21a4ab1 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityActor.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.api.network.security; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") +public interface SecurityActor { +} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityDecision.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityDecision.java similarity index 84% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityDecision.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityDecision.java index 74f0ab94f..b990df0f4 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityDecision.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityDecision.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.network.security; +package com.refinedmods.refinedstorage.api.network.security; import org.apiguardian.api.API; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityDecisionProvider.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityDecisionProvider.java similarity index 89% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityDecisionProvider.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityDecisionProvider.java index eb4f3ff1f..bed8aa7bf 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityDecisionProvider.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityDecisionProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.network.security; +package com.refinedmods.refinedstorage.api.network.security; import org.apiguardian.api.API; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityNetworkComponent.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityNetworkComponent.java new file mode 100644 index 000000000..a6117412a --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityNetworkComponent.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.api.network.security; + +import com.refinedmods.refinedstorage.api.network.NetworkComponent; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") +public interface SecurityNetworkComponent extends NetworkComponent { + boolean isAllowed(Permission permission, SecurityActor actor); + + boolean contains(SecurityNetworkComponent component); +} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityPolicy.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityPolicy.java similarity index 90% rename from refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityPolicy.java rename to refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityPolicy.java index 0f997651f..0f93e29c4 100644 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityPolicy.java +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/SecurityPolicy.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.network.security; +package com.refinedmods.refinedstorage.api.network.security; import java.util.Collections; import java.util.Set; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/package-info.java new file mode 100644 index 000000000..85f3f48eb --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/security/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.security; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageNetworkComponent.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageNetworkComponent.java new file mode 100644 index 000000000..7e46b6529 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageNetworkComponent.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.api.network.storage; + +import com.refinedmods.refinedstorage.api.network.NetworkComponent; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; + +import java.util.List; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.1") +public interface StorageNetworkComponent extends NetworkComponent, StorageChannel { + List getResources(Class actorType); + + boolean contains(Storage storage); +} diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageProvider.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageProvider.java new file mode 100644 index 000000000..17ac3a481 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/StorageProvider.java @@ -0,0 +1,26 @@ +package com.refinedmods.refinedstorage.api.network.storage; + +import com.refinedmods.refinedstorage.api.storage.Storage; + +import org.apiguardian.api.API; + +/** + * Implement this on {@link com.refinedmods.refinedstorage.api.network.node.NetworkNode}s that can provide a storage + * to the network. + * Never modify a {@link com.refinedmods.refinedstorage.api.storage.channel.StorageChannel} + * from a {@link com.refinedmods.refinedstorage.api.network.node.NetworkNode} directly. + * Use this interface to help you manage the lifecycle of your storage, to ensure that your storage is added or removed + * in the right cases. + * Use a {@link com.refinedmods.refinedstorage.api.storage.composite.CompositeStorage} to conditionally enable/disable + * a provided {@link Storage}. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.2") +public interface StorageProvider { + /** + * This method is called when a {@link com.refinedmods.refinedstorage.api.network.node.NetworkNode} is added or + * removed from a network. + * + * @return the storage + */ + Storage getStorage(); +} diff --git a/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/package-info.java b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/package-info.java new file mode 100644 index 000000000..d6f614a79 --- /dev/null +++ b/refinedstorage-network-api/src/main/java/com/refinedmods/refinedstorage/api/network/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-api/src/main/resources/fabric.mod.json b/refinedstorage-network-api/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..cf67514dd --- /dev/null +++ b/refinedstorage-network-api/src/main/resources/fabric.mod.json @@ -0,0 +1,19 @@ +{ + "schemaVersion": 1, + "id": "refinedstorage-network-api", + "version": "${version}", + "name": "Refined Storage Network API", + "authors": [ + "Refined Mods" + ], + "license": "MIT", + "environment": "*", + "custom": { + "modmenu": { + "parent": "refinedstorage", + "badges": [ + "library" + ] + } + } +} diff --git a/refinedstorage-network-test/build.gradle b/refinedstorage-network-test/build.gradle new file mode 100644 index 000000000..beffa9c07 --- /dev/null +++ b/refinedstorage-network-test/build.gradle @@ -0,0 +1,25 @@ +plugins { + id 'java-library' +} + +archivesBaseName = 'refinedstorage-network-test' + +dependencies { + api project(':refinedstorage-network-api') + api project(':refinedstorage-network') + api project(':refinedstorage-storage-api') + api project(':refinedstorage-resource-api') + api project(':refinedstorage-core-api') + api project(':refinedstorage-grid-api') + implementation libs.junit.api + testRuntimeOnly libs.junit.engine + testImplementation libs.assertj +} + +test { + useJUnitPlatform() +} + +enableMutationTesting() +enableJavadoc() +enablePublishing() diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/AddNetworkNode.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/AddNetworkNode.java similarity index 90% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/AddNetworkNode.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/AddNetworkNode.java index b2e8f39d8..1fbdb0d6c 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/AddNetworkNode.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/AddNetworkNode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.network.test; +package com.refinedmods.refinedstorage.network.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetwork.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetwork.java similarity index 85% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetwork.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetwork.java index 2e75205f6..23ee838a1 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetwork.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetwork.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.network.test; +package com.refinedmods.refinedstorage.network.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetworkEnergyComponent.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetworkEnergyComponent.java similarity index 85% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetworkEnergyComponent.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetworkEnergyComponent.java index 7bbf607e8..0d6067422 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetworkEnergyComponent.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetworkEnergyComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.network.test; +package com.refinedmods.refinedstorage.network.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetworkSecurityComponent.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetworkSecurityComponent.java similarity index 85% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetworkSecurityComponent.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetworkSecurityComponent.java index d0b87298c..b8aea8c8a 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetworkSecurityComponent.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetworkSecurityComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.network.test; +package com.refinedmods.refinedstorage.network.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetworkStorageComponent.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetworkStorageComponent.java similarity index 85% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetworkStorageComponent.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetworkStorageComponent.java index a78bd1f77..0442f21c0 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/InjectNetworkStorageComponent.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/InjectNetworkStorageComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.network.test; +package com.refinedmods.refinedstorage.network.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTest.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTest.java new file mode 100644 index 000000000..bf3070406 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTest.java @@ -0,0 +1,51 @@ +package com.refinedmods.refinedstorage.network.test; + +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.grid.GridNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayInputNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayOutputNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; +import com.refinedmods.refinedstorage.network.test.nodefactory.ControllerNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.DetectorNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.ExporterNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.ExternalStorageNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.GridNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.ImporterNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.InterfaceNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.RelayInputNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.RelayOutputNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.SimpleNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.StorageNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.StorageTransferNetworkNodeFactory; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.junit.jupiter.api.extension.ExtendWith; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +@ExtendWith(NetworkTestExtension.class) +@RegisterNetworkNode(value = ControllerNetworkNodeFactory.class, clazz = ControllerNetworkNode.class) +@RegisterNetworkNode(value = StorageNetworkNodeFactory.class, clazz = StorageNetworkNode.class) +@RegisterNetworkNode(value = ExporterNetworkNodeFactory.class, clazz = ExporterNetworkNode.class) +@RegisterNetworkNode(value = GridNetworkNodeFactory.class, clazz = GridNetworkNode.class) +@RegisterNetworkNode(value = ImporterNetworkNodeFactory.class, clazz = ImporterNetworkNode.class) +@RegisterNetworkNode(value = SimpleNetworkNodeFactory.class, clazz = SimpleNetworkNode.class) +@RegisterNetworkNode(value = InterfaceNetworkNodeFactory.class, clazz = InterfaceNetworkNode.class) +@RegisterNetworkNode(value = ExternalStorageNetworkNodeFactory.class, clazz = ExternalStorageNetworkNode.class) +@RegisterNetworkNode(value = DetectorNetworkNodeFactory.class, clazz = DetectorNetworkNode.class) +@RegisterNetworkNode(value = RelayInputNetworkNodeFactory.class, clazz = RelayInputNetworkNode.class) +@RegisterNetworkNode(value = RelayOutputNetworkNodeFactory.class, clazz = RelayOutputNetworkNode.class) +@RegisterNetworkNode(value = StorageTransferNetworkNodeFactory.class, clazz = StorageTransferNetworkNode.class) +public @interface NetworkTest { +} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTestExtension.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtension.java similarity index 91% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTestExtension.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtension.java index dbcb0be5a..3e9a33b7a 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTestExtension.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtension.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.network.test; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.NetworkImpl; -import com.refinedmods.refinedstorage2.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.network.test.nodefactory.NetworkNodeFactory; +package com.refinedmods.refinedstorage.network.test; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.NetworkImpl; +import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.network.test.nodefactory.NetworkNodeFactory; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestFixtures.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestFixtures.java new file mode 100644 index 000000000..ba433377d --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/NetworkTestFixtures.java @@ -0,0 +1,45 @@ +package com.refinedmods.refinedstorage.network.test; + +import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.NetworkComponent; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyNetworkComponentImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.GraphNetworkComponentImpl; +import com.refinedmods.refinedstorage.api.network.impl.security.SecurityNetworkComponentImpl; +import com.refinedmods.refinedstorage.api.network.impl.storage.StorageNetworkComponentImpl; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.network.test.fake.FakePermissions; + +import java.util.LinkedHashMap; + +public final class NetworkTestFixtures { + public static final ComponentMapFactory NETWORK_COMPONENT_MAP_FACTORY = + new ComponentMapFactory<>(); + + static { + NETWORK_COMPONENT_MAP_FACTORY.addFactory( + EnergyNetworkComponent.class, + network -> new EnergyNetworkComponentImpl() + ); + NETWORK_COMPONENT_MAP_FACTORY.addFactory( + GraphNetworkComponent.class, + GraphNetworkComponentImpl::new + ); + NETWORK_COMPONENT_MAP_FACTORY.addFactory( + StorageNetworkComponent.class, + network -> new StorageNetworkComponentImpl(new ResourceListImpl(new LinkedHashMap<>())) + ); + NETWORK_COMPONENT_MAP_FACTORY.addFactory( + SecurityNetworkComponent.class, + network -> new SecurityNetworkComponentImpl(SecurityPolicy.of(FakePermissions.ALLOW_BY_DEFAULT)) + ); + } + + private NetworkTestFixtures() { + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/RegisterNetworkNode.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/RegisterNetworkNode.java new file mode 100644 index 000000000..d436ee1fc --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/RegisterNetworkNode.java @@ -0,0 +1,19 @@ +package com.refinedmods.refinedstorage.network.test; + +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.network.test.nodefactory.NetworkNodeFactory; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +@Repeatable(RegisterNetworkNodes.class) +public @interface RegisterNetworkNode { + Class value(); + + Class clazz(); +} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/RegisterNetworkNodes.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/RegisterNetworkNodes.java similarity index 84% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/RegisterNetworkNodes.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/RegisterNetworkNodes.java index 216fb3ef8..07c123c01 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/RegisterNetworkNodes.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/RegisterNetworkNodes.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.network.test; +package com.refinedmods.refinedstorage.network.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/SetupNetwork.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/SetupNetwork.java similarity index 90% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/SetupNetwork.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/SetupNetwork.java index 566fc4889..5793676c0 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/SetupNetwork.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/SetupNetwork.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.network.test; +package com.refinedmods.refinedstorage.network.test; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/SetupNetworks.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/SetupNetworks.java similarity index 85% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/SetupNetworks.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/SetupNetworks.java index 409d5b997..7af5bf055 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/SetupNetworks.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/SetupNetworks.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.network.test; +package com.refinedmods.refinedstorage.network.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeActor.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeActor.java new file mode 100644 index 000000000..8cc2bb82a --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeActor.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.network.test.fake; + +import com.refinedmods.refinedstorage.api.storage.Actor; + +public final class FakeActor implements Actor { + public static final FakeActor INSTANCE = new FakeActor(); + + private FakeActor() { + } + + @Override + public String getName() { + return "Fake"; + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakePermissions.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakePermissions.java new file mode 100644 index 000000000..ce1cd2fbf --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakePermissions.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.network.test.fake; + +import com.refinedmods.refinedstorage.api.network.security.Permission; + +public enum FakePermissions implements Permission { + ALLOW_BY_DEFAULT, OTHER, OTHER2 +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeResources.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeResources.java new file mode 100644 index 000000000..ad0726c6f --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeResources.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.network.test.fake; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +public enum FakeResources implements ResourceKey { + A, + A_ALTERNATIVE, + A_ALTERNATIVE2, + B, + B_ALTERNATIVE, + C, + D +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeSecurityActors.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeSecurityActors.java new file mode 100644 index 000000000..cff73542a --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/FakeSecurityActors.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.network.test.fake; + +import com.refinedmods.refinedstorage.api.network.security.SecurityActor; + +public enum FakeSecurityActors implements SecurityActor { + A, B, C +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/package-info.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/package-info.java new file mode 100644 index 000000000..99740d1a9 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/fake/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.network.test.fake; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/AbstractNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/AbstractNetworkNodeFactory.java similarity index 75% rename from refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/AbstractNetworkNodeFactory.java rename to refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/AbstractNetworkNodeFactory.java index 995a66a29..3f39a02c6 100644 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/AbstractNetworkNodeFactory.java +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/AbstractNetworkNodeFactory.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; +package com.refinedmods.refinedstorage.network.test.nodefactory; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; import java.util.Map; diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ControllerNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ControllerNetworkNodeFactory.java new file mode 100644 index 000000000..cc1abcb17 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ControllerNetworkNodeFactory.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class ControllerNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + return new ControllerNetworkNode(); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/DetectorNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/DetectorNetworkNodeFactory.java new file mode 100644 index 000000000..3b6f64a86 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/DetectorNetworkNodeFactory.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class DetectorNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + return new DetectorNetworkNode(getEnergyUsage(properties)); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExporterNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExporterNetworkNodeFactory.java new file mode 100644 index 000000000..b20ec5adb --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExporterNetworkNodeFactory.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class ExporterNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + return new ExporterNetworkNode(getEnergyUsage(properties)); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java new file mode 100644 index 000000000..711c734c9 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; +import com.refinedmods.refinedstorage.api.storage.tracked.InMemoryTrackedStorageRepository; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class ExternalStorageNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + final ExternalStorageNetworkNode externalStorage = new ExternalStorageNetworkNode( + getEnergyUsage(properties), + () -> 0L + ); + externalStorage.setTrackingRepository(new InMemoryTrackedStorageRepository()); + return externalStorage; + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/GridNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/GridNetworkNodeFactory.java new file mode 100644 index 000000000..d883b3dc9 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/GridNetworkNodeFactory.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.grid.GridNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class GridNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + return new GridNetworkNode(getEnergyUsage(properties)); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ImporterNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ImporterNetworkNodeFactory.java new file mode 100644 index 000000000..140166c81 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/ImporterNetworkNodeFactory.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class ImporterNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + return new ImporterNetworkNode(getEnergyUsage(properties)); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/InterfaceNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/InterfaceNetworkNodeFactory.java new file mode 100644 index 000000000..df491a059 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/InterfaceNetworkNodeFactory.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class InterfaceNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + return new InterfaceNetworkNode(getEnergyUsage(properties)); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/NetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/NetworkNodeFactory.java new file mode 100644 index 000000000..aac0d307e --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/NetworkNodeFactory.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +@FunctionalInterface +public interface NetworkNodeFactory { + NetworkNode create(AddNetworkNode ctx, Map properties); +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayInputNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayInputNetworkNodeFactory.java new file mode 100644 index 000000000..704abcefa --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayInputNetworkNodeFactory.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayInputNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class RelayInputNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + return new RelayInputNetworkNode(getEnergyUsage(properties)); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayOutputNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayOutputNetworkNodeFactory.java new file mode 100644 index 000000000..60305e8f2 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/RelayOutputNetworkNodeFactory.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayOutputNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class RelayOutputNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + return new RelayOutputNetworkNode(getEnergyUsage(properties)); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/SimpleNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/SimpleNetworkNodeFactory.java new file mode 100644 index 000000000..cc59936b1 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/SimpleNetworkNodeFactory.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class SimpleNetworkNodeFactory extends AbstractNetworkNodeFactory { + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + return new SimpleNetworkNode(getEnergyUsage(properties)); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageNetworkNodeFactory.java new file mode 100644 index 000000000..e36cc4722 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageNetworkNodeFactory.java @@ -0,0 +1,23 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class StorageNetworkNodeFactory extends AbstractNetworkNodeFactory { + public static final String PROPERTY_ENERGY_USAGE_PER_STORAGE = "energy_usage_per_storage"; + public static final String PROPERTY_SIZE = "size"; + + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + final long energyUsagePerStorage = (long) properties.getOrDefault(PROPERTY_ENERGY_USAGE_PER_STORAGE, 0L); + final int size = (int) properties.getOrDefault(PROPERTY_SIZE, 9); + return new StorageNetworkNode( + getEnergyUsage(properties), + energyUsagePerStorage, + size + ); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageTransferNetworkNodeFactory.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageTransferNetworkNodeFactory.java new file mode 100644 index 000000000..31405d6c0 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/StorageTransferNetworkNodeFactory.java @@ -0,0 +1,23 @@ +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; + +import java.util.Map; + +public class StorageTransferNetworkNodeFactory extends AbstractNetworkNodeFactory { + public static final String PROPERTY_ENERGY_USAGE_PER_STORAGE = "energy_usage_per_storage"; + public static final String PROPERTY_SIZE = "size"; + + @Override + protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { + final long energyUsagePerStorage = (long) properties.getOrDefault(PROPERTY_ENERGY_USAGE_PER_STORAGE, 0L); + final int size = (int) properties.getOrDefault(PROPERTY_SIZE, 6); + return new StorageTransferNetworkNode( + getEnergyUsage(properties), + energyUsagePerStorage, + size + ); + } +} diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/package-info.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/package-info.java new file mode 100644 index 000000000..406166594 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/nodefactory/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.network.test.nodefactory; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/package-info.java b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/package-info.java new file mode 100644 index 000000000..91b976457 --- /dev/null +++ b/refinedstorage-network-test/src/main/java/com/refinedmods/refinedstorage/network/test/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.network.test; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/InheritanceNetworkTestExtensionTest.java b/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/InheritanceNetworkTestExtensionTest.java similarity index 77% rename from refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/InheritanceNetworkTestExtensionTest.java rename to refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/InheritanceNetworkTestExtensionTest.java index 9701c7175..9e03379d9 100644 --- a/refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/InheritanceNetworkTestExtensionTest.java +++ b/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/InheritanceNetworkTestExtensionTest.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.network.test; +package com.refinedmods.refinedstorage.network.test; -import com.refinedmods.refinedstorage2.api.network.Network; +import com.refinedmods.refinedstorage.api.network.Network; import org.junit.jupiter.api.Test; diff --git a/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkNodeFactoryTest.java b/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkNodeFactoryTest.java new file mode 100644 index 000000000..55612ee4d --- /dev/null +++ b/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkNodeFactoryTest.java @@ -0,0 +1,53 @@ +package com.refinedmods.refinedstorage.network.test; + +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.grid.GridNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayInputNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayOutputNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; + +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +@NetworkTest +@SetupNetwork +class NetworkNodeFactoryTest { + @AddNetworkNode + ControllerNetworkNode controller; + @AddNetworkNode + ExporterNetworkNode exporter; + @AddNetworkNode + GridNetworkNode grid; + @AddNetworkNode + ImporterNetworkNode importer; + @AddNetworkNode + SimpleNetworkNode simple; + @AddNetworkNode + StorageNetworkNode storage; + @AddNetworkNode + InterfaceNetworkNode interfaceNode; + @AddNetworkNode + ExternalStorageNetworkNode externalStorage; + @AddNetworkNode + DetectorNetworkNode detector; + @AddNetworkNode + RelayInputNetworkNode relayInput; + @AddNetworkNode + RelayOutputNetworkNode relayOutput; + @AddNetworkNode + StorageTransferNetworkNode storageTransfer; + + @Test + void testInitialization() { + // Assert + assertThat(this).hasNoNullFieldsOrProperties(); + } +} diff --git a/refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/NetworkTestExtensionTest.java b/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtensionTest.java similarity index 85% rename from refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/NetworkTestExtensionTest.java rename to refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtensionTest.java index 7f75d9e2d..32a428b98 100644 --- a/refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/NetworkTestExtensionTest.java +++ b/refinedstorage-network-test/src/test/java/com/refinedmods/refinedstorage/network/test/NetworkTestExtensionTest.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.network.test; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.SimpleNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.StorageNetworkNodeFactory; +package com.refinedmods.refinedstorage.network.test; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.SimpleNetworkNodeFactory; +import com.refinedmods.refinedstorage.network.test.nodefactory.StorageNetworkNodeFactory; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/refinedstorage-network/build.gradle b/refinedstorage-network/build.gradle new file mode 100644 index 000000000..4f2b3edab --- /dev/null +++ b/refinedstorage-network/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java-library' +} + +archivesBaseName = 'refinedstorage-network' + +dependencies { + api project(':refinedstorage-core-api') + api project(':refinedstorage-network-api') + api project(':refinedstorage-resource-api') + api project(':refinedstorage-storage-api') + api project(':refinedstorage-grid-api') + implementation libs.slf4j.api + testRuntimeOnly libs.slf4j.impl + testImplementation libs.junit.api + testImplementation libs.junit.params + testRuntimeOnly libs.junit.engine + testImplementation libs.assertj + testImplementation libs.mockito + testImplementation project(':refinedstorage-network-test') +} + +test { + useJUnitPlatform() +} + +enableMutationTesting() +enablePublishing() diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkBuilderImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkBuilderImpl.java similarity index 92% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkBuilderImpl.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkBuilderImpl.java index 2ab334726..29bb97357 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkBuilderImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkBuilderImpl.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.api.network.impl; - -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.network.ConnectionProvider; -import com.refinedmods.refinedstorage2.api.network.Connections; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.NetworkBuilder; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +package com.refinedmods.refinedstorage.api.network.impl; + +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.network.ConnectionProvider; +import com.refinedmods.refinedstorage.api.network.Connections; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.NetworkBuilder; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import java.util.Collections; import java.util.Comparator; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkFactory.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkFactory.java new file mode 100644 index 000000000..a8540d522 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkFactory.java @@ -0,0 +1,17 @@ +package com.refinedmods.refinedstorage.api.network.impl; + +import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.NetworkComponent; + +public class NetworkFactory { + private final ComponentMapFactory componentMapFactory; + + public NetworkFactory(final ComponentMapFactory componentMapFactory) { + this.componentMapFactory = componentMapFactory; + } + + public Network create() { + return new NetworkImpl(componentMapFactory); + } +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkImpl.java new file mode 100644 index 000000000..138d12aa2 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/NetworkImpl.java @@ -0,0 +1,47 @@ +package com.refinedmods.refinedstorage.api.network.impl; + +import com.refinedmods.refinedstorage.api.core.component.ComponentMap; +import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.NetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; + +import java.util.Set; + +public class NetworkImpl implements Network { + private final ComponentMap componentMap; + + public NetworkImpl(final ComponentMapFactory componentMapFactory) { + this.componentMap = componentMapFactory.buildComponentMap(this); + } + + @Override + public void addContainer(final NetworkNodeContainer container) { + componentMap.getComponents().forEach(c -> c.onContainerAdded(container)); + } + + @Override + public void removeContainer(final NetworkNodeContainer container) { + componentMap.getComponents().forEach(c -> c.onContainerRemoved(container)); + } + + @Override + public void remove() { + componentMap.getComponents().forEach(NetworkComponent::onNetworkRemoved); + } + + @Override + public void split(final Set networks) { + componentMap.getComponents().forEach(c -> c.onNetworkSplit(networks)); + } + + @Override + public void merge(final Network network) { + componentMap.getComponents().forEach(c -> c.onNetworkMergedWith(network)); + } + + @Override + public I getComponent(final Class componentType) { + return componentMap.getComponent(componentType); + } +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/AbstractListeningEnergyStorage.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/AbstractListeningEnergyStorage.java similarity index 80% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/AbstractListeningEnergyStorage.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/AbstractListeningEnergyStorage.java index fa61feb4a..b4d737fc2 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/AbstractListeningEnergyStorage.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/AbstractListeningEnergyStorage.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.network.impl.energy; +package com.refinedmods.refinedstorage.api.network.impl.energy; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; public abstract class AbstractListeningEnergyStorage extends AbstractProxyEnergyStorage { protected AbstractListeningEnergyStorage(final EnergyStorage delegate) { diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/AbstractProxyEnergyStorage.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/AbstractProxyEnergyStorage.java similarity index 78% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/AbstractProxyEnergyStorage.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/AbstractProxyEnergyStorage.java index edad26ca2..797f8d9b7 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/AbstractProxyEnergyStorage.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/AbstractProxyEnergyStorage.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.network.impl.energy; +package com.refinedmods.refinedstorage.api.network.impl.energy; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; public abstract class AbstractProxyEnergyStorage implements EnergyStorage { private final EnergyStorage energyStorage; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyNetworkComponentImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyNetworkComponentImpl.java similarity index 85% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyNetworkComponentImpl.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyNetworkComponentImpl.java index 2c158a91a..7928a41da 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyNetworkComponentImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyNetworkComponentImpl.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl.energy; +package com.refinedmods.refinedstorage.api.network.impl.energy; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyProvider; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.energy.EnergyProvider; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import java.util.LinkedHashSet; import java.util.Set; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyStorageImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyStorageImpl.java similarity index 81% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyStorageImpl.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyStorageImpl.java index b98e91f2f..4a8ee4ded 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyStorageImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyStorageImpl.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl.energy; +package com.refinedmods.refinedstorage.api.network.impl.energy; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; public class EnergyStorageImpl implements EnergyStorage { private final long capacity; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/package-info.java new file mode 100644 index 000000000..66c1b7399 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/energy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.energy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/AbstractNetworkNode.java similarity index 77% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/AbstractNetworkNode.java index ab56f816f..895c46a56 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/AbstractNetworkNode.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node; +package com.refinedmods.refinedstorage.api.network.impl.node; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; import javax.annotation.Nullable; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractStorageContainerNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/AbstractStorageContainerNetworkNode.java similarity index 93% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractStorageContainerNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/AbstractStorageContainerNetworkNode.java index ab85afb5d..cce55cf4a 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/AbstractStorageContainerNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/AbstractStorageContainerNetworkNode.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node; +package com.refinedmods.refinedstorage.api.network.impl.node; -import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.StorageState; +import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.StorageState; import java.util.ArrayList; import java.util.Arrays; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/GraphNetworkComponentImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/GraphNetworkComponentImpl.java similarity index 93% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/GraphNetworkComponentImpl.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/GraphNetworkComponentImpl.java index 8abdde984..a45e64a27 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/GraphNetworkComponentImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/GraphNetworkComponentImpl.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node; +package com.refinedmods.refinedstorage.api.network.impl.node; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/SimpleNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNode.java similarity index 85% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/SimpleNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNode.java index c96642d8f..0f5f24848 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/SimpleNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node; +package com.refinedmods.refinedstorage.api.network.impl.node; public class SimpleNetworkNode extends AbstractNetworkNode { private long energyUsage; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/container/NetworkNodeContainerPriorities.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/NetworkNodeContainerPriorities.java similarity index 93% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/container/NetworkNodeContainerPriorities.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/NetworkNodeContainerPriorities.java index 98e9c8113..987e4d235 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/container/NetworkNodeContainerPriorities.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/NetworkNodeContainerPriorities.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.container; +package com.refinedmods.refinedstorage.api.network.impl.node.container; public final class NetworkNodeContainerPriorities { /** diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/package-info.java new file mode 100644 index 000000000..fc81a1dfc --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/container/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.container; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerEnergyState.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerEnergyState.java new file mode 100644 index 000000000..44e2a9f11 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerEnergyState.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.controller; + +public enum ControllerEnergyState { + OFF, + NEARLY_ON, + ON, + NEARLY_OFF +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerNetworkNode.java similarity index 83% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerNetworkNode.java index c5ff7f7aa..bc94239f7 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerNetworkNode.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.controller; +package com.refinedmods.refinedstorage.api.network.impl.node.controller; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyProvider; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyProvider; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import javax.annotation.Nullable; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/package-info.java new file mode 100644 index 000000000..139ecea02 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.controller; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java new file mode 100644 index 000000000..b139f568d --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.detector; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; + +public abstract class AbstractDetectorAmountStrategy implements DetectorAmountStrategy { + protected StorageChannel getStorageChannel(final Network network) { + return network.getComponent(StorageNetworkComponent.class); + } +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategy.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategy.java new file mode 100644 index 000000000..c8e1a246a --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategy.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.detector; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +public interface DetectorAmountStrategy { + long getAmount(Network network, ResourceKey configuredResource); +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategyImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategyImpl.java new file mode 100644 index 000000000..3b0ef8c65 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorAmountStrategyImpl.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.detector; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +public class DetectorAmountStrategyImpl extends AbstractDetectorAmountStrategy { + @Override + public long getAmount(final Network network, final ResourceKey configuredResource) { + return getStorageChannel(network) + .get(configuredResource) + .map(ResourceAmount::getAmount) + .orElse(0L); + } +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorMode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorMode.java new file mode 100644 index 000000000..be798eff1 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorMode.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.detector; + +public enum DetectorMode { + UNDER, + EQUAL, + ABOVE +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorNetworkNode.java similarity index 87% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorNetworkNode.java index 80a6d0ece..a0577e32b 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorNetworkNode.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.detector; +package com.refinedmods.refinedstorage.api.network.impl.node.detector; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import javax.annotation.Nullable; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/package-info.java new file mode 100644 index 000000000..22744e885 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.detector; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/CompositeExporterTransferStrategy.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/CompositeExporterTransferStrategy.java new file mode 100644 index 000000000..00d648e68 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/CompositeExporterTransferStrategy.java @@ -0,0 +1,26 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.exporter; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import java.util.List; + +public class CompositeExporterTransferStrategy implements ExporterTransferStrategy { + private final List strategies; + + public CompositeExporterTransferStrategy(final List strategies) { + this.strategies = strategies; + } + + @Override + public boolean transfer(final ResourceKey resource, final Actor actor, final Network network) { + for (final ExporterTransferStrategy strategy : strategies) { + if (strategy.transfer(resource, actor, network)) { + return true; + } + } + return false; + } +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/ExporterNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterNetworkNode.java similarity index 75% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/ExporterNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterNetworkNode.java index 456528588..b6ade059f 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/ExporterNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterNetworkNode.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.exporter; +package com.refinedmods.refinedstorage.api.network.impl.node.exporter; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNodeActor; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.node.task.Task; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.NetworkNodeActor; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.node.task.Task; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java similarity index 75% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java index 086e9250c..0118f91b0 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/ExporterTransferStrategyImpl.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.exporter; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.api.storage.TransferHelper; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; +package com.refinedmods.refinedstorage.api.network.impl.node.exporter; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.api.storage.TransferHelper; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; import java.util.Collection; import java.util.Collections; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/package-info.java new file mode 100644 index 000000000..470bb08f8 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExposedExternalStorage.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExposedExternalStorage.java similarity index 79% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExposedExternalStorage.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExposedExternalStorage.java index 72d6860de..143b6d52e 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExposedExternalStorage.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExposedExternalStorage.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage; +package com.refinedmods.refinedstorage.api.network.impl.node.externalstorage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.storage.AbstractConfiguredProxyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.storage.StorageConfiguration; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.composite.ParentComposite; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorage; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageListener; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageRepository; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.storage.AbstractConfiguredProxyStorage; +import com.refinedmods.refinedstorage.api.network.impl.storage.StorageConfiguration; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.composite.ParentComposite; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorage; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageListener; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; import java.util.HashSet; import java.util.Optional; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java new file mode 100644 index 000000000..b81258831 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java @@ -0,0 +1,76 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.externalstorage; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.storage.NetworkNodeStorageConfiguration; +import com.refinedmods.refinedstorage.api.network.impl.storage.StorageConfiguration; +import com.refinedmods.refinedstorage.api.network.node.externalstorage.ExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.api.network.storage.StorageProvider; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; + +import java.util.function.LongSupplier; +import javax.annotation.Nullable; + +public class ExternalStorageNetworkNode extends AbstractNetworkNode implements StorageProvider { + private final long energyUsage; + private final StorageConfiguration storageConfiguration; + private final ExposedExternalStorage storage; + @Nullable + private ExternalStorage externalStorage; + + public ExternalStorageNetworkNode(final long energyUsage, final LongSupplier clock) { + this.energyUsage = energyUsage; + this.storageConfiguration = new NetworkNodeStorageConfiguration(this); + this.storage = new ExposedExternalStorage(storageConfiguration, clock); + } + + public StorageConfiguration getStorageConfiguration() { + return storageConfiguration; + } + + public void setTrackingRepository(final TrackedStorageRepository trackingRepository) { + storage.setTrackingRepository(trackingRepository); + } + + public void initialize(final ExternalStorageProviderFactory factory) { + storage.tryClearDelegate(); + factory.create().ifPresent(provider -> { + this.externalStorage = new ExternalStorage(provider, storage); + if (isActive()) { + setVisible(true); + } + }); + } + + @Override + protected void onActiveChanged(final boolean newActive) { + super.onActiveChanged(newActive); + setVisible(newActive); + } + + public boolean detectChanges() { + return storage.detectChanges(); + } + + @Override + public long getEnergyUsage() { + return energyUsage; + } + + @Override + public Storage getStorage() { + return storage; + } + + private void setVisible(final boolean visible) { + if (visible) { + if (externalStorage == null) { + return; + } + storage.setDelegate(externalStorage); + } else { + storage.tryClearDelegate(); + } + } +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/package-info.java new file mode 100644 index 000000000..7694f5c5b --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/GridNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/GridNetworkNode.java new file mode 100644 index 000000000..519b95b74 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/GridNetworkNode.java @@ -0,0 +1,52 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.grid; + +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcherManager; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcherManagerImpl; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import javax.annotation.Nullable; + +import static java.util.Objects.requireNonNull; + +public class GridNetworkNode extends AbstractNetworkNode { + private final long energyUsage; + private final GridWatcherManager watchers = new GridWatcherManagerImpl(); + + public GridNetworkNode(final long energyUsage) { + this.energyUsage = energyUsage; + } + + @Override + public long getEnergyUsage() { + return energyUsage; + } + + public void addWatcher(final GridWatcher watcher, final Class actorType) { + watchers.addWatcher(watcher, actorType, requireNonNull(network).getComponent(StorageNetworkComponent.class)); + } + + public void removeWatcher(final GridWatcher watcher) { + watchers.removeWatcher(watcher, requireNonNull(network).getComponent(StorageNetworkComponent.class)); + } + + @Override + protected void onActiveChanged(final boolean newActive) { + super.onActiveChanged(newActive); + watchers.activeChanged(newActive); + } + + @Override + public void setNetwork(@Nullable final Network network) { + if (this.network != null) { + watchers.detachAll(this.network.getComponent(StorageNetworkComponent.class)); + } + super.setNetwork(network); + if (this.network != null) { + watchers.attachAll(this.network.getComponent(StorageNetworkComponent.class)); + } + } +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/package-info.java new file mode 100644 index 000000000..c0ddda2b2 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.grid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceExportState.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportState.java similarity index 76% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceExportState.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportState.java index 17a48ff1a..2c71fb43f 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceExportState.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportState.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface; +package com.refinedmods.refinedstorage.api.network.impl.node.iface; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; import java.util.Collection; import javax.annotation.Nullable; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNode.java similarity index 88% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNode.java index 2e48a7f8d..994f6ea7c 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNode.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExposedExternalStorage; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProvider; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNodeActor; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; +package com.refinedmods.refinedstorage.api.network.impl.node.iface; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExposedExternalStorage; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProvider; +import com.refinedmods.refinedstorage.api.network.node.NetworkNodeActor; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; import java.util.Collection; import java.util.function.ToLongFunction; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProvider.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProvider.java new file mode 100644 index 000000000..4af8d2718 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProvider.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage; + +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; + +import javax.annotation.Nullable; + +public interface InterfaceExternalStorageProvider extends ExternalStorageProvider { + @Nullable + InterfaceNetworkNode getInterface(); +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImpl.java similarity index 80% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImpl.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImpl.java index 1f1bb9c77..c07ef1c63 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImpl.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage; +package com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceExportState; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNodeActor; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceExportState; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.NetworkNodeActor; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; import java.util.ArrayList; import java.util.Collections; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/package-info.java new file mode 100644 index 000000000..cda240816 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/package-info.java new file mode 100644 index 000000000..50a6db6ee --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.iface; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterNetworkNode.java new file mode 100644 index 000000000..efb345c29 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterNetworkNode.java @@ -0,0 +1,68 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.importer; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.NetworkNodeActor; +import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.function.UnaryOperator; + +public class ImporterNetworkNode extends AbstractNetworkNode { + private long energyUsage; + private final Filter filter = new Filter(); + private final Actor actor = new NetworkNodeActor(this); + private final List transferStrategies = new ArrayList<>(); + + public ImporterNetworkNode(final long energyUsage) { + this.energyUsage = energyUsage; + } + + public void setTransferStrategies(final List transferStrategies) { + this.transferStrategies.clear(); + this.transferStrategies.addAll(transferStrategies); + } + + @Override + public void doWork() { + super.doWork(); + if (network == null || !isActive()) { + return; + } + for (final ImporterTransferStrategy transferStrategy : transferStrategies) { + if (transferStrategy.transfer(filter, actor, network)) { + return; + } + } + } + + public FilterMode getFilterMode() { + return filter.getMode(); + } + + public void setFilterMode(final FilterMode mode) { + filter.setMode(mode); + } + + public void setNormalizer(final UnaryOperator normalizer) { + filter.setNormalizer(normalizer); + } + + public void setFilters(final Set filters) { + filter.setFilters(filters); + } + + public void setEnergyUsage(final long energyUsage) { + this.energyUsage = energyUsage; + } + + @Override + public long getEnergyUsage() { + return energyUsage; + } +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterSource.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterSource.java new file mode 100644 index 000000000..f74cb7da4 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterSource.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.importer; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; + +import java.util.Iterator; + +import org.apiguardian.api.API; + +/** + * Represents a source for the importer. + * A valid source for the importer needs to be an {@link ExtractableStorage}, so the resources can be extracted + * for insertion into the target network. + * A valid source for the importer needs to be a {@link InsertableStorage} as well, so that transfers that end up + * failing can be given back to the source. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") +public interface ImporterSource extends ExtractableStorage, InsertableStorage { + /** + * @return the resources that this source has + */ + Iterator getResources(); +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterTransferStrategyImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterTransferStrategyImpl.java similarity index 80% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterTransferStrategyImpl.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterTransferStrategyImpl.java index bd343045f..5f09e2b49 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterTransferStrategyImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterTransferStrategyImpl.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.importer; +package com.refinedmods.refinedstorage.api.network.impl.node.importer; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.TransferHelper; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.TransferHelper; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; import java.util.Iterator; import java.util.Objects; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/package-info.java new file mode 100644 index 000000000..cd7ee5d7b --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/package-info.java new file mode 100644 index 000000000..37b5feaa4 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayComponentType.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayComponentType.java new file mode 100644 index 000000000..5366e818d --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayComponentType.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.relay; + +public enum RelayComponentType { + ENERGY, + SECURITY, + STORAGE +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayInputNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayInputNetworkNode.java similarity index 83% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayInputNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayInputNetworkNode.java index 955f7c097..cdca4d326 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayInputNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayInputNetworkNode.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.relay; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; +package com.refinedmods.refinedstorage.api.network.impl.node.relay; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; import java.util.HashSet; import java.util.Set; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayOutputNetworkNode.java similarity index 75% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayOutputNetworkNode.java index 2abe51359..6e7b6e7c1 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayOutputNetworkNode.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.relay; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyProvider; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.security.Permission; -import com.refinedmods.refinedstorage2.api.network.security.SecurityActor; -import com.refinedmods.refinedstorage2.api.network.security.SecurityDecision; -import com.refinedmods.refinedstorage2.api.network.security.SecurityDecisionProvider; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageProvider; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.api.storage.Storage; +package com.refinedmods.refinedstorage.api.network.impl.node.relay; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.energy.EnergyProvider; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.security.SecurityActor; +import com.refinedmods.refinedstorage.api.network.security.SecurityDecision; +import com.refinedmods.refinedstorage.api.network.security.SecurityDecisionProvider; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageProvider; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.api.storage.Storage; import java.util.Set; import java.util.function.UnaryOperator; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputStorage.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayOutputStorage.java similarity index 83% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputStorage.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayOutputStorage.java index 0df45fbc0..96f1756f5 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayOutputStorage.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayOutputStorage.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.relay; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.listenable.ResourceListListener; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.composite.CompositeAwareChild; -import com.refinedmods.refinedstorage2.api.storage.composite.ParentComposite; -import com.refinedmods.refinedstorage2.api.storage.composite.PriorityProvider; +package com.refinedmods.refinedstorage.api.network.impl.node.relay; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.listenable.ResourceListListener; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.composite.CompositeAwareChild; +import com.refinedmods.refinedstorage.api.storage.composite.ParentComposite; +import com.refinedmods.refinedstorage.api.storage.composite.PriorityProvider; import java.util.Collection; import java.util.Collections; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/package-info.java new file mode 100644 index 000000000..a7792b5f4 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.relay; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/security/SecurityDecisionProviderProxyNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/security/SecurityDecisionProviderProxyNetworkNode.java similarity index 79% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/security/SecurityDecisionProviderProxyNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/security/SecurityDecisionProviderProxyNetworkNode.java index db3c3b443..53b112f1d 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/security/SecurityDecisionProviderProxyNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/security/SecurityDecisionProviderProxyNetworkNode.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.security; +package com.refinedmods.refinedstorage.api.network.impl.node.security; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.security.Permission; -import com.refinedmods.refinedstorage2.api.network.security.SecurityActor; -import com.refinedmods.refinedstorage2.api.network.security.SecurityDecision; -import com.refinedmods.refinedstorage2.api.network.security.SecurityDecisionProvider; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.security.SecurityActor; +import com.refinedmods.refinedstorage.api.network.security.SecurityDecision; +import com.refinedmods.refinedstorage.api.network.security.SecurityDecisionProvider; import javax.annotation.Nullable; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/security/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/security/package-info.java new file mode 100644 index 000000000..b832a7db8 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/security/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.security; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/ExposedStorage.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/ExposedStorage.java new file mode 100644 index 000000000..403db7e6f --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/ExposedStorage.java @@ -0,0 +1,76 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.storage; + +import com.refinedmods.refinedstorage.api.network.impl.storage.AbstractImmutableConfiguredProxyStorage; +import com.refinedmods.refinedstorage.api.network.impl.storage.StorageConfiguration; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.composite.CompositeStorage; +import com.refinedmods.refinedstorage.api.storage.composite.CompositeStorageImpl; +import com.refinedmods.refinedstorage.api.storage.composite.ParentComposite; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; + +import java.util.List; +import java.util.Optional; + +class ExposedStorage extends AbstractImmutableConfiguredProxyStorage implements CompositeStorage { + protected ExposedStorage(final StorageConfiguration config) { + super(config, new CompositeStorageImpl(new ResourceListImpl())); + } + + long getCapacity() { + final CompositeStorageImpl delegate = getUnsafeDelegate(); + if (delegate == null) { + return 0; + } + return delegate.getSources() + .stream() + .filter(LimitedStorage.class::isInstance) + .map(LimitedStorage.class::cast) + .mapToLong(LimitedStorage::getCapacity) + .sum(); + } + + @Override + public void sortSources() { + // no-op: cannot sort individual storages. + } + + @Override + public void addSource(final Storage source) { + getDelegate().addSource(source); + } + + @Override + public void removeSource(final Storage source) { + getDelegate().removeSource(source); + } + + @Override + public List getSources() { + return getDelegate().getSources(); + } + + @Override + public void clearSources() { + getDelegate().clearSources(); + } + + @Override + public Optional findTrackedResourceByActorType(final ResourceKey resource, + final Class actorType) { + return getDelegate().findTrackedResourceByActorType(resource, actorType); + } + + @Override + public void onAddedIntoComposite(final ParentComposite parentComposite) { + getDelegate().onAddedIntoComposite(parentComposite); + } + + @Override + public void onRemovedFromComposite(final ParentComposite parentComposite) { + getDelegate().onRemovedFromComposite(parentComposite); + } +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNode.java similarity index 78% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNode.java index 7a92a5971..c141c3e4b 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNode.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.storage; +package com.refinedmods.refinedstorage.api.network.impl.node.storage; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractStorageContainerNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.storage.NetworkNodeStorageConfiguration; -import com.refinedmods.refinedstorage2.api.network.impl.storage.StorageConfiguration; -import com.refinedmods.refinedstorage2.api.network.storage.StorageProvider; -import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.storage.NetworkNodeStorageConfiguration; +import com.refinedmods.refinedstorage.api.network.impl.storage.StorageConfiguration; +import com.refinedmods.refinedstorage.api.network.storage.StorageProvider; +import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/package-info.java new file mode 100644 index 000000000..81db7a8b7 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferListener.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferListener.java new file mode 100644 index 000000000..7ed2f9ba9 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferListener.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer; + +@FunctionalInterface +public interface StorageTransferListener { + void onTransferSuccess(int index); +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferMode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferMode.java new file mode 100644 index 000000000..55ef387b7 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferMode.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer; + +public enum StorageTransferMode { + INSERT_INTO_NETWORK, + EXTRACT_FROM_NETWORK +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java similarity index 84% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java index 59fd6bace..a6d0bcbf3 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferNetworkNode.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractStorageContainerNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNodeActor; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.TransferHelper; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; +package com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.NetworkNodeActor; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.TransferHelper; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/package-info.java new file mode 100644 index 000000000..413856ef4 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/DefaultTaskExecutor.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/DefaultTaskExecutor.java new file mode 100644 index 000000000..111857b52 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/DefaultTaskExecutor.java @@ -0,0 +1,17 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.task; + +import com.refinedmods.refinedstorage.api.network.node.task.Task; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; + +import java.util.List; + +public class DefaultTaskExecutor implements TaskExecutor { + @Override + public void execute(final List> tasks, final C context) { + for (final Task task : tasks) { + if (task.run(context)) { + return; + } + } + } +} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/RandomTaskExecutor.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/RandomTaskExecutor.java similarity index 78% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/RandomTaskExecutor.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/RandomTaskExecutor.java index 1767caf79..1b8e8aff3 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/RandomTaskExecutor.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/RandomTaskExecutor.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.task; +package com.refinedmods.refinedstorage.api.network.impl.node.task; -import com.refinedmods.refinedstorage2.api.network.node.task.Task; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.network.node.task.Task; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/RoundRobinTaskExecutor.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/RoundRobinTaskExecutor.java similarity index 86% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/RoundRobinTaskExecutor.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/RoundRobinTaskExecutor.java index 624449460..ee10f89b7 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/RoundRobinTaskExecutor.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/RoundRobinTaskExecutor.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.task; +package com.refinedmods.refinedstorage.api.network.impl.node.task; -import com.refinedmods.refinedstorage2.api.network.node.task.Task; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.network.node.task.Task; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; import java.util.List; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/package-info.java new file mode 100644 index 000000000..1cb37eec4 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/node/task/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.node.task; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/package-info.java new file mode 100644 index 000000000..0e794b049 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/SecurityDecisionProviderImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/SecurityDecisionProviderImpl.java similarity index 76% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/SecurityDecisionProviderImpl.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/SecurityDecisionProviderImpl.java index 006dc6e91..cd45c5adb 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/SecurityDecisionProviderImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/SecurityDecisionProviderImpl.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.api.network.impl.security; +package com.refinedmods.refinedstorage.api.network.impl.security; -import com.refinedmods.refinedstorage2.api.network.security.Permission; -import com.refinedmods.refinedstorage2.api.network.security.SecurityActor; -import com.refinedmods.refinedstorage2.api.network.security.SecurityDecision; -import com.refinedmods.refinedstorage2.api.network.security.SecurityDecisionProvider; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.security.SecurityActor; +import com.refinedmods.refinedstorage.api.network.security.SecurityDecision; +import com.refinedmods.refinedstorage.api.network.security.SecurityDecisionProvider; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/SecurityNetworkComponentImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/SecurityNetworkComponentImpl.java similarity index 80% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/SecurityNetworkComponentImpl.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/SecurityNetworkComponentImpl.java index a2d7f9918..2ea075c42 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/SecurityNetworkComponentImpl.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/SecurityNetworkComponentImpl.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.api.network.impl.security; +package com.refinedmods.refinedstorage.api.network.impl.security; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; -import com.refinedmods.refinedstorage2.api.network.security.Permission; -import com.refinedmods.refinedstorage2.api.network.security.SecurityActor; -import com.refinedmods.refinedstorage2.api.network.security.SecurityDecision; -import com.refinedmods.refinedstorage2.api.network.security.SecurityDecisionProvider; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.security.SecurityActor; +import com.refinedmods.refinedstorage.api.network.security.SecurityDecision; +import com.refinedmods.refinedstorage.api.network.security.SecurityDecisionProvider; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; import java.util.LinkedHashSet; import java.util.Set; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/package-info.java new file mode 100644 index 000000000..8af1b04db --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/security/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.security; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractConfiguredProxyStorage.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/AbstractConfiguredProxyStorage.java similarity index 84% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractConfiguredProxyStorage.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/AbstractConfiguredProxyStorage.java index cf4c35272..eac3f8872 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractConfiguredProxyStorage.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/AbstractConfiguredProxyStorage.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.api.network.impl.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.composite.CompositeAwareChild; -import com.refinedmods.refinedstorage2.api.storage.composite.PriorityProvider; +package com.refinedmods.refinedstorage.api.network.impl.storage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.composite.CompositeAwareChild; +import com.refinedmods.refinedstorage.api.storage.composite.PriorityProvider; import java.util.Collection; import java.util.Collections; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractImmutableConfiguredProxyStorage.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/AbstractImmutableConfiguredProxyStorage.java similarity index 85% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractImmutableConfiguredProxyStorage.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/AbstractImmutableConfiguredProxyStorage.java index 174e59b36..f870f5bd3 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/AbstractImmutableConfiguredProxyStorage.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/AbstractImmutableConfiguredProxyStorage.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.network.impl.storage; +package com.refinedmods.refinedstorage.api.network.impl.storage; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.Storage; import org.apiguardian.api.API; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/NetworkNodeStorageConfiguration.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/NetworkNodeStorageConfiguration.java similarity index 78% rename from refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/NetworkNodeStorageConfiguration.java rename to refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/NetworkNodeStorageConfiguration.java index 3e469fe36..d2ede1e4c 100644 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/NetworkNodeStorageConfiguration.java +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/NetworkNodeStorageConfiguration.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.api.network.impl.storage; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; +package com.refinedmods.refinedstorage.api.network.impl.storage; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; import java.util.Set; import java.util.function.UnaryOperator; diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageConfiguration.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageConfiguration.java new file mode 100644 index 000000000..e878d2880 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageConfiguration.java @@ -0,0 +1,36 @@ +package com.refinedmods.refinedstorage.api.network.impl.storage; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.api.storage.composite.PriorityProvider; + +import java.util.Set; +import java.util.function.UnaryOperator; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") +public interface StorageConfiguration extends PriorityProvider { + AccessMode getAccessMode(); + + boolean isVoidExcess(); + + void setVoidExcess(boolean voidExcess); + + void setAccessMode(AccessMode accessMode); + + FilterMode getFilterMode(); + + boolean isAllowed(ResourceKey resource); + + void setFilters(Set filters); + + void setNormalizer(UnaryOperator normalizer); + + void setFilterMode(FilterMode filterMode); + + void setPriority(int priority); + + boolean isActive(); +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImpl.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImpl.java new file mode 100644 index 000000000..144a71d71 --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImpl.java @@ -0,0 +1,54 @@ +package com.refinedmods.refinedstorage.api.network.impl.storage; + +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageProvider; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class StorageNetworkComponentImpl extends StorageChannelImpl implements StorageNetworkComponent { + private static final Logger LOGGER = LoggerFactory.getLogger(StorageNetworkComponentImpl.class); + + public StorageNetworkComponentImpl(final ResourceList list) { + super(list); + } + + @Override + public void onContainerAdded(final NetworkNodeContainer container) { + if (container.getNode() instanceof StorageProvider provider) { + final Storage storage = provider.getStorage(); + LOGGER.debug("Adding source {} from provider {}", storage, provider); + addSource(storage); + } + } + + @Override + public void onContainerRemoved(final NetworkNodeContainer container) { + if (container.getNode() instanceof StorageProvider provider) { + final Storage storage = provider.getStorage(); + LOGGER.debug("Removing source {} of provider {}", storage, provider); + removeSource(storage); + } + } + + @Override + public List getResources(final Class actorType) { + return getAll().stream().map(resourceAmount -> new TrackedResourceAmount( + resourceAmount, + findTrackedResourceByActorType(resourceAmount.getResource(), actorType).orElse(null) + )).toList(); + } + + @Override + public boolean contains(final Storage storage) { + return this.storage.contains(storage); + } +} diff --git a/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/package-info.java b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/package-info.java new file mode 100644 index 000000000..d319b171e --- /dev/null +++ b/refinedstorage-network/src/main/java/com/refinedmods/refinedstorage/api/network/impl/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.network.impl.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-network/src/main/resources/fabric.mod.json b/refinedstorage-network/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..fd70f35e4 --- /dev/null +++ b/refinedstorage-network/src/main/resources/fabric.mod.json @@ -0,0 +1,19 @@ +{ + "schemaVersion": 1, + "id": "refinedstorage-network", + "version": "${version}", + "name": "Refined Storage Network", + "authors": [ + "Refined Mods" + ], + "license": "MIT", + "environment": "*", + "custom": { + "modmenu": { + "parent": "refinedstorage", + "badges": [ + "library" + ] + } + } +} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/AbstractNetworkBuilderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/AbstractNetworkBuilderImplTest.java similarity index 88% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/AbstractNetworkBuilderImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/AbstractNetworkBuilderImplTest.java index 7baf1d54b..06c4656de 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/AbstractNetworkBuilderImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/AbstractNetworkBuilderImplTest.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.api.network.impl; - -import com.refinedmods.refinedstorage2.api.core.component.ComponentMapFactory; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.NetworkBuilder; -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; -import com.refinedmods.refinedstorage2.network.test.NetworkTestFixtures; +package com.refinedmods.refinedstorage.api.network.impl; + +import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.NetworkBuilder; +import com.refinedmods.refinedstorage.api.network.NetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.network.test.NetworkTestFixtures; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/FakeConnectionProvider.java similarity index 90% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/FakeConnectionProvider.java index 30635e346..7d946a673 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/FakeConnectionProvider.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl; +package com.refinedmods.refinedstorage.api.network.impl; -import com.refinedmods.refinedstorage2.api.network.ConnectionProvider; -import com.refinedmods.refinedstorage2.api.network.Connections; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.ConnectionProvider; +import com.refinedmods.refinedstorage.api.network.Connections; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import java.util.ArrayList; import java.util.Collections; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/InitializeNetworkBuilderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/InitializeNetworkBuilderImplTest.java similarity index 97% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/InitializeNetworkBuilderImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/InitializeNetworkBuilderImplTest.java index 4fdfe747f..71356d4df 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/InitializeNetworkBuilderImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/InitializeNetworkBuilderImplTest.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl; +package com.refinedmods.refinedstorage.api.network.impl; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import org.junit.jupiter.api.Test; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/PriorityNetworkBuilderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/PriorityNetworkBuilderImplTest.java similarity index 80% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/PriorityNetworkBuilderImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/PriorityNetworkBuilderImplTest.java index 625e32e7c..7920bfef2 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/PriorityNetworkBuilderImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/PriorityNetworkBuilderImplTest.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.api.network.impl; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.api.network.ConnectionProvider; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.container.NetworkNodeContainerPriorities; -import com.refinedmods.refinedstorage2.api.network.impl.node.grid.GridNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.network.test.fake.FakeActor; +package com.refinedmods.refinedstorage.api.network.impl; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage.api.network.ConnectionProvider; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.container.NetworkNodeContainerPriorities; +import com.refinedmods.refinedstorage.api.network.impl.node.grid.GridNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.network.test.fake.FakeActor; import java.util.Optional; import java.util.function.Supplier; @@ -19,8 +19,8 @@ import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static com.refinedmods.refinedstorage2.api.network.impl.PriorityNetworkBuilderImplTest.MasterSlave.MASTER; -import static com.refinedmods.refinedstorage2.api.network.impl.PriorityNetworkBuilderImplTest.MasterSlave.SLAVE; +import static com.refinedmods.refinedstorage.api.network.impl.PriorityNetworkBuilderImplTest.MasterSlave.MASTER; +import static com.refinedmods.refinedstorage.api.network.impl.PriorityNetworkBuilderImplTest.MasterSlave.SLAVE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.inOrder; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/RemoveNetworkBuilderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/RemoveNetworkBuilderImplTest.java similarity index 97% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/RemoveNetworkBuilderImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/RemoveNetworkBuilderImplTest.java index d83d71a2a..0906e28a3 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/RemoveNetworkBuilderImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/RemoveNetworkBuilderImplTest.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl; +package com.refinedmods.refinedstorage.api.network.impl; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import java.util.List; import java.util.Set; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/SpyingNetworkNode.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/SpyingNetworkNode.java similarity index 80% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/SpyingNetworkNode.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/SpyingNetworkNode.java index 8d9ab159a..2293aebdc 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/SpyingNetworkNode.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/SpyingNetworkNode.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.network.impl; +package com.refinedmods.refinedstorage.api.network.impl; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; public final class SpyingNetworkNode extends AbstractNetworkNode { private final long energyUsage; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/UpdateNetworkBuilderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/UpdateNetworkBuilderImplTest.java similarity index 98% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/UpdateNetworkBuilderImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/UpdateNetworkBuilderImplTest.java index bfa4da26f..429409722 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/UpdateNetworkBuilderImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/UpdateNetworkBuilderImplTest.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.network.impl; +package com.refinedmods.refinedstorage.api.network.impl; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import java.util.Set; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyNetworkComponentImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyNetworkComponentImplTest.java similarity index 92% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyNetworkComponentImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyNetworkComponentImplTest.java index 90778ffe3..7214f001d 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyNetworkComponentImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyNetworkComponentImplTest.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.api.network.impl.energy; +package com.refinedmods.refinedstorage.api.network.impl.energy; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; import org.junit.jupiter.api.Test; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyStorageImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyStorageImplTest.java similarity index 95% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyStorageImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyStorageImplTest.java index 558600c51..cec96dc5b 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/EnergyStorageImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/EnergyStorageImplTest.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.network.impl.energy; +package com.refinedmods.refinedstorage.api.network.impl.energy; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/ListeningEnergyStorageTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/ListeningEnergyStorageTest.java similarity index 95% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/ListeningEnergyStorageTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/ListeningEnergyStorageTest.java index de8f4165d..bfb269fd6 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/ListeningEnergyStorageTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/ListeningEnergyStorageTest.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.network.impl.energy; +package com.refinedmods.refinedstorage.api.network.impl.energy; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/ProxyEnergyStorageTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/ProxyEnergyStorageTest.java similarity index 87% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/ProxyEnergyStorageTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/ProxyEnergyStorageTest.java index 2e391cbb1..effc61287 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/energy/ProxyEnergyStorageTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/energy/ProxyEnergyStorageTest.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.network.impl.energy; +package com.refinedmods.refinedstorage.api.network.impl.energy; -import com.refinedmods.refinedstorage2.api.core.Action; +import com.refinedmods.refinedstorage.api.core.Action; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/GraphNetworkComponentImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/GraphNetworkComponentImplTest.java similarity index 95% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/GraphNetworkComponentImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/GraphNetworkComponentImplTest.java index b577f37c2..a8432d265 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/GraphNetworkComponentImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/GraphNetworkComponentImplTest.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node; +package com.refinedmods.refinedstorage.api.network.impl.node; -import com.refinedmods.refinedstorage2.api.network.impl.NetworkImpl; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; -import com.refinedmods.refinedstorage2.network.test.NetworkTestFixtures; +import com.refinedmods.refinedstorage.api.network.impl.NetworkImpl; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.network.test.NetworkTestFixtures; import java.util.Set; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/ProviderImpl.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/ProviderImpl.java similarity index 81% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/ProviderImpl.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/ProviderImpl.java index a55d74eda..b10c79396 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/ProviderImpl.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/ProviderImpl.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node; +package com.refinedmods.refinedstorage.api.network.impl.node; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.Storage; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNodeTest.java new file mode 100644 index 000000000..cdb7cd507 --- /dev/null +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/SimpleNetworkNodeTest.java @@ -0,0 +1,78 @@ +package com.refinedmods.refinedstorage.api.network.impl.node; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkEnergyComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; + +import org.junit.jupiter.api.Test; + +import static com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; +import static com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ENERGY_USAGE; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; + +@NetworkTest +@SetupNetwork(energyStored = 10, energyCapacity = 100) +class SimpleNetworkNodeTest { + @AddNetworkNode(properties = { + @AddNetworkNode.Property(key = PROPERTY_ENERGY_USAGE, longValue = 10), + @AddNetworkNode.Property(key = PROPERTY_ACTIVE, boolValue = false) + }) + SimpleNetworkNode sut; + + @AddNetworkNode(networkId = "nonexistent") + SimpleNetworkNode sutWithoutNetwork; + + @Test + void testInitialState() { + // Assert + assertThat(sut.isActive()).isFalse(); + assertThat(sut.getNetwork()).isNotNull(); + assertThat(sut.getEnergyUsage()).isEqualTo(10); + + assertThat(sutWithoutNetwork.isActive()).isTrue(); + assertThat(sutWithoutNetwork.getNetwork()).isNull(); + } + + @Test + void shouldNotExtractEnergyWhenInactive(@InjectNetworkEnergyComponent final EnergyNetworkComponent energy) { + // Act + sut.doWork(); + + // Assert + assertThat(energy.getStored()).isEqualTo(10); + } + + @Test + void shouldNotExtractEnergyWithoutNetwork() { + // Act + assertDoesNotThrow(sutWithoutNetwork::doWork); + } + + @Test + void shouldExtractEnergy(@InjectNetworkEnergyComponent final EnergyNetworkComponent energy) { + // Arrange + sut.setActive(true); + + // Act + sut.doWork(); + + // Assert + assertThat(energy.getStored()).isZero(); + } + + @Test + void shouldSetEnergyUsage(@InjectNetworkEnergyComponent final EnergyNetworkComponent energy) { + // Arrange + sut.setActive(true); + sut.setEnergyUsage(2); + + // Act + sut.doWork(); + + // Assert + assertThat(energy.getStored()).isEqualTo(8); + } +} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerNetworkNodeTest.java similarity index 90% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerNetworkNodeTest.java index f813245b3..fbb749a6a 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/controller/ControllerNetworkNodeTest.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.controller; +package com.refinedmods.refinedstorage.api.network.impl.node.controller; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import java.util.stream.Stream; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorNetworkNodeTest.java similarity index 83% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorNetworkNodeTest.java index d22d2903b..b2e1d165a 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/detector/DetectorNetworkNodeTest.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.detector; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; -import com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory; +package com.refinedmods.refinedstorage.api.network.impl.node.detector; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory; import java.util.stream.Stream; @@ -19,7 +19,7 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.MethodSource; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/AbstractExporterNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/AbstractExporterNetworkNodeTest.java similarity index 88% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/AbstractExporterNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/AbstractExporterNetworkNodeTest.java index da0d68d44..fa57ebdce 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/AbstractExporterNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/AbstractExporterNetworkNodeTest.java @@ -1,32 +1,32 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.exporter; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkEnergyComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +package com.refinedmods.refinedstorage.api.network.impl.node.exporter; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkEnergyComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java similarity index 76% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java index b993f78d3..0c249d982 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/FirstAvailableExporterNetworkNodeTest.java @@ -1,28 +1,28 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.exporter; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.task.DefaultTaskExecutor; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNodeActor; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; +package com.refinedmods.refinedstorage.api.network.impl.node.exporter; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.task.DefaultTaskExecutor; +import com.refinedmods.refinedstorage.api.network.node.NetworkNodeActor; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; import java.util.List; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; import static org.assertj.core.api.Assertions.assertThat; class FirstAvailableExporterNetworkNodeTest extends AbstractExporterNetworkNodeTest { diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/RandomExporterNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/RandomExporterNetworkNodeTest.java new file mode 100644 index 000000000..57c7d9446 --- /dev/null +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/RandomExporterNetworkNodeTest.java @@ -0,0 +1,96 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.exporter; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.task.RandomTaskExecutor; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; + +import java.util.List; + +import org.junit.jupiter.api.Test; + +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static org.assertj.core.api.Assertions.assertThat; + +class RandomExporterNetworkNodeTest extends AbstractExporterNetworkNodeTest { + @Override + protected TaskExecutor createTaskExecutor() { + return new RandomTaskExecutor<>(list -> { + list.clear(); + list.add(sut.new TaskImpl(A)); + list.add(sut.new TaskImpl(B)); + }); + } + + @Test + void shouldTransfer(@InjectNetworkStorageComponent final StorageNetworkComponent storage) { + // Arrange + storage.addSource(new InMemoryStorageImpl()); + storage.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); + storage.insert(B, 100, Action.EXECUTE, EmptyActor.INSTANCE); + + final Storage destination = new InMemoryStorageImpl(); + final ExporterTransferStrategy strategy = createTransferStrategy(destination, 5); + + sut.setTransferStrategy(strategy); + sut.setFilters(List.of(B, A)); + + // Act & assert + sut.doWork(); + + assertThat(storage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( + new ResourceAmount(A, 95), + new ResourceAmount(B, 100) + ); + assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + new ResourceAmount(A, 5) + ); + + sut.doWork(); + + assertThat(storage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( + new ResourceAmount(A, 90), + new ResourceAmount(B, 100) + ); + assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + new ResourceAmount(A, 10) + ); + } + + @Test + void shouldUseNextResourceIfFirstOneIsNotAvailableInSameCycle( + @InjectNetworkStorageComponent final StorageNetworkComponent storage + ) { + // Arrange + storage.addSource(new InMemoryStorageImpl()); + storage.insert(B, 7, Action.EXECUTE, EmptyActor.INSTANCE); + + final Storage destination = new InMemoryStorageImpl(); + final ExporterTransferStrategy strategy = createTransferStrategy(destination, 10); + + sut.setTransferStrategy(strategy); + sut.setFilters(List.of(A, B)); + + // Act & assert + sut.doWork(); + + assertThat(storage.getAll()).isEmpty(); + assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( + new ResourceAmount(B, 7) + ); + + sut.doWork(); + + assertThat(storage.getAll()).isEmpty(); + assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( + new ResourceAmount(B, 7) + ); + } +} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java similarity index 87% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java index 2df0a9909..8b0f7cc98 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java @@ -1,25 +1,25 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.exporter; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.task.RoundRobinTaskExecutor; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; +package com.refinedmods.refinedstorage.api.network.impl.node.exporter; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.task.RoundRobinTaskExecutor; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.D; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.D; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java similarity index 93% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java index 0ecdbe604..0abc32032 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageNetworkNodeTest.java @@ -1,24 +1,24 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetwork; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; -import com.refinedmods.refinedstorage2.network.test.fake.FakeActor; +package com.refinedmods.refinedstorage.api.network.impl.node.externalstorage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetwork; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.network.test.fake.FakeActor; import java.util.Optional; import java.util.Set; @@ -30,10 +30,10 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; -import static com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ENERGY_USAGE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ENERGY_USAGE; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageProviderFactoryImpl.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageProviderFactoryImpl.java new file mode 100644 index 000000000..797f86e6b --- /dev/null +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/ExternalStorageProviderFactoryImpl.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.externalstorage; + +import com.refinedmods.refinedstorage.api.network.node.externalstorage.ExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; + +import java.util.Optional; + +public record ExternalStorageProviderFactoryImpl(ExternalStorageProvider provider) + implements ExternalStorageProviderFactory { + @Override + public Optional create() { + return Optional.of(provider); + } +} diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/StorageExternalStorageProvider.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/StorageExternalStorageProvider.java new file mode 100644 index 000000000..2acf13735 --- /dev/null +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/externalstorage/StorageExternalStorageProvider.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.externalstorage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; + +import java.util.Iterator; + +public class StorageExternalStorageProvider implements ExternalStorageProvider { + private final Storage storage; + + public StorageExternalStorageProvider(final Storage storage) { + this.storage = storage; + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return storage.extract(resource, amount, action, actor); + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return storage.insert(resource, amount, action, actor); + } + + @Override + public Iterator iterator() { + return storage.getAll().iterator(); + } +} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/GridNetworkNodeTest.java similarity index 79% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/GridNetworkNodeTest.java index 5d28eab96..b8407205c 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/grid/GridNetworkNodeTest.java @@ -1,32 +1,32 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.grid; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetwork; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; -import com.refinedmods.refinedstorage2.network.test.fake.FakeActor; -import com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory; +package com.refinedmods.refinedstorage.api.network.impl.node.grid; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetwork; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.network.test.fake.FakeActor; +import com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.D; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.D; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.anyLong; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/ClearSlotInterfaceNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/ClearSlotInterfaceNetworkNodeTest.java similarity index 87% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/ClearSlotInterfaceNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/ClearSlotInterfaceNetworkNodeTest.java index 27a2b136a..e99fa2e1a 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/ClearSlotInterfaceNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/ClearSlotInterfaceNetworkNodeTest.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface; +package com.refinedmods.refinedstorage.api.network.impl.node.iface; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/ExportToEmptySlotInterfaceNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/ExportToEmptySlotInterfaceNetworkNodeTest.java similarity index 82% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/ExportToEmptySlotInterfaceNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/ExportToEmptySlotInterfaceNetworkNodeTest.java index a54ed32c7..e8e52f5e4 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/ExportToEmptySlotInterfaceNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/ExportToEmptySlotInterfaceNetworkNodeTest.java @@ -1,22 +1,22 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +package com.refinedmods.refinedstorage.api.network.impl.node.iface; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE2; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE2; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceExportStateImpl.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportStateImpl.java similarity index 90% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceExportStateImpl.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportStateImpl.java index ed4e50d7c..25dab3158 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceExportStateImpl.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceExportStateImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface; +package com.refinedmods.refinedstorage.api.network.impl.node.iface; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; import java.util.ArrayList; import java.util.Collection; @@ -13,9 +13,9 @@ import java.util.Map; import javax.annotation.Nullable; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE2; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE2; public class InterfaceExportStateImpl implements InterfaceExportState { private final Map requested = new HashMap<>(); diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNodeTest.java similarity index 81% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNodeTest.java index 3ce965776..421a724a6 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/InterfaceNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/InterfaceNetworkNodeTest.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkEnergyComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +package com.refinedmods.refinedstorage.api.network.impl.node.iface; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkEnergyComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/KeepExportingInterfaceNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/KeepExportingInterfaceNetworkNodeTest.java similarity index 92% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/KeepExportingInterfaceNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/KeepExportingInterfaceNetworkNodeTest.java index 14886930f..a8b780434 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/KeepExportingInterfaceNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/KeepExportingInterfaceNetworkNodeTest.java @@ -1,23 +1,23 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +package com.refinedmods.refinedstorage.api.network.impl.node.iface; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE2; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE2; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImplTest.java similarity index 87% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImplTest.java index efe2a893b..17e285368 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProviderImplTest.java @@ -1,25 +1,25 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageProviderFactoryImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceExportStateImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +package com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageProviderFactoryImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceExportStateImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/IoLoopInterfaceExternalStorageProviderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/IoLoopInterfaceExternalStorageProviderImplTest.java similarity index 87% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/IoLoopInterfaceExternalStorageProviderImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/IoLoopInterfaceExternalStorageProviderImplTest.java index 10fca42e2..08c862be6 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/IoLoopInterfaceExternalStorageProviderImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/IoLoopInterfaceExternalStorageProviderImplTest.java @@ -1,27 +1,27 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageProviderFactoryImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.StorageExternalStorageProvider; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceExportStateImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetwork; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +package com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageProviderFactoryImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.StorageExternalStorageProvider; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceExportStateImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetwork; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/SelfIoInterfaceExternalStorageProviderImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/SelfIoInterfaceExternalStorageProviderImplTest.java new file mode 100644 index 000000000..441fb5c0b --- /dev/null +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/iface/externalstorage/SelfIoInterfaceExternalStorageProviderImplTest.java @@ -0,0 +1,64 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage; + +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageProviderFactoryImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceExportStateImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static org.assertj.core.api.Assertions.assertThat; + +@NetworkTest +@SetupNetwork +class SelfIoInterfaceExternalStorageProviderImplTest { + @AddNetworkNode + InterfaceNetworkNode iface; + InterfaceExportStateImpl exportState; + @AddNetworkNode + ExternalStorageNetworkNode connection; + + @BeforeEach + void setUp() { + exportState = new InterfaceExportStateImpl(2); + iface.setExportState(exportState); + iface.setTransferQuotaProvider(resource -> 100); + connection.initialize(new ExternalStorageProviderFactoryImpl(new InterfaceExternalStorageProviderImpl(iface))); + } + + // We don't allow self-insertions and self-extractions for the same reasons mentioned in + // IoLoopInterfaceExternalStorageProviderImplTest. + @Test + void shouldNotAllowSelfInsertionOrSelfExtraction( + @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage + ) { + // Arrange + // this would try to do a self-insert as it's an unwanted resource. + exportState.setCurrentlyExported(0, B, 15); + // this would try to do a self-extract because we have the resource. + exportState.setRequestedResource(1, B, 1); + + // Act + iface.doWork(); + connection.detectChanges(); + + // Assert + assertThat(exportState.getExportedResource(0)).isEqualTo(B); + assertThat(exportState.getExportedAmount(0)).isEqualTo(15); + + assertThat(exportState.getExportedResource(1)).isNull(); + assertThat(exportState.getExportedAmount(1)).isZero(); + + assertThat(networkStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( + new ResourceAmount(B, 15) + ); + } +} diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/FakeImporterSource.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/FakeImporterSource.java new file mode 100644 index 000000000..5c89ea603 --- /dev/null +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/FakeImporterSource.java @@ -0,0 +1,47 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.importer; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +public class FakeImporterSource implements ImporterSource { + private final List resources; + private final InMemoryStorageImpl storage = new InMemoryStorageImpl(); + + public FakeImporterSource(final ResourceKey... resources) { + this.resources = Arrays.stream(resources).toList(); + } + + public FakeImporterSource add(final ResourceKey resource, final long amount) { + storage.insert(resource, amount, Action.EXECUTE, EmptyActor.INSTANCE); + return this; + } + + @Override + public Iterator getResources() { + return resources.iterator(); + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + // Extract a maximum of 5 to ensure that we try to extract multiple times from different slots. + return storage.extract(resource, Math.min(amount, 5), action, actor); + } + + public Collection getAll() { + return storage.getAll(); + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return storage.insert(resource, amount, action, actor); + } +} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterNetworkNodeTest.java similarity index 90% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterNetworkNodeTest.java index d01189c90..9bb000da5 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/importer/ImporterNetworkNodeTest.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.importer; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkEnergyComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +package com.refinedmods.refinedstorage.api.network.impl.node.importer; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkEnergyComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import java.util.List; import java.util.Set; @@ -23,11 +23,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE2; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE2; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java new file mode 100644 index 000000000..9ac83d57d --- /dev/null +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java @@ -0,0 +1,106 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.relay; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetwork; +import com.refinedmods.refinedstorage.network.test.InjectNetworkEnergyComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkSecurityComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.network.test.fake.FakePermissions; +import com.refinedmods.refinedstorage.network.test.fake.FakeSecurityActors; + +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import static com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayNetworkNodeTest.addSecurityPolicy; +import static com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayNetworkNodeTest.addStorageSource; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; +import static org.assertj.core.api.Assertions.assertThat; + +@NetworkTest +@SetupNetwork(id = "input") +@SetupNetwork(id = "output", setupEnergy = false) +class RelayEnergyNetworkNodeTest { + @AddNetworkNode(properties = { + @AddNetworkNode.Property(key = PROPERTY_ACTIVE, boolValue = false) + }, networkId = "input") + private RelayInputNetworkNode input; + + @AddNetworkNode(networkId = "output") + private RelayOutputNetworkNode output; + + @Test + void shouldPassEnergyComponent( + @InjectNetworkEnergyComponent(networkId = "input") final EnergyNetworkComponent inputEnergy, + @InjectNetworkSecurityComponent(networkId = "input") final SecurityNetworkComponent inputSecurity, + @InjectNetworkStorageComponent(networkId = "input") final StorageNetworkComponent inputStorage, + @InjectNetworkEnergyComponent(networkId = "output") final EnergyNetworkComponent outputEnergy, + @InjectNetworkSecurityComponent(networkId = "output") final SecurityNetworkComponent outputSecurity, + @InjectNetworkStorageComponent(networkId = "output") final StorageNetworkComponent outputStorage + ) { + // Arrange + input.setActive(true); + input.setOutputNode(output); + + addSecurityPolicy(inputSecurity, FakePermissions.OTHER); + addStorageSource(inputStorage); + + final long originalStored = inputEnergy.getStored(); + + // Act + input.setComponentTypes(Set.of(RelayComponentType.ENERGY)); + final long extracted = output.extract(10); + + // Assert + assertThat(extracted).isEqualTo(10); + assertThat(outputEnergy.getCapacity()).isEqualTo(inputEnergy.getCapacity()); + assertThat(outputEnergy.getStored()).isEqualTo(originalStored - 10); + assertThat(outputSecurity.isAllowed(FakePermissions.ALLOW_BY_DEFAULT, FakeSecurityActors.A)).isTrue(); + assertThat(outputSecurity.isAllowed(FakePermissions.OTHER, FakeSecurityActors.A)).isFalse(); + assertThat(outputStorage.getAll()).isEmpty(); + assertThat(outputStorage.insert(A, 1, Action.EXECUTE, EmptyActor.INSTANCE)).isZero(); + assertThat(input.hasComponentType(RelayComponentType.ENERGY)).isTrue(); + assertThat(input.hasComponentType(RelayComponentType.SECURITY)).isFalse(); + assertThat(input.hasComponentType(RelayComponentType.STORAGE)).isFalse(); + } + + @Test + @SetupNetwork(id = "cycle_input", energyStored = 1, energyCapacity = 2) + @SetupNetwork(id = "cycle_input_alt", energyStored = 3, energyCapacity = 4) + void shouldDetectEnergyCycles( + @InjectNetwork("cycle_input") final Network inputNetwork, + @InjectNetworkEnergyComponent(networkId = "cycle_input") final EnergyNetworkComponent inputEnergy, + @InjectNetwork("cycle_input_alt") final Network inputAlternativeNetwork, + @InjectNetworkEnergyComponent(networkId = "cycle_input_alt") final EnergyNetworkComponent inputAlternativeEnergy + ) { + // Arrange + final RelayOutputNetworkNode cycleOutput = new RelayOutputNetworkNode(0); + cycleOutput.setEnergyDelegate(inputAlternativeEnergy); + cycleOutput.setNetwork(inputNetwork); + inputNetwork.addContainer(() -> cycleOutput); + + final RelayOutputNetworkNode cycleOutputAlternative = new RelayOutputNetworkNode(0); + cycleOutputAlternative.setEnergyDelegate(inputEnergy); + cycleOutputAlternative.setNetwork(inputAlternativeNetwork); + inputAlternativeNetwork.addContainer(() -> cycleOutputAlternative); + + // Assert + assertThat(inputEnergy.getStored()).isEqualTo(1); + assertThat(inputAlternativeEnergy.getStored()).isEqualTo(3); + + assertThat(inputEnergy.getCapacity()).isEqualTo(2); + assertThat(inputAlternativeEnergy.getCapacity()).isEqualTo(4); + + assertThat(inputEnergy.extract(10)).isEqualTo(1); + assertThat(inputAlternativeEnergy.extract(10)).isEqualTo(3); + } +} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayNetworkNodeTest.java similarity index 89% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayNetworkNodeTest.java index 777be1c1e..0655d2a1a 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayNetworkNodeTest.java @@ -1,25 +1,25 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.relay; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.impl.security.SecurityDecisionProviderImpl; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetwork; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkEnergyComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkSecurityComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; -import com.refinedmods.refinedstorage2.network.test.fake.FakePermissions; -import com.refinedmods.refinedstorage2.network.test.fake.FakeSecurityActors; +package com.refinedmods.refinedstorage.api.network.impl.node.relay; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.impl.security.SecurityDecisionProviderImpl; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetwork; +import com.refinedmods.refinedstorage.network.test.InjectNetworkEnergyComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkSecurityComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.network.test.fake.FakePermissions; +import com.refinedmods.refinedstorage.network.test.fake.FakeSecurityActors; import java.util.Set; @@ -27,12 +27,12 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.refinedmods.refinedstorage2.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode.activeSecurityDecisionProvider; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; -import static com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; -import static com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ENERGY_USAGE; +import static com.refinedmods.refinedstorage.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode.activeSecurityDecisionProvider; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; +import static com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ENERGY_USAGE; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java similarity index 78% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java index e2b61c35c..739b24d01 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelaySecurityNetworkNodeTest.java @@ -1,31 +1,31 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.relay; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.impl.security.SecurityDecisionProviderImpl; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetwork; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkEnergyComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkSecurityComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; -import com.refinedmods.refinedstorage2.network.test.fake.FakePermissions; -import com.refinedmods.refinedstorage2.network.test.fake.FakeSecurityActors; +package com.refinedmods.refinedstorage.api.network.impl.node.relay; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.impl.security.SecurityDecisionProviderImpl; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetwork; +import com.refinedmods.refinedstorage.network.test.InjectNetworkEnergyComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkSecurityComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.network.test.fake.FakePermissions; +import com.refinedmods.refinedstorage.network.test.fake.FakeSecurityActors; import java.util.Set; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayNetworkNodeTest.addStorageSource; -import static com.refinedmods.refinedstorage2.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode.activeSecurityDecisionProvider; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; +import static com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayNetworkNodeTest.addStorageSource; +import static com.refinedmods.refinedstorage.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode.activeSecurityDecisionProvider; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java similarity index 92% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java index 5688f54e9..c1aaf57ec 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/relay/RelayStorageNetworkNodeTest.java @@ -1,38 +1,38 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.relay; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.composite.PriorityStorage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetwork; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkEnergyComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkSecurityComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; -import com.refinedmods.refinedstorage2.network.test.fake.FakePermissions; -import com.refinedmods.refinedstorage2.network.test.fake.FakeSecurityActors; +package com.refinedmods.refinedstorage.api.network.impl.node.relay; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.composite.PriorityStorage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetwork; +import com.refinedmods.refinedstorage.network.test.InjectNetworkEnergyComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkSecurityComponent; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.network.test.fake.FakePermissions; +import com.refinedmods.refinedstorage.network.test.fake.FakeSecurityActors; import java.util.Set; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayNetworkNodeTest.addSecurityPolicy; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; -import static com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; +import static com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayNetworkNodeTest.addSecurityPolicy; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; import static org.assertj.core.api.Assertions.assertThat; @NetworkTest diff --git a/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java new file mode 100644 index 000000000..b2ec65662 --- /dev/null +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java @@ -0,0 +1,76 @@ +package com.refinedmods.refinedstorage.api.network.impl.node.storage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.ProviderImpl; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static org.assertj.core.api.Assertions.assertThat; + +@NetworkTest +@SetupNetwork +class PriorityStorageNetworkNodeTest { + @AddNetworkNode + StorageNetworkNode a; + + @AddNetworkNode + StorageNetworkNode b; + + ProviderImpl provider; + + @BeforeEach + void setUp() { + provider = new ProviderImpl(); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void shouldRespectPriority( + final boolean storageAHasPriority, + @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage + ) { + // Arrange + final Storage storage1 = new LimitedStorageImpl(100); + final ProviderImpl provider1 = new ProviderImpl(); + provider1.set(1, storage1); + a.setProvider(provider1); + a.setActive(true); + + final Storage storage2 = new LimitedStorageImpl(100); + final ProviderImpl provider2 = new ProviderImpl(); + provider2.set(1, storage2); + b.setProvider(provider2); + b.setActive(true); + + if (storageAHasPriority) { + a.getStorageConfiguration().setPriority(5); + b.getStorageConfiguration().setPriority(2); + } else { + a.getStorageConfiguration().setPriority(2); + b.getStorageConfiguration().setPriority(5); + } + + // Act + networkStorage.insert(A, 1, Action.EXECUTE, EmptyActor.INSTANCE); + + // Assert + if (storageAHasPriority) { + assertThat(storage1.getAll()).isNotEmpty(); + assertThat(storage2.getAll()).isEmpty(); + } else { + assertThat(storage1.getAll()).isEmpty(); + assertThat(storage2.getAll()).isNotEmpty(); + } + } +} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNodeTest.java similarity index 91% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNodeTest.java index aa100309b..c27a7eac1 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/StorageNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storage/StorageNetworkNodeTest.java @@ -1,25 +1,25 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.ProviderImpl; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetwork; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; -import com.refinedmods.refinedstorage2.network.test.fake.FakeActor; +package com.refinedmods.refinedstorage.api.network.impl.node.storage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.ProviderImpl; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetwork; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; +import com.refinedmods.refinedstorage.network.test.fake.FakeActor; import java.util.Collection; import java.util.HashSet; @@ -31,14 +31,14 @@ import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE2; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; -import static com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ENERGY_USAGE; -import static com.refinedmods.refinedstorage2.network.test.nodefactory.StorageNetworkNodeFactory.PROPERTY_ENERGY_USAGE_PER_STORAGE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE2; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B_ALTERNATIVE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ENERGY_USAGE; +import static com.refinedmods.refinedstorage.network.test.nodefactory.StorageNetworkNodeFactory.PROPERTY_ENERGY_USAGE_PER_STORAGE; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java similarity index 94% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java index 8cc1dee94..9a0763f5a 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/node/storagetransfer/StorageTransferNetworkNodeTest.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.ProviderImpl; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; +package com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.ProviderImpl; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.network.test.AddNetworkNode; +import com.refinedmods.refinedstorage.network.test.InjectNetworkStorageComponent; +import com.refinedmods.refinedstorage.network.test.NetworkTest; +import com.refinedmods.refinedstorage.network.test.SetupNetwork; import java.util.LinkedHashMap; import java.util.Set; @@ -25,11 +25,11 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.C; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.D; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.C; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.D; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/security/SecurityNetworkComponentImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/security/SecurityNetworkComponentImplTest.java similarity index 92% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/security/SecurityNetworkComponentImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/security/SecurityNetworkComponentImplTest.java index 50494ba03..9a1ffdb86 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/security/SecurityNetworkComponentImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/security/SecurityNetworkComponentImplTest.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage2.api.network.impl.security; +package com.refinedmods.refinedstorage.api.network.impl.security; -import com.refinedmods.refinedstorage2.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.network.test.fake.FakePermissions; -import com.refinedmods.refinedstorage2.network.test.fake.FakeSecurityActors; +import com.refinedmods.refinedstorage.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.network.test.fake.FakePermissions; +import com.refinedmods.refinedstorage.network.test.fake.FakeSecurityActors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode.activeSecurityDecisionProvider; +import static com.refinedmods.refinedstorage.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode.activeSecurityDecisionProvider; import static org.assertj.core.api.Assertions.assertThat; class SecurityNetworkComponentImplTest { diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageNetworkComponentImplTest.java b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImplTest.java similarity index 76% rename from refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageNetworkComponentImplTest.java rename to refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImplTest.java index f1f4757ab..b7beebb1d 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageNetworkComponentImplTest.java +++ b/refinedstorage-network/src/test/java/com/refinedmods/refinedstorage/api/network/impl/storage/StorageNetworkComponentImplTest.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage2.api.network.impl.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.NetworkImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.NetworkTestFixtures; +package com.refinedmods.refinedstorage.api.network.impl.storage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.NetworkImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; +import com.refinedmods.refinedstorage.network.test.NetworkTestFixtures; import java.util.Collection; import java.util.HashSet; @@ -22,8 +22,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.A; +import static com.refinedmods.refinedstorage.network.test.fake.FakeResources.B; import static org.assertj.core.api.Assertions.assertThat; class StorageNetworkComponentImplTest { diff --git a/refinedstorage-platform-api/build.gradle b/refinedstorage-platform-api/build.gradle new file mode 100644 index 000000000..91a28b78d --- /dev/null +++ b/refinedstorage-platform-api/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java-library' +} + +commonProject() + +archivesBaseName = 'refinedstorage-platform-api' + +dependencies { + api libs.apiguardian + api project(':refinedstorage-core-api') + api project(':refinedstorage-storage-api') + api project(':refinedstorage-resource-api') + api project(':refinedstorage-network-api') + api project(':refinedstorage-grid-api') + testImplementation libs.junit.api + testImplementation libs.junit.params + testRuntimeOnly libs.junit.engine + testImplementation libs.assertj + testImplementation libs.equalsverifier +} + +test { + useJUnitPlatform() +} + +enableJavadoc() +enablePublishing() diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java new file mode 100644 index 000000000..f9a49ed50 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApi.java @@ -0,0 +1,208 @@ +package com.refinedmods.refinedstorage.platform.api; + +import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.NetworkComponent; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHints; +import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.security.BuiltinPermissions; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItemHelper; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.api.storage.StorageType; +import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.energy.EnergyItemHelper; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceProvider; +import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.platform.api.upgrade.BuiltinUpgradeDestinations; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; + +import java.util.Collection; +import java.util.Optional; +import java.util.Set; +import java.util.function.Supplier; +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public interface PlatformApi { + PlatformApi INSTANCE = new PlatformApiProxy(); + + PlatformRegistry getStorageTypeRegistry(); + + StorageRepository getClientStorageRepository(); + + StorageRepository getStorageRepository(Level level); + + StorageContainerItemHelper getStorageContainerItemHelper(); + + PlatformRegistry getResourceTypeRegistry(); + + PlatformRegistry getImporterTransferStrategyRegistry(); + + PlatformRegistry getExporterTransferStrategyRegistry(); + + void addExternalStorageProviderFactory(PlatformExternalStorageProviderFactory factory); + + Collection getExternalStorageProviderFactories(); + + Collection getDestructorStrategyFactories(); + + void addDestructorStrategyFactory(DestructorStrategyFactory factory); + + Collection getConstructorStrategyFactories(); + + void addConstructorStrategyFactory(ConstructorStrategyFactory factory); + + void addStorageMonitorExtractionStrategy(StorageMonitorExtractionStrategy strategy); + + StorageMonitorExtractionStrategy getStorageMonitorExtractionStrategy(); + + void addStorageMonitorInsertionStrategy(StorageMonitorInsertionStrategy strategy); + + StorageMonitorInsertionStrategy getStorageMonitorInsertionStrategy(); + + ComponentMapFactory getNetworkComponentMapFactory(); + + PlatformRegistry getGridSynchronizerRegistry(); + + UpgradeRegistry getUpgradeRegistry(); + + BuiltinUpgradeDestinations getBuiltinUpgradeDestinations(); + + InWorldNetworkNodeContainer createInWorldNetworkNodeContainer(BlockEntity blockEntity, + NetworkNode node, + String name, + int priority, + ConnectionLogic connectionLogic, + @Nullable Supplier keyProvider); + + void onNetworkNodeContainerInitialized(InWorldNetworkNodeContainer container, + @Nullable Level level, + @Nullable Runnable callback); + + void onNetworkNodeContainerRemoved(InWorldNetworkNodeContainer container, @Nullable Level level); + + void onNetworkNodeContainerUpdated(InWorldNetworkNodeContainer container, @Nullable Level level); + + GridInsertionStrategy createGridInsertionStrategy(AbstractContainerMenu containerMenu, + ServerPlayer player, + Grid grid); + + void addGridInsertionStrategyFactory(GridInsertionStrategyFactory insertionStrategyFactory); + + void addAlternativeGridInsertionHint(GridInsertionHint hint); + + GridInsertionHints getGridInsertionHints(); + + GridExtractionStrategy createGridExtractionStrategy(AbstractContainerMenu containerMenu, + ServerPlayer player, + Grid grid); + + void addGridExtractionStrategyFactory(GridExtractionStrategyFactory extractionStrategyFactory); + + GridScrollingStrategy createGridScrollingStrategy(AbstractContainerMenu containerMenu, + ServerPlayer player, + Grid grid); + + void addGridScrollingStrategyFactory(GridScrollingStrategyFactory scrollingStrategyFactory); + + void addResourceFactory(ResourceFactory factory); + + ResourceFactory getItemResourceFactory(); + + StorageType getItemStorageType(); + + ResourceFactory getFluidResourceFactory(); + + StorageType getFluidStorageType(); + + Set getAlternativeResourceFactories(); + + void registerResourceRendering(Class resourceClass, ResourceRendering rendering); + + ResourceRendering getResourceRendering(ResourceKey resource); + + void addIngredientConverter(RecipeModIngredientConverter converter); + + RecipeModIngredientConverter getIngredientConverter(); + + void addWirelessTransmitterRangeModifier(WirelessTransmitterRangeModifier rangeModifier); + + WirelessTransmitterRangeModifier getWirelessTransmitterRangeModifier(); + + Optional getEnergyStorage(ItemStack stack); + + EnergyItemHelper getEnergyItemHelper(); + + EnergyStorage asItemEnergyStorage(EnergyStorage energyStorage, ItemStack stack); + + EnergyStorage asBlockItemEnergyStorage( + EnergyStorage energyStorage, + ItemStack stack, + BlockEntityType blockEntityType + ); + + NetworkBoundItemHelper getNetworkBoundItemHelper(); + + PlatformRegistry getSlotReferenceFactoryRegistry(); + + void addSlotReferenceProvider(SlotReferenceProvider slotReferenceProvider); + + SlotReference createInventorySlotReference(Player player, InteractionHand hand); + + void useNetworkBoundItem(Player player, Item... items); + + BuiltinPermissions getBuiltinPermissions(); + + PlatformRegistry getPermissionRegistry(); + + SecurityPolicy createDefaultSecurityPolicy(); + + void sendNoPermissionToOpenMessage(ServerPlayer player, Component target); + + void sendNoPermissionMessage(ServerPlayer player, Component message); + + boolean canPlaceNetworkNode(ServerPlayer player, Level level, BlockPos pos, BlockState state); +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java similarity index 77% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java index 234263513..10365398d 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/PlatformApiProxy.java @@ -1,49 +1,49 @@ -package com.refinedmods.refinedstorage2.platform.api; - -import com.refinedmods.refinedstorage2.api.core.component.ComponentMapFactory; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHints; -import com.refinedmods.refinedstorage2.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.security.BuiltinPermissions; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItemHelper; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage2.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceProvider; -import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.api.upgrade.BuiltinUpgradeDestinations; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +package com.refinedmods.refinedstorage.platform.api; + +import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.NetworkComponent; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHints; +import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.security.BuiltinPermissions; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItemHelper; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.api.storage.StorageType; +import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.energy.EnergyItemHelper; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceProvider; +import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.platform.api.upgrade.BuiltinUpgradeDestinations; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; import java.util.Collection; import java.util.Optional; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/RefinedStoragePlugin.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/RefinedStoragePlugin.java similarity index 78% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/RefinedStoragePlugin.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/RefinedStoragePlugin.java index 75fdb9c6d..c92be54d5 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/RefinedStoragePlugin.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/RefinedStoragePlugin.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api; +package com.refinedmods.refinedstorage.platform.api; import org.apiguardian.api.API; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/ConfigurationCardTarget.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/ConfigurationCardTarget.java similarity index 90% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/ConfigurationCardTarget.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/ConfigurationCardTarget.java index 846a96fe1..ac995ccef 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/ConfigurationCardTarget.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/ConfigurationCardTarget.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.configurationcard; +package com.refinedmods.refinedstorage.platform.api.configurationcard; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/package-info.java new file mode 100644 index 000000000..2024bca10 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/configurationcard/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.configurationcard; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategy.java new file mode 100644 index 000000000..e0b93a012 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategy.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.platform.api.constructordestructor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import net.minecraft.world.entity.player.Player; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.11") +@FunctionalInterface +public interface ConstructorStrategy { + boolean apply(ResourceKey resource, Actor actor, Player actingPlayer, Network network); +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/ConstructorStrategyFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategyFactory.java similarity index 81% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/ConstructorStrategyFactory.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategyFactory.java index 221bab6da..fbeea71de 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/ConstructorStrategyFactory.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/ConstructorStrategyFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.constructordestructor; +package com.refinedmods.refinedstorage.platform.api.constructordestructor; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; import java.util.Optional; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/DestructorStrategy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategy.java similarity index 75% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/DestructorStrategy.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategy.java index ffcb17fd9..833fc5f84 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/DestructorStrategy.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategy.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.api.constructordestructor; +package com.refinedmods.refinedstorage.platform.api.constructordestructor; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.storage.Actor; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.storage.Actor; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/DestructorStrategyFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategyFactory.java similarity index 81% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/DestructorStrategyFactory.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategyFactory.java index bf1b7eeb3..02726b09e 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/DestructorStrategyFactory.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/DestructorStrategyFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.constructordestructor; +package com.refinedmods.refinedstorage.platform.api.constructordestructor; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/package-info.java new file mode 100644 index 000000000..d4ea50522 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/constructordestructor/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.constructordestructor; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/AmountOverride.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/AmountOverride.java similarity index 83% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/AmountOverride.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/AmountOverride.java index 8f6b08f0b..0b058a671 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/AmountOverride.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/AmountOverride.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.exporter; +package com.refinedmods.refinedstorage.platform.api.exporter; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.function.LongSupplier; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/ExporterTransferStrategyFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/ExporterTransferStrategyFactory.java new file mode 100644 index 000000000..31f92ddad --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/ExporterTransferStrategyFactory.java @@ -0,0 +1,22 @@ +package com.refinedmods.refinedstorage.platform.api.exporter; + +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") +@FunctionalInterface +public interface ExporterTransferStrategyFactory { + ExporterTransferStrategy create( + ServerLevel level, + BlockPos pos, + Direction direction, + UpgradeState upgradeState, + AmountOverride amountOverride, + boolean fuzzyMode + ); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/package-info.java new file mode 100644 index 000000000..8fccdbded --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/Grid.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/Grid.java new file mode 100644 index 000000000..5fcb6e97a --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/Grid.java @@ -0,0 +1,28 @@ +package com.refinedmods.refinedstorage.platform.api.grid; + +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; + +import java.util.List; + +import net.minecraft.server.level.ServerPlayer; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.0") +public interface Grid { + void addWatcher(GridWatcher watcher, Class actorType); + + void removeWatcher(GridWatcher watcher); + + Storage getItemStorage(); + + boolean isGridActive(); + + List getResources(Class actorType); + + GridOperations createOperations(ResourceType resourceType, ServerPlayer player); +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridInsertionHint.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHint.java similarity index 86% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridInsertionHint.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHint.java index 140c4a65f..9a679207b 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridInsertionHint.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHint.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.grid; +package com.refinedmods.refinedstorage.platform.api.grid; import java.util.Optional; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridInsertionHints.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHints.java similarity index 86% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridInsertionHints.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHints.java index 01eba23fc..53deb941d 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridInsertionHints.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridInsertionHints.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.grid; +package com.refinedmods.refinedstorage.platform.api.grid; import java.util.List; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridResourceAttributeKeys.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridResourceAttributeKeys.java new file mode 100644 index 000000000..9e9ed0322 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridResourceAttributeKeys.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.platform.api.grid; + +import com.refinedmods.refinedstorage.api.grid.view.GridResourceAttributeKey; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +public enum GridResourceAttributeKeys implements GridResourceAttributeKey { + MOD_ID, + MOD_NAME, + TAGS, + TOOLTIP +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridScrollMode.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridScrollMode.java new file mode 100644 index 000000000..85c180b1b --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridScrollMode.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.platform.api.grid; + +public enum GridScrollMode { + GRID_TO_INVENTORY, + INVENTORY_TO_GRID, + GRID_TO_CURSOR +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridSynchronizer.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java similarity index 90% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridSynchronizer.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java index d06488003..6640be2b1 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridSynchronizer.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/GridSynchronizer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.grid; +package com.refinedmods.refinedstorage.platform.api.grid; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/package-info.java new file mode 100644 index 000000000..1ae578de9 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.grid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategy.java new file mode 100644 index 000000000..832526986 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategy.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.platform.api.grid.strategy; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +public interface GridExtractionStrategy { + boolean onExtract(PlatformResourceKey resource, GridExtractMode extractMode, boolean cursor); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategyFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategyFactory.java new file mode 100644 index 000000000..76f27d674 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridExtractionStrategyFactory.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.platform.api.grid.strategy; + +import com.refinedmods.refinedstorage.platform.api.grid.Grid; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +@FunctionalInterface +public interface GridExtractionStrategyFactory { + GridExtractionStrategy create(AbstractContainerMenu containerMenu, ServerPlayer player, Grid grid); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategy.java new file mode 100644 index 000000000..53aa2fab5 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategy.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.platform.api.grid.strategy; + +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +public interface GridInsertionStrategy { + boolean onInsert(GridInsertMode insertMode, boolean tryAlternatives); + + boolean onTransfer(int slotIndex); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategyFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategyFactory.java new file mode 100644 index 000000000..894cc86ba --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridInsertionStrategyFactory.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.platform.api.grid.strategy; + +import com.refinedmods.refinedstorage.platform.api.grid.Grid; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +@FunctionalInterface +public interface GridInsertionStrategyFactory { + GridInsertionStrategy create(AbstractContainerMenu containerMenu, ServerPlayer player, Grid grid); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategy.java new file mode 100644 index 000000000..259b8c19b --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategy.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.platform.api.grid.strategy; + +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +public interface GridScrollingStrategy { + boolean onScroll(PlatformResourceKey resource, GridScrollMode scrollMode, int slotIndex); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategyFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategyFactory.java new file mode 100644 index 000000000..64a97283b --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/GridScrollingStrategyFactory.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.platform.api.grid.strategy; + +import com.refinedmods.refinedstorage.platform.api.grid.Grid; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +@FunctionalInterface +public interface GridScrollingStrategyFactory { + GridScrollingStrategy create(AbstractContainerMenu containerMenu, ServerPlayer player, Grid grid); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/package-info.java new file mode 100644 index 000000000..082fc740f --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/strategy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/AbstractPlatformGridResource.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java similarity index 81% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/AbstractPlatformGridResource.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java index 5831a758c..348934ca5 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/AbstractPlatformGridResource.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/AbstractPlatformGridResource.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.api.grid.view; +package com.refinedmods.refinedstorage.platform.api.grid.view; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceAttributeKey; -import com.refinedmods.refinedstorage2.api.grid.view.GridView; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceAttributeKey; +import com.refinedmods.refinedstorage.api.grid.view.GridView; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; import java.util.Collections; import java.util.Map; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java new file mode 100644 index 000000000..5b61c320a --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/PlatformGridResource.java @@ -0,0 +1,45 @@ +package com.refinedmods.refinedstorage.platform.api.grid.view; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; + +import java.util.List; +import java.util.Optional; +import javax.annotation.Nullable; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") +public interface PlatformGridResource extends GridResource { + void onExtract(GridExtractMode extractMode, + boolean cursor, + GridExtractionStrategy extractionStrategy); + + void onScroll(GridScrollMode scrollMode, + GridScrollingStrategy scrollingStrategy); + + void render(GuiGraphics graphics, int x, int y); + + String getDisplayedAmount(); + + String getAmountInTooltip(); + + List getTooltip(); + + Optional getTooltipImage(); + + int getRegistryId(); + + List getExtractionHints(); + + @Nullable + PlatformResourceKey getUnderlyingResource(); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/package-info.java new file mode 100644 index 000000000..eef99a6e0 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/grid/view/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.grid.view; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/ImporterTransferStrategyFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/ImporterTransferStrategyFactory.java new file mode 100644 index 000000000..1d6dc7c2f --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/ImporterTransferStrategyFactory.java @@ -0,0 +1,22 @@ +package com.refinedmods.refinedstorage.platform.api.importer; + +import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") +@FunctionalInterface +public interface ImporterTransferStrategyFactory { + ImporterTransferStrategy create( + ServerLevel level, + BlockPos pos, + Direction direction, + UpgradeState upgradeState, + AmountOverride amountOverride + ); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/package-info.java new file mode 100644 index 000000000..3dac8fad9 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/package-info.java new file mode 100644 index 000000000..79c26c237 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/BuiltinPermissions.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/BuiltinPermissions.java similarity index 84% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/BuiltinPermissions.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/BuiltinPermissions.java index 5ff12f708..c1a9267b5 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/BuiltinPermissions.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/BuiltinPermissions.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.security; +package com.refinedmods.refinedstorage.platform.api.security; import org.apiguardian.api.API; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/PlatformPermission.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformPermission.java similarity index 84% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/PlatformPermission.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformPermission.java index 1f505b106..45101a1e4 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/PlatformPermission.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformPermission.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.security; +package com.refinedmods.refinedstorage.platform.api.security; -import com.refinedmods.refinedstorage2.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.security.Permission; import net.minecraft.network.chat.Component; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformSecurityNetworkComponent.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformSecurityNetworkComponent.java new file mode 100644 index 000000000..151dd1607 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/PlatformSecurityNetworkComponent.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.platform.api.security; + +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; + +import net.minecraft.server.level.ServerPlayer; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") +public interface PlatformSecurityNetworkComponent extends SecurityNetworkComponent { + boolean isAllowed(Permission permission, ServerPlayer player); +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/SecurityHelper.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityHelper.java similarity index 75% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/SecurityHelper.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityHelper.java index 3e985e320..2f52e636e 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/SecurityHelper.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityHelper.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.api.security; +package com.refinedmods.refinedstorage.platform.api.security; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.api.network.security.Permission; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; import java.util.Set; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/SecurityPolicyContainerItem.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityPolicyContainerItem.java similarity index 82% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/SecurityPolicyContainerItem.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityPolicyContainerItem.java index d7d417076..97fa69ad5 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/SecurityPolicyContainerItem.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/SecurityPolicyContainerItem.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.api.security; +package com.refinedmods.refinedstorage.platform.api.security; -import com.refinedmods.refinedstorage2.api.network.security.SecurityActor; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.api.network.security.SecurityActor; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/package-info.java new file mode 100644 index 000000000..6a27901c4 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/security/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.security; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerBlockItem.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerBlockItem.java similarity index 96% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerBlockItem.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerBlockItem.java index 7173fe2e6..47563d6ef 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerBlockItem.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerBlockItem.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; +package com.refinedmods.refinedstorage.platform.api.storage; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; import java.util.List; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerItem.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerItem.java similarity index 96% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerItem.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerItem.java index b9d56b401..cd38b2c6d 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/AbstractStorageContainerItem.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/AbstractStorageContainerItem.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; +package com.refinedmods.refinedstorage.platform.api.storage; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; import java.util.List; import java.util.Optional; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/PlayerActor.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/PlayerActor.java similarity index 81% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/PlayerActor.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/PlayerActor.java index 7691f2ffc..b8321e13c 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/PlayerActor.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/PlayerActor.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; +package com.refinedmods.refinedstorage.platform.api.storage; -import com.refinedmods.refinedstorage2.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Actor; import net.minecraft.world.entity.player.Player; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/SerializableStorage.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/SerializableStorage.java new file mode 100644 index 000000000..77ae4446e --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/SerializableStorage.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.platform.api.storage; + +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; + +import com.mojang.serialization.Codec; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") +public interface SerializableStorage extends Storage { + StorageType getType(); + + static Codec getCodec(final Runnable listener) { + return PlatformApi.INSTANCE.getStorageTypeRegistry() + .codec() + .dispatch(SerializableStorage::getType, storage -> storage.getMapCodec(listener)); + } +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageBlockEntity.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageBlockEntity.java similarity index 87% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageBlockEntity.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageBlockEntity.java index be88e8a16..6b5896f17 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageBlockEntity.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageBlockEntity.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; +package com.refinedmods.refinedstorage.platform.api.storage; import java.util.UUID; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItem.java similarity index 90% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItem.java index b41fe46c4..0bf359500 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItem.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; +package com.refinedmods.refinedstorage.platform.api.storage; import java.util.Optional; import java.util.function.Predicate; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItemHelper.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItemHelper.java similarity index 97% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItemHelper.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItemHelper.java index 3e0b8131f..aa8449768 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageContainerItemHelper.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageContainerItemHelper.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; +package com.refinedmods.refinedstorage.platform.api.storage; import java.util.List; import java.util.Map; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageInfo.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageInfo.java new file mode 100644 index 000000000..760486109 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageInfo.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.platform.api.storage; + +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.2") +public record StorageInfo(long stored, long capacity) { + public static final StorageInfo UNKNOWN = new StorageInfo(0, 0); + + public static StorageInfo of(final Storage storage) { + return new StorageInfo( + storage.getStored(), + storage instanceof LimitedStorage limitedStorage ? limitedStorage.getCapacity() : 0L + ); + } +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageRepository.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageRepository.java similarity index 94% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageRepository.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageRepository.java index 2ccffb075..e0ff56515 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageRepository.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageRepository.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; +package com.refinedmods.refinedstorage.platform.api.storage; import java.util.Optional; import java.util.UUID; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageType.java similarity index 78% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageType.java index 7ab762f3a..a6c8ce7a0 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageType.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/StorageType.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; +package com.refinedmods.refinedstorage.platform.api.storage; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/FuzzyStorageChannel.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/FuzzyStorageChannel.java new file mode 100644 index 000000000..2e765ec92 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/FuzzyStorageChannel.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.platform.api.storage.channel; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; + +import java.util.Collection; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") +public interface FuzzyStorageChannel extends StorageChannel { + Collection getFuzzy(ResourceKey resource); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/package-info.java new file mode 100644 index 000000000..f4fe1639f --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/channel/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.storage.channel; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java new file mode 100644 index 000000000..001428a90 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java @@ -0,0 +1,19 @@ +package com.refinedmods.refinedstorage.platform.api.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; + +import java.util.Optional; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") +public interface PlatformExternalStorageProviderFactory { + Optional create(ServerLevel level, BlockPos pos, Direction direction); + + default int getPriority() { + return 0; + } +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/package-info.java new file mode 100644 index 000000000..9484f511b --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/package-info.java new file mode 100644 index 000000000..18db855f9 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java new file mode 100644 index 000000000..1dba4ccdd --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.platform.api.storagemonitor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import net.minecraft.world.entity.player.Player; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") +@FunctionalInterface +public interface StorageMonitorExtractionStrategy { + boolean extract(ResourceKey resource, boolean fullStack, Player player, Actor actor, Network network); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java new file mode 100644 index 000000000..0525ea66e --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java @@ -0,0 +1,16 @@ +package com.refinedmods.refinedstorage.platform.api.storagemonitor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") +@FunctionalInterface +public interface StorageMonitorInsertionStrategy { + Optional insert(ResourceKey configuredResource, ItemStack stack, Actor actor, Network network); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/package-info.java new file mode 100644 index 000000000..7f362e5db --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/storagemonitor/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.storagemonitor; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/AmountFormatting.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormatting.java similarity index 96% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/AmountFormatting.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormatting.java index 3b9dabee7..e3483dbb7 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/AmountFormatting.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormatting.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support; +package com.refinedmods.refinedstorage.platform.api.support; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/HelpTooltipComponent.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/HelpTooltipComponent.java similarity index 88% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/HelpTooltipComponent.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/HelpTooltipComponent.java index 9cbe3e7a2..0cdeb6f30 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/HelpTooltipComponent.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/HelpTooltipComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support; +package com.refinedmods.refinedstorage.platform.api.support; import net.minecraft.network.chat.Component; import net.minecraft.world.inventory.tooltip.TooltipComponent; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyBlockItem.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyBlockItem.java similarity index 96% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyBlockItem.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyBlockItem.java index aa3675f35..4573fa03c 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyBlockItem.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyBlockItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.energy; +package com.refinedmods.refinedstorage.platform.api.support.energy; import java.util.List; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyItem.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyItem.java similarity index 95% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyItem.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyItem.java index 1018e5cc6..620198d93 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractEnergyItem.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractEnergyItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.energy; +package com.refinedmods.refinedstorage.platform.api.support.energy; import java.util.List; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java similarity index 86% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java index 7b8f679ea..683af95e9 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.api.support.energy; +package com.refinedmods.refinedstorage.platform.api.support.energy; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; import java.util.List; import java.util.Optional; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/EnergyItemHelper.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/EnergyItemHelper.java similarity index 90% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/EnergyItemHelper.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/EnergyItemHelper.java index e13ec3cfd..c72fa5f48 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/EnergyItemHelper.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/EnergyItemHelper.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.energy; +package com.refinedmods.refinedstorage.platform.api.support.energy; import java.util.List; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/TransferableBlockEntityEnergy.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/TransferableBlockEntityEnergy.java new file mode 100644 index 000000000..5fd19425c --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/TransferableBlockEntityEnergy.java @@ -0,0 +1,10 @@ +package com.refinedmods.refinedstorage.platform.api.support.energy; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") +public interface TransferableBlockEntityEnergy { + EnergyStorage getEnergyStorage(); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/package-info.java new file mode 100644 index 000000000..b08e1e454 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/energy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.support.energy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java similarity index 93% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java index 583a35c81..eee9544f5 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/AbstractNetworkNodeContainerBlockEntity.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network; +package com.refinedmods.refinedstorage.platform.api.support.network; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; import java.util.HashSet; import java.util.Set; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/ConnectionLogic.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionLogic.java similarity index 82% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/ConnectionLogic.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionLogic.java index e364a0136..12f650612 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/ConnectionLogic.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionLogic.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network; +package com.refinedmods.refinedstorage.platform.api.support.network; import net.minecraft.core.Direction; import net.minecraft.world.level.Level; @@ -11,7 +11,7 @@ public interface ConnectionLogic { * Add outgoing connections here. * Called when a node is about to be added into the network graph. * If the outgoing connections ever change, call {@link - * com.refinedmods.refinedstorage2.platform.api.PlatformApi#onNetworkNodeContainerUpdated( + * com.refinedmods.refinedstorage.platform.api.PlatformApi#onNetworkNodeContainerUpdated( *InWorldNetworkNodeContainer, Level)}. * * @param sink the sink that accepts outgoing connections @@ -22,7 +22,7 @@ public interface ConnectionLogic { * Returns whether the (not yet discovered) node can accept an incoming connection. * Changes to this return value won't cause a rebuild of the network state. * If the return value ever changes, call {@link - * com.refinedmods.refinedstorage2.platform.api.PlatformApi#onNetworkNodeContainerUpdated( + * com.refinedmods.refinedstorage.platform.api.PlatformApi#onNetworkNodeContainerUpdated( *InWorldNetworkNodeContainer, Level)}. * * @param incomingDirection the incoming direction diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/ConnectionSink.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionSink.java similarity index 83% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/ConnectionSink.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionSink.java index b8094e38f..dff5d3cf9 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/ConnectionSink.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/ConnectionSink.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network; +package com.refinedmods.refinedstorage.platform.api.support.network; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/InWorldNetworkNodeContainer.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/InWorldNetworkNodeContainer.java new file mode 100644 index 000000000..218818e4b --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/InWorldNetworkNodeContainer.java @@ -0,0 +1,21 @@ +package com.refinedmods.refinedstorage.platform.api.support.network; + +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.GlobalPos; +import net.minecraft.world.level.block.state.BlockState; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") +public interface InWorldNetworkNodeContainer extends NetworkNodeContainer, ConnectionLogic { + BlockState getBlockState(); + + boolean isRemoved(); + + GlobalPos getPosition(); + + BlockPos getLocalPosition(); + + String getName(); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/NetworkNodeContainerBlockEntity.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/NetworkNodeContainerBlockEntity.java new file mode 100644 index 000000000..a8342354c --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/NetworkNodeContainerBlockEntity.java @@ -0,0 +1,19 @@ +package com.refinedmods.refinedstorage.platform.api.support.network; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.security.SecurityHelper; + +import java.util.Set; + +import net.minecraft.server.level.ServerPlayer; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.6") +@FunctionalInterface +public interface NetworkNodeContainerBlockEntity { + Set getContainers(); + + default boolean canBuild(final ServerPlayer player) { + return SecurityHelper.isAllowed(player, PlatformApi.INSTANCE.getBuiltinPermissions().build(), getContainers()); + } +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemHelper.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemHelper.java similarity index 91% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemHelper.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemHelper.java index 04221f338..5870ffe23 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemHelper.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemHelper.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemSession.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemSession.java new file mode 100644 index 000000000..bccff77aa --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemSession.java @@ -0,0 +1,16 @@ +package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; + +import com.refinedmods.refinedstorage.api.network.Network; + +import java.util.Optional; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") +public interface NetworkBoundItemSession { + Optional resolveNetwork(); + + boolean isActive(); + + void drainEnergy(long amount); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java new file mode 100644 index 000000000..78b9ee5b0 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; + +import com.refinedmods.refinedstorage.api.network.Network; + +import javax.annotation.Nullable; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.6") +public interface NetworkBoundItemTargetBlockEntity { + @Nullable + Network getNetworkForBoundItem(); +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReference.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/SlotReference.java similarity index 83% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReference.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/SlotReference.java index c5a365111..539506ef6 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReference.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/SlotReference.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; import java.util.Optional; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/SlotReferenceFactory.java similarity index 88% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceFactory.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/SlotReferenceFactory.java index f94b1da7a..f515774a7 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceFactory.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/SlotReferenceFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceProvider.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/SlotReferenceProvider.java similarity index 80% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceProvider.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/SlotReferenceProvider.java index 52bd50a69..760a30987 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/SlotReferenceProvider.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/SlotReferenceProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/package-info.java new file mode 100644 index 000000000..86700ed4f --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/bounditem/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.support.network.bounditem; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/package-info.java new file mode 100644 index 000000000..7ae69f978 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/network/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.support.network; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/package-info.java new file mode 100644 index 000000000..12ffffcb9 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.support; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/PlatformRegistry.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/PlatformRegistry.java similarity index 95% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/PlatformRegistry.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/PlatformRegistry.java index 18ead5170..5c72be8db 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/PlatformRegistry.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/PlatformRegistry.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.registry; +package com.refinedmods.refinedstorage.platform.api.support.registry; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/package-info.java new file mode 100644 index 000000000..eb299fc7e --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/registry/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.support.registry; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/AbstractResourceType.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/AbstractResourceType.java similarity index 95% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/AbstractResourceType.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/AbstractResourceType.java index e634d2443..7c911413e 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/AbstractResourceType.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/AbstractResourceType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.resource; +package com.refinedmods.refinedstorage.platform.api.support.resource; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FuzzyModeNormalizer.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FuzzyModeNormalizer.java new file mode 100644 index 000000000..c622348cd --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/FuzzyModeNormalizer.java @@ -0,0 +1,10 @@ +package com.refinedmods.refinedstorage.platform.api.support.resource; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.3") +public interface FuzzyModeNormalizer { + ResourceKey normalize(); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/PlatformResourceKey.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/PlatformResourceKey.java new file mode 100644 index 000000000..539789045 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/PlatformResourceKey.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.platform.api.support.resource; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.4") +public interface PlatformResourceKey extends ResourceKey { + long getInterfaceExportLimit(); + + ResourceType getResourceType(); +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/RecipeModIngredientConverter.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/RecipeModIngredientConverter.java similarity index 81% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/RecipeModIngredientConverter.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/RecipeModIngredientConverter.java index 03d682761..fbaa33558 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/RecipeModIngredientConverter.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/RecipeModIngredientConverter.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support.resource; +package com.refinedmods.refinedstorage.platform.api.support.resource; import java.util.Optional; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceContainer.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainer.java similarity index 86% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceContainer.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainer.java index df726ee9e..2baa83546 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceContainer.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceContainer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.api.support.resource; +package com.refinedmods.refinedstorage.platform.api.support.resource; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceFactory.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceFactory.java new file mode 100644 index 000000000..fbf51c942 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceFactory.java @@ -0,0 +1,16 @@ +package com.refinedmods.refinedstorage.platform.api.support.resource; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.13") +public interface ResourceFactory { + Optional create(ItemStack stack); + + boolean isValid(ResourceKey resource); +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceRendering.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceRendering.java similarity index 84% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceRendering.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceRendering.java index 4485da524..b52992ed4 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceRendering.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceRendering.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.api.support.resource; +package com.refinedmods.refinedstorage.platform.api.support.resource; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.List; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java new file mode 100644 index 000000000..7ed1658f3 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/ResourceType.java @@ -0,0 +1,46 @@ +package com.refinedmods.refinedstorage.platform.api.support.resource; + +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; + +import java.util.Optional; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.resources.ResourceLocation; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.4") +public interface ResourceType { + MapCodec getMapCodec(); + + Codec getCodec(); + + StreamCodec getStreamCodec(); + + MutableComponent getTitle(); + + ResourceLocation getTextureIdentifier(); + + int getXTexture(); + + int getYTexture(); + + long normalizeAmount(double amount); + + double getDisplayAmount(long amount); + + Optional toGridResource(ResourceAmount resourceAmount); + + boolean isGridResourceBelonging(GridResource gridResource); + + long getInterfaceExportLimit(); + + GridOperations createGridOperations(StorageChannel storageChannel, Actor actor); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/FuzzyResourceList.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/FuzzyResourceList.java new file mode 100644 index 000000000..0539365f0 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/FuzzyResourceList.java @@ -0,0 +1,21 @@ +package com.refinedmods.refinedstorage.platform.api.support.resource.list; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; + +import java.util.Collection; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") +public interface FuzzyResourceList extends ResourceList { + /** + * Retrieves all resources that match the normalized variant from {@link FuzzyModeNormalizer}. + * + * @param resource the resource, doesn't matter if it's normalized or not + * @return a list of fuzzy matched variants, or empty list if none found + */ + Collection getFuzzy(ResourceKey resource); +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/package-info.java new file mode 100644 index 000000000..9e1d45101 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/list/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.support.resource.list; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/package-info.java new file mode 100644 index 000000000..c8c9eb497 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/support/resource/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.support.resource; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/AbstractUpgradeItem.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/AbstractUpgradeItem.java similarity index 94% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/AbstractUpgradeItem.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/AbstractUpgradeItem.java index db9032560..6875c70a3 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/AbstractUpgradeItem.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/AbstractUpgradeItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.upgrade; +package com.refinedmods.refinedstorage.platform.api.upgrade; import java.util.Optional; import java.util.Set; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/BuiltinUpgradeDestinations.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/BuiltinUpgradeDestinations.java similarity index 85% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/BuiltinUpgradeDestinations.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/BuiltinUpgradeDestinations.java index 26ecda3d4..0f824e073 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/BuiltinUpgradeDestinations.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/BuiltinUpgradeDestinations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.upgrade; +package com.refinedmods.refinedstorage.platform.api.upgrade; import org.apiguardian.api.API; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeDestination.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeDestination.java similarity index 82% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeDestination.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeDestination.java index 20e3f5aae..8b8ddcac5 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeDestination.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeDestination.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.upgrade; +package com.refinedmods.refinedstorage.platform.api.upgrade; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeItem.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeItem.java new file mode 100644 index 000000000..9af926696 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeItem.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage.platform.api.upgrade; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.10") +public interface UpgradeItem { + long getEnergyUsage(); +} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeMapping.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeMapping.java similarity index 90% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeMapping.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeMapping.java index c7f1db026..e7580389e 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeMapping.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeMapping.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.upgrade; +package com.refinedmods.refinedstorage.platform.api.upgrade; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeRegistry.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeRegistry.java similarity index 91% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeRegistry.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeRegistry.java index 19f0d24ba..06560bc67 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeRegistry.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeRegistry.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.upgrade; +package com.refinedmods.refinedstorage.platform.api.upgrade; import java.util.Set; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeState.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeState.java similarity index 78% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeState.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeState.java index 277d7944a..c3a1c5dfe 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeState.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/UpgradeState.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.upgrade; +package com.refinedmods.refinedstorage.platform.api.upgrade; import org.apiguardian.api.API; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/package-info.java new file mode 100644 index 000000000..fb5602034 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/upgrade/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.upgrade; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/WirelessTransmitter.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitter.java similarity index 82% rename from refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/WirelessTransmitter.java rename to refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitter.java index 6cacdc33d..2ef7a63e5 100644 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/WirelessTransmitter.java +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitter.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter; +package com.refinedmods.refinedstorage.platform.api.wirelesstransmitter; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.Level; diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java new file mode 100644 index 000000000..f90e85cb7 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.platform.api.wirelesstransmitter; + +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.0") +@FunctionalInterface +public interface WirelessTransmitterRangeModifier { + int modifyRange(UpgradeState upgradeState, int range); + + default int getPriority() { + return 0; + } +} diff --git a/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/package-info.java b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/package-info.java new file mode 100644 index 000000000..3fdb688d4 --- /dev/null +++ b/refinedstorage-platform-api/src/main/java/com/refinedmods/refinedstorage/platform/api/wirelesstransmitter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.api.wirelesstransmitter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-api/src/main/resources/fabric.mod.json b/refinedstorage-platform-api/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..9678c35d8 --- /dev/null +++ b/refinedstorage-platform-api/src/main/resources/fabric.mod.json @@ -0,0 +1,19 @@ +{ + "schemaVersion": 1, + "id": "refinedstorage-platform-api", + "version": "${version}", + "name": "Refined Storage Platform API", + "authors": [ + "Refined Mods" + ], + "license": "MIT", + "environment": "*", + "custom": { + "modmenu": { + "parent": "refinedstorage", + "badges": [ + "library" + ] + } + } +} diff --git a/refinedstorage2-platform-api/src/test/java/com/refinedmods/refinedstorage2/platform/api/support/AmountFormattingTest.java b/refinedstorage-platform-api/src/test/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormattingTest.java similarity index 98% rename from refinedstorage2-platform-api/src/test/java/com/refinedmods/refinedstorage2/platform/api/support/AmountFormattingTest.java rename to refinedstorage-platform-api/src/test/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormattingTest.java index 7947fc363..fd635d791 100644 --- a/refinedstorage2-platform-api/src/test/java/com/refinedmods/refinedstorage2/platform/api/support/AmountFormattingTest.java +++ b/refinedstorage-platform-api/src/test/java/com/refinedmods/refinedstorage/platform/api/support/AmountFormattingTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.api.support; +package com.refinedmods.refinedstorage.platform.api.support; import org.junit.jupiter.api.Test; diff --git a/refinedstorage-platform-common/build.gradle b/refinedstorage-platform-common/build.gradle new file mode 100644 index 000000000..f9e3a5427 --- /dev/null +++ b/refinedstorage-platform-common/build.gradle @@ -0,0 +1,29 @@ +plugins { + id 'java-library' +} + +archivesBaseName = 'refinedstorage-platform-common' + +commonProject() + +dependencies { + api project(':refinedstorage-platform-api') + api project(':refinedstorage-core-api') + api project(':refinedstorage-resource-api') + api project(':refinedstorage-storage-api') + api project(':refinedstorage-network-api') + api project(':refinedstorage-network') + api project(':refinedstorage-query-parser') + api project(':refinedstorage-grid-api') + testImplementation libs.junit.api + testImplementation libs.junit.params + testRuntimeOnly libs.junit.engine + testImplementation libs.assertj + testImplementation libs.equalsverifier +} + +test { + useJUnitPlatform() +} + +enablePublishing() diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_cable.json new file mode 100644 index 000000000..4309face1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/black" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_constructor.json new file mode 100644 index 000000000..a14839054 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/black" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json new file mode 100644 index 000000000..ff6f106ec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json new file mode 100644 index 000000000..3816e3822 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/black", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/black", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/black", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/black", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/black", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/black" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/black", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/black", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/black", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/black", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/black", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/black", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json new file mode 100644 index 000000000..ff6f106ec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_destructor.json new file mode 100644 index 000000000..91b21745c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/black" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_detector.json new file mode 100644 index 000000000..c3e668b77 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/black" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/black", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/black", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/black", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/black", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/black", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_disk_interface.json new file mode 100644 index 000000000..adfc129c3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/black" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_exporter.json new file mode 100644 index 000000000..ee608c843 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/black" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_external_storage.json new file mode 100644 index 000000000..7ae068f16 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/black" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json new file mode 100644 index 000000000..aeb67b6b7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/black", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/black", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/black", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/black", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/black", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/black" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/black", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/black", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/black", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/black", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/black", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/black", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_importer.json new file mode 100644 index 000000000..879bf650c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/black" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/black", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_receiver.json new file mode 100644 index 000000000..ae289d869 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/black" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_transmitter.json new file mode 100644 index 000000000..629d62c81 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/black" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_relay.json new file mode 100644 index 000000000..0a2a21a3c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/black", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/black", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/black" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/black", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/black", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/black", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json new file mode 100644 index 000000000..35268b3d8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/black", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/black" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/black", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/black", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json new file mode 100644 index 000000000..611bd9e75 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/black_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/black" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/black", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/black", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/black", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/black", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/black", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_cable.json new file mode 100644 index 000000000..ac13ee7d2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_constructor.json new file mode 100644 index 000000000..8fe655a61 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json new file mode 100644 index 000000000..2ea391b47 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json new file mode 100644 index 000000000..abc8224a6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/blue", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/blue", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/blue", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/blue", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/blue", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/blue" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/blue", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/blue", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/blue", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/blue", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/blue", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/blue", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json new file mode 100644 index 000000000..2ea391b47 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_destructor.json new file mode 100644 index 000000000..785d09cbd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_detector.json new file mode 100644 index 000000000..5057ac805 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/blue" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/blue", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/blue", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/blue", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/blue", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/blue", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_disk_interface.json new file mode 100644 index 000000000..8a9f1fa29 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/blue" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_exporter.json new file mode 100644 index 000000000..fc6a17885 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_external_storage.json new file mode 100644 index 000000000..f9f85426c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json new file mode 100644 index 000000000..d48e360c5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/blue", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/blue", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/blue", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/blue", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/blue", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/blue" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/blue", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/blue", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/blue", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/blue", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/blue", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/blue", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_importer.json new file mode 100644 index 000000000..8ed0fd17f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_receiver.json new file mode 100644 index 000000000..0eec20948 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/blue" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_transmitter.json new file mode 100644 index 000000000..39cd89b2e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/blue" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_relay.json new file mode 100644 index 000000000..1acfcac70 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/blue", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/blue", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/blue" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/blue", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/blue", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/blue", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json new file mode 100644 index 000000000..342f1754d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/blue", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/blue" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/blue", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/blue", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json new file mode 100644 index 000000000..a5d6f4d32 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/blue_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/blue" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/blue", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/blue", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/blue", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/blue", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/blue", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_cable.json new file mode 100644 index 000000000..ba61ed542 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/brown" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_constructor.json new file mode 100644 index 000000000..07b7864b2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/brown" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json new file mode 100644 index 000000000..19522ef0d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json new file mode 100644 index 000000000..f2f2b7849 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/brown", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/brown", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/brown", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/brown", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/brown", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/brown" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/brown", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/brown", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/brown", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/brown", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/brown", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/brown", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json new file mode 100644 index 000000000..19522ef0d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_destructor.json new file mode 100644 index 000000000..8643f4c79 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/brown" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_detector.json new file mode 100644 index 000000000..c6e146b57 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/brown" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/brown", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/brown", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/brown", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/brown", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/brown", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_disk_interface.json new file mode 100644 index 000000000..abc440fad --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/brown" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_exporter.json new file mode 100644 index 000000000..4d08b4e0c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/brown" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_external_storage.json new file mode 100644 index 000000000..50e1e27bd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/brown" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json new file mode 100644 index 000000000..fc5d4e66d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/brown", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/brown", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/brown", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/brown", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/brown", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/brown" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/brown", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/brown", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/brown", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/brown", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/brown", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/brown", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_importer.json new file mode 100644 index 000000000..6d2726f79 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/brown" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/brown", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_receiver.json new file mode 100644 index 000000000..d317075c9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/brown" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_transmitter.json new file mode 100644 index 000000000..70c9a83ae --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/brown" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_relay.json new file mode 100644 index 000000000..b84a341cf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/brown", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/brown", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/brown" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/brown", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/brown", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/brown", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json new file mode 100644 index 000000000..40639c899 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/brown", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/brown" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/brown", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/brown", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json new file mode 100644 index 000000000..0ac46f02f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/brown_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/brown" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/brown", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/brown", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/brown", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/brown", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/brown", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cable.json new file mode 100644 index 000000000..c872049ba --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/constructor.json new file mode 100644 index 000000000..f0c902f02 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/controller.json new file mode 100644 index 000000000..27cf06439 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json new file mode 100644 index 000000000..b5443a984 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/light_blue" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/light_blue", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json new file mode 100644 index 000000000..27cf06439 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_cable.json new file mode 100644 index 000000000..d7d7362bc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/cyan" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_constructor.json new file mode 100644 index 000000000..478897e07 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/cyan" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json new file mode 100644 index 000000000..b6d412eaa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json new file mode 100644 index 000000000..f9ba5cc7e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/cyan", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/cyan", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/cyan", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/cyan", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/cyan", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/cyan" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/cyan", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/cyan", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/cyan", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/cyan", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/cyan", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/cyan", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json new file mode 100644 index 000000000..b6d412eaa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_destructor.json new file mode 100644 index 000000000..7795f885d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/cyan" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_detector.json new file mode 100644 index 000000000..a72d0720f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/cyan" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/cyan", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/cyan", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/cyan", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/cyan", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/cyan", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_disk_interface.json new file mode 100644 index 000000000..ff5a3b9bf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/cyan" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_exporter.json new file mode 100644 index 000000000..37aba6fd0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/cyan" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_external_storage.json new file mode 100644 index 000000000..b2c4c2921 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/cyan" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json new file mode 100644 index 000000000..e2ac699a0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/cyan", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/cyan", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/cyan", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/cyan", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/cyan", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/cyan" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/cyan", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/cyan", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/cyan", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/cyan", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/cyan", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/cyan", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_importer.json new file mode 100644 index 000000000..136e1671b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/cyan" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/cyan", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_receiver.json new file mode 100644 index 000000000..34f374a36 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/cyan" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_transmitter.json new file mode 100644 index 000000000..fb9afde63 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/cyan" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_relay.json new file mode 100644 index 000000000..0c05a5a2c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/cyan", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/cyan", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/cyan" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/cyan", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/cyan", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/cyan", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json new file mode 100644 index 000000000..6b3198332 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/cyan", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/cyan" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/cyan", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/cyan", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json new file mode 100644 index 000000000..3001c624d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/cyan" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/cyan", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/cyan", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/cyan", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/cyan", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/cyan", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/destructor.json new file mode 100644 index 000000000..3b3b47d04 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/detector.json new file mode 100644 index 000000000..c2bcf3ae8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/light_blue" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/light_blue", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/light_blue", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/light_blue", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/light_blue", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/light_blue", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/disk_interface.json new file mode 100644 index 000000000..e53f69d08 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/light_blue" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/exporter.json new file mode 100644 index 000000000..c5aa22219 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/external_storage.json new file mode 100644 index 000000000..6af30bcd1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json new file mode 100644 index 000000000..16c5288fe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json new file mode 100644 index 000000000..b460bec5d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/gray", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/gray", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/gray", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/gray", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/gray", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/gray" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/gray", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/gray", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/gray", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/gray", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/gray", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/gray", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json new file mode 100644 index 000000000..16c5288fe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_detector.json new file mode 100644 index 000000000..6400752f2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/gray" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/gray", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/gray", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/gray", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/gray", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/gray", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_disk_interface.json new file mode 100644 index 000000000..55d823257 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/gray" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json new file mode 100644 index 000000000..efd798bee --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/gray", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/gray", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/gray", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/gray", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/gray", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/gray" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/gray", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/gray", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/gray", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/gray", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/gray", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/gray", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_receiver.json new file mode 100644 index 000000000..242a37599 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/gray" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_transmitter.json new file mode 100644 index 000000000..5583be643 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/gray" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_relay.json new file mode 100644 index 000000000..e694c73f0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/gray", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/gray", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/gray" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/gray", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/gray", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/gray", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json new file mode 100644 index 000000000..ec9d0b338 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/gray", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/gray" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/gray", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/gray", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json new file mode 100644 index 000000000..4c81ca952 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/gray_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/gray" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/gray", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/gray", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/gray", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/gray", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/gray", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_cable.json new file mode 100644 index 000000000..51d737865 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/green" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_constructor.json new file mode 100644 index 000000000..fe7f77b32 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/green" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json new file mode 100644 index 000000000..985393957 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json new file mode 100644 index 000000000..f53a2a9e9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/green", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/green", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/green", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/green", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/green", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/green" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/green", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/green", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/green", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/green", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/green", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/green", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json new file mode 100644 index 000000000..985393957 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_destructor.json new file mode 100644 index 000000000..dd8b7b395 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/green" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_detector.json new file mode 100644 index 000000000..9290fecd1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/green" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/green", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/green", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/green", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/green", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/green", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_disk_interface.json new file mode 100644 index 000000000..61aaed7de --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/green" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_exporter.json new file mode 100644 index 000000000..154b941c7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/green" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_external_storage.json new file mode 100644 index 000000000..c273ff48f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/green" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json new file mode 100644 index 000000000..e596869e5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/green", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/green", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/green", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/green", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/green", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/green" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/green", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/green", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/green", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/green", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/green", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/green", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_importer.json new file mode 100644 index 000000000..43af93e21 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/green" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/green", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_receiver.json new file mode 100644 index 000000000..9399314bf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/green" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_transmitter.json new file mode 100644 index 000000000..809d7f401 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/green" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_relay.json new file mode 100644 index 000000000..0efabb04d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/green", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/green", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/green" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/green", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/green", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/green", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json new file mode 100644 index 000000000..c115bba4a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/green", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/green" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/green", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/green", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json new file mode 100644 index 000000000..f3390c01b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/green_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/green" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/green", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/green", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/green", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/green", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/green", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/grid.json new file mode 100644 index 000000000..e367f5f01 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/light_blue", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/light_blue", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/light_blue", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/light_blue", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/light_blue", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/light_blue" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/light_blue", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/light_blue", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/light_blue", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/light_blue", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/light_blue", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/light_blue", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/importer.json new file mode 100644 index 000000000..dc9c4786a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_cable.json new file mode 100644 index 000000000..1240ef2bd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_constructor.json new file mode 100644 index 000000000..a4c16ed81 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_destructor.json new file mode 100644 index 000000000..412f10ff1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_exporter.json new file mode 100644 index 000000000..7e543f779 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_external_storage.json new file mode 100644 index 000000000..83c9bd5e8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_importer.json new file mode 100644 index 000000000..52b21c01c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_blue_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_blue" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_blue", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_cable.json new file mode 100644 index 000000000..534465f4d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_constructor.json new file mode 100644 index 000000000..7f62673da --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json new file mode 100644 index 000000000..4c3aff946 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json new file mode 100644 index 000000000..b3a8b0afb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/light_gray" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/light_gray", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json new file mode 100644 index 000000000..4c3aff946 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_destructor.json new file mode 100644 index 000000000..77c820b5a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_detector.json new file mode 100644 index 000000000..305598bba --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/light_gray" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/light_gray", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/light_gray", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/light_gray", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/light_gray", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/light_gray", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_disk_interface.json new file mode 100644 index 000000000..cb9f6681a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/light_gray" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_exporter.json new file mode 100644 index 000000000..81bbee55a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_external_storage.json new file mode 100644 index 000000000..aed770625 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json new file mode 100644 index 000000000..fc199eff6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/light_gray", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/light_gray", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/light_gray", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/light_gray", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/light_gray", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/light_gray" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/light_gray", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/light_gray", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/light_gray", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/light_gray", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/light_gray", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/light_gray", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_importer.json new file mode 100644 index 000000000..eaa5b8e11 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/light_gray" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/light_gray", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_receiver.json new file mode 100644 index 000000000..759fc079f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/light_gray" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_transmitter.json new file mode 100644 index 000000000..729a5f076 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/light_gray" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_relay.json new file mode 100644 index 000000000..21f79df76 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/light_gray", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/light_gray", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/light_gray" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/light_gray", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/light_gray", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/light_gray", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json new file mode 100644 index 000000000..e288c9526 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/light_gray", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/light_gray" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/light_gray", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/light_gray", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json new file mode 100644 index 000000000..9296a6a2e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/light_gray" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/light_gray", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/light_gray", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/light_gray", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/light_gray", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/light_gray", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_cable.json new file mode 100644 index 000000000..e28efe162 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/lime" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_constructor.json new file mode 100644 index 000000000..08af65b42 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/lime" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json new file mode 100644 index 000000000..d9593164b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json new file mode 100644 index 000000000..9be19b321 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/lime", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/lime", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/lime", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/lime", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/lime", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/lime" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/lime", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/lime", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/lime", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/lime", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/lime", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/lime", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json new file mode 100644 index 000000000..d9593164b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_destructor.json new file mode 100644 index 000000000..7fad1d75d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/lime" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_detector.json new file mode 100644 index 000000000..69a23ebeb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/lime" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/lime", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/lime", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/lime", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/lime", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/lime", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_disk_interface.json new file mode 100644 index 000000000..977a1b3e9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/lime" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_exporter.json new file mode 100644 index 000000000..2cf28fad2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/lime" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_external_storage.json new file mode 100644 index 000000000..329782786 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/lime" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json new file mode 100644 index 000000000..2212c30d1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/lime", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/lime", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/lime", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/lime", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/lime", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/lime" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/lime", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/lime", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/lime", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/lime", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/lime", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/lime", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_importer.json new file mode 100644 index 000000000..a429fc62c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/lime" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/lime", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_receiver.json new file mode 100644 index 000000000..19f901d7c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/lime" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_transmitter.json new file mode 100644 index 000000000..415a23053 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/lime" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_relay.json new file mode 100644 index 000000000..b439c727f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/lime", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/lime", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/lime" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/lime", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/lime", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/lime", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json new file mode 100644 index 000000000..16ba782f1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/lime", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/lime" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/lime", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/lime", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json new file mode 100644 index 000000000..93124cf4f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/lime_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/lime" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/lime", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/lime", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/lime", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/lime", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/lime", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_cable.json new file mode 100644 index 000000000..9ab9fe409 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/magenta" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_constructor.json new file mode 100644 index 000000000..498560344 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/magenta" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json new file mode 100644 index 000000000..81297674c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json new file mode 100644 index 000000000..26251d670 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/magenta", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/magenta", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/magenta", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/magenta", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/magenta", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/magenta" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/magenta", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/magenta", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/magenta", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/magenta", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/magenta", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/magenta", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json new file mode 100644 index 000000000..81297674c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_destructor.json new file mode 100644 index 000000000..4e1edb983 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/magenta" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_detector.json new file mode 100644 index 000000000..a4fd0c853 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/magenta" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/magenta", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/magenta", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/magenta", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/magenta", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/magenta", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_disk_interface.json new file mode 100644 index 000000000..49549e087 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/magenta" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_exporter.json new file mode 100644 index 000000000..8272b6dbb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/magenta" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_external_storage.json new file mode 100644 index 000000000..897d12591 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/magenta" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json new file mode 100644 index 000000000..e983aba5c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/magenta", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/magenta", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/magenta", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/magenta", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/magenta", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/magenta" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/magenta", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/magenta", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/magenta", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/magenta", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/magenta", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/magenta", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_importer.json new file mode 100644 index 000000000..ad56822fd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/magenta" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/magenta", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_receiver.json new file mode 100644 index 000000000..47b33539e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/magenta" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_transmitter.json new file mode 100644 index 000000000..8391665a7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/magenta" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_relay.json new file mode 100644 index 000000000..24f1747b8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/magenta", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/magenta", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/magenta" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/magenta", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/magenta", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/magenta", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json new file mode 100644 index 000000000..38bace90e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/magenta", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/magenta" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/magenta", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/magenta", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json new file mode 100644 index 000000000..d2a30b5c4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/magenta" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/magenta", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/magenta", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/magenta", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/magenta", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/magenta", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_receiver.json new file mode 100644 index 000000000..c38a13a1b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/light_blue" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_transmitter.json new file mode 100644 index 000000000..4acb9905f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/light_blue" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_cable.json new file mode 100644 index 000000000..82ac40d83 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/orange" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_constructor.json new file mode 100644 index 000000000..cdf7deac5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/orange" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json new file mode 100644 index 000000000..f1705413e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json new file mode 100644 index 000000000..91397bf20 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/orange", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/orange", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/orange", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/orange", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/orange", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/orange" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/orange", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/orange", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/orange", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/orange", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/orange", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/orange", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json new file mode 100644 index 000000000..f1705413e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_destructor.json new file mode 100644 index 000000000..063c27350 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/orange" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_detector.json new file mode 100644 index 000000000..e82ab79ee --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/orange" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/orange", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/orange", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/orange", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/orange", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/orange", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_disk_interface.json new file mode 100644 index 000000000..13c13c0db --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/orange" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_exporter.json new file mode 100644 index 000000000..0ae1e3896 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/orange" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_external_storage.json new file mode 100644 index 000000000..f10eecf17 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/orange" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json new file mode 100644 index 000000000..1705e0a5a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/orange", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/orange", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/orange", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/orange", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/orange", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/orange" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/orange", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/orange", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/orange", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/orange", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/orange", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/orange", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_importer.json new file mode 100644 index 000000000..e1c8efee3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/orange" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/orange", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_receiver.json new file mode 100644 index 000000000..a2d04f43e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/orange" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_transmitter.json new file mode 100644 index 000000000..6f35df556 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/orange" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_relay.json new file mode 100644 index 000000000..cabf4f939 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/orange", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/orange", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/orange" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/orange", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/orange", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/orange", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json new file mode 100644 index 000000000..2626c9d03 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/orange", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/orange" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/orange", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/orange", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json new file mode 100644 index 000000000..e26ba1126 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/orange_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/orange" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/orange", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/orange", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/orange", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/orange", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/orange", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_cable.json new file mode 100644 index 000000000..184969b97 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/pink" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_constructor.json new file mode 100644 index 000000000..942ecd2ec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/pink" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json new file mode 100644 index 000000000..3d57ce30e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json new file mode 100644 index 000000000..1d0a217a0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/pink", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/pink", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/pink", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/pink", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/pink", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/pink" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/pink", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/pink", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/pink", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/pink", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/pink", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/pink", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json new file mode 100644 index 000000000..3d57ce30e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_destructor.json new file mode 100644 index 000000000..558b15b2d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/pink" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_detector.json new file mode 100644 index 000000000..54e9c8cd1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/pink" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/pink", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/pink", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/pink", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/pink", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/pink", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_disk_interface.json new file mode 100644 index 000000000..79db98309 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/pink" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_exporter.json new file mode 100644 index 000000000..0e927a5c9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/pink" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_external_storage.json new file mode 100644 index 000000000..b2646156e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/pink" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json new file mode 100644 index 000000000..0655d4be6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/pink", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/pink", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/pink", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/pink", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/pink", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/pink" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/pink", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/pink", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/pink", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/pink", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/pink", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/pink", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_importer.json new file mode 100644 index 000000000..2c450320d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/pink" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/pink", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_receiver.json new file mode 100644 index 000000000..ecf46c7d6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/pink" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_transmitter.json new file mode 100644 index 000000000..178e7f82f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/pink" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_relay.json new file mode 100644 index 000000000..8266380d8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/pink", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/pink", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/pink" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/pink", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/pink", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/pink", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json new file mode 100644 index 000000000..b8fc0db8a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/pink", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/pink" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/pink", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/pink", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json new file mode 100644 index 000000000..635c78bcb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/pink_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/pink" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/pink", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/pink", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/pink", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/pink", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/pink", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_cable.json new file mode 100644 index 000000000..16fe6d947 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/purple" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_constructor.json new file mode 100644 index 000000000..1c2c7c250 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/purple" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json new file mode 100644 index 000000000..a4801ca37 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json new file mode 100644 index 000000000..a51c9a3b7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/purple", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/purple", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/purple", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/purple", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/purple", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/purple" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/purple", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/purple", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/purple", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/purple", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/purple", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/purple", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json new file mode 100644 index 000000000..a4801ca37 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_destructor.json new file mode 100644 index 000000000..a87ca737c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/purple" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_detector.json new file mode 100644 index 000000000..623b311f5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/purple" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/purple", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/purple", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/purple", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/purple", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/purple", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_disk_interface.json new file mode 100644 index 000000000..f0681bbf5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/purple" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_exporter.json new file mode 100644 index 000000000..c3f3c0c0f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/purple" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_external_storage.json new file mode 100644 index 000000000..4d5faf355 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/purple" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json new file mode 100644 index 000000000..5370ac334 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/purple", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/purple", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/purple", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/purple", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/purple", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/purple" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/purple", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/purple", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/purple", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/purple", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/purple", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/purple", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_importer.json new file mode 100644 index 000000000..e6bf4f22f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/purple" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/purple", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_receiver.json new file mode 100644 index 000000000..10176bfe9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/purple" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_transmitter.json new file mode 100644 index 000000000..d0efa1fac --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/purple" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_relay.json new file mode 100644 index 000000000..cfd3ae4d5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/purple", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/purple", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/purple" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/purple", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/purple", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/purple", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json new file mode 100644 index 000000000..098bcea40 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/purple", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/purple" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/purple", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/purple", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json new file mode 100644 index 000000000..fbc6d1165 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/purple_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/purple" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/purple", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/purple", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/purple", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/purple", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/purple", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_cable.json new file mode 100644 index 000000000..5ce9bf967 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/red" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_constructor.json new file mode 100644 index 000000000..9a04f59d4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/red" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json new file mode 100644 index 000000000..fc2d99d73 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json new file mode 100644 index 000000000..a791823cc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/red", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/red", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/red", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/red", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/red", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/red" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/red", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/red", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/red", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/red", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/red", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/red", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json new file mode 100644 index 000000000..fc2d99d73 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_destructor.json new file mode 100644 index 000000000..9f5c66d6e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/red" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_detector.json new file mode 100644 index 000000000..76ae96997 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/red" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/red", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/red", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/red", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/red", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/red", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_disk_interface.json new file mode 100644 index 000000000..eccb17223 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/red" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_exporter.json new file mode 100644 index 000000000..2db0cac21 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/red" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_external_storage.json new file mode 100644 index 000000000..5891cd2af --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/red" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json new file mode 100644 index 000000000..994d1645f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/red", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/red", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/red", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/red", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/red", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/red" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/red", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/red", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/red", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/red", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/red", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/red", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_importer.json new file mode 100644 index 000000000..bae9e8610 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/red" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/red", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_receiver.json new file mode 100644 index 000000000..5f849af24 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/red" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_transmitter.json new file mode 100644 index 000000000..0319f777c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/red" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_relay.json new file mode 100644 index 000000000..3174fecf8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/red", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/red", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/red" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/red", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/red", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/red", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json new file mode 100644 index 000000000..18ead1820 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/red", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/red" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/red", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/red", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json new file mode 100644 index 000000000..458477650 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/red_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/red" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/red", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/red", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/red", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/red", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/red", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/relay.json new file mode 100644 index 000000000..4781f69dd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/light_blue", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/light_blue", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/light_blue" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/light_blue", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/light_blue", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/light_blue", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json new file mode 100644 index 000000000..ac12afd8d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/light_blue", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/light_blue" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/light_blue", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/light_blue", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_cable.json new file mode 100644 index 000000000..ca7d62965 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/white" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_constructor.json new file mode 100644 index 000000000..532942a78 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/white" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json new file mode 100644 index 000000000..6739a58a2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json new file mode 100644 index 000000000..1b3c558a1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/white", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/white", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/white", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/white", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/white", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/white" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/white", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/white", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/white", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/white", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/white", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/white", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json new file mode 100644 index 000000000..6739a58a2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_destructor.json new file mode 100644 index 000000000..0b4f52a98 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/white" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_detector.json new file mode 100644 index 000000000..1e30ce785 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/white" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/white", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/white", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/white", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/white", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/white", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_disk_interface.json new file mode 100644 index 000000000..58c08f38a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/white" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_exporter.json new file mode 100644 index 000000000..a5f5d9ee1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/white" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_external_storage.json new file mode 100644 index 000000000..c2518c593 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/white" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json new file mode 100644 index 000000000..fef1d476b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/white", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/white", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/white", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/white", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/white", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/white" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/white", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/white", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/white", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/white", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/white", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/white", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_importer.json new file mode 100644 index 000000000..f51ca9320 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/white" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/white", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_receiver.json new file mode 100644 index 000000000..c7e8eee69 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/white" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_transmitter.json new file mode 100644 index 000000000..e17465792 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/white" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_relay.json new file mode 100644 index 000000000..cc06fe56f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/white", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/white", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/white" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/white", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/white", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/white", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json new file mode 100644 index 000000000..23c5a3480 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/white", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/white" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/white", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/white", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json new file mode 100644 index 000000000..a51f8d7ae --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/white_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/white" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/white", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/white", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/white", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/white", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/white", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json new file mode 100644 index 000000000..1577fdf63 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/light_blue" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/light_blue", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/light_blue", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/light_blue", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/light_blue", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/light_blue", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_cable.json new file mode 100644 index 000000000..0b8966698 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_cable.json @@ -0,0 +1,62 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/yellow" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 90 + }, + "when": { + "east": "true" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_constructor.json new file mode 100644 index 000000000..144d74691 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_constructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/yellow" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/constructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json new file mode 100644 index 000000000..8ac80652b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json new file mode 100644 index 000000000..2678c5262 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafting_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/crafting_grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/crafting_grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/crafting_grid/yellow", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/crafting_grid/yellow", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/crafting_grid/yellow", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/crafting_grid/yellow", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/crafting_grid/yellow", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/crafting_grid/yellow" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/crafting_grid/yellow", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/crafting_grid/yellow", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/crafting_grid/yellow", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/crafting_grid/yellow", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/crafting_grid/yellow", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/crafting_grid/yellow", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json new file mode 100644 index 000000000..8ac80652b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_creative_controller.json @@ -0,0 +1,16 @@ +{ + "variants": { + "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" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_destructor.json new file mode 100644 index 000000000..c51c161f5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_destructor.json @@ -0,0 +1,180 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/yellow" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 90 + }, + "when": { + "active": "true", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 90 + }, + "when": { + "active": "false", + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 270 + }, + "when": { + "active": "true", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 270 + }, + "when": { + "active": "false", + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active" + }, + "when": { + "active": "true", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive" + }, + "when": { + "active": "false", + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "x": 180 + }, + "when": { + "active": "true", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "x": 180 + }, + "when": { + "active": "false", + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 270 + }, + "when": { + "active": "true", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 270 + }, + "when": { + "active": "false", + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/active", + "y": 90 + }, + "when": { + "active": "true", + "direction": "east" + } + }, + { + "apply": { + "model": "refinedstorage:block/destructor/inactive", + "y": 90 + }, + "when": { + "active": "false", + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_detector.json new file mode 100644 index 000000000..1b0875e94 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_detector.json @@ -0,0 +1,56 @@ +{ + "variants": { + "direction=down,powered=false": { + "model": "refinedstorage:block/detector/unpowered" + }, + "direction=down,powered=true": { + "model": "refinedstorage:block/detector/yellow" + }, + "direction=east,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 270 + }, + "direction=east,powered=true": { + "model": "refinedstorage:block/detector/yellow", + "x": 90, + "y": 270 + }, + "direction=north,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 180 + }, + "direction=north,powered=true": { + "model": "refinedstorage:block/detector/yellow", + "x": 90, + "y": 180 + }, + "direction=south,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90 + }, + "direction=south,powered=true": { + "model": "refinedstorage:block/detector/yellow", + "x": 90 + }, + "direction=up,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 180 + }, + "direction=up,powered=true": { + "model": "refinedstorage:block/detector/yellow", + "x": 180 + }, + "direction=west,powered=false": { + "model": "refinedstorage:block/detector/unpowered", + "x": 90, + "y": 90 + }, + "direction=west,powered=true": { + "model": "refinedstorage:block/detector/yellow", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_disk_interface.json new file mode 100644 index 000000000..b509f20c2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_disk_interface.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_interface/yellow" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_exporter.json new file mode 100644 index 000000000..77a277779 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_exporter.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/yellow" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/exporter", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_external_storage.json new file mode 100644 index 000000000..bdb3d2346 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_external_storage.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/yellow" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/external_storage", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json new file mode 100644 index 000000000..ce5b57cb5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_grid.json @@ -0,0 +1,110 @@ +{ + "variants": { + "active=false,direction=down_east": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": -90 + }, + "active=false,direction=down_north": { + "model": "refinedstorage:block/grid/inactive", + "x": 90 + }, + "active=false,direction=down_south": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=down_west": { + "model": "refinedstorage:block/grid/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/grid/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/grid/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/grid/inactive", + "y": 180 + }, + "active=false,direction=up_east": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": -90 + }, + "active=false,direction=up_north": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=up_south": { + "model": "refinedstorage:block/grid/inactive", + "x": -90 + }, + "active=false,direction=up_west": { + "model": "refinedstorage:block/grid/inactive", + "x": -90, + "y": 90 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/grid/inactive", + "y": 270 + }, + "active=true,direction=down_east": { + "model": "refinedstorage:block/grid/yellow", + "x": 90, + "y": -90 + }, + "active=true,direction=down_north": { + "model": "refinedstorage:block/grid/yellow", + "x": 90 + }, + "active=true,direction=down_south": { + "model": "refinedstorage:block/grid/yellow", + "x": 90, + "y": 180 + }, + "active=true,direction=down_west": { + "model": "refinedstorage:block/grid/yellow", + "x": 90, + "y": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/grid/yellow", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/grid/yellow" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/grid/yellow", + "y": 180 + }, + "active=true,direction=up_east": { + "model": "refinedstorage:block/grid/yellow", + "x": -90, + "y": -90 + }, + "active=true,direction=up_north": { + "model": "refinedstorage:block/grid/yellow", + "x": -90, + "y": 180 + }, + "active=true,direction=up_south": { + "model": "refinedstorage:block/grid/yellow", + "x": -90 + }, + "active=true,direction=up_west": { + "model": "refinedstorage:block/grid/yellow", + "x": -90, + "y": 90 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/grid/yellow", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_importer.json new file mode 100644 index 000000000..2cee8fd0d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_importer.json @@ -0,0 +1,115 @@ +{ + "multipart": [ + { + "apply": { + "model": "refinedstorage:block/cable/core/yellow" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "x": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/cable/extension/yellow", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 90 + }, + "when": { + "direction": "down" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 270 + }, + "when": { + "direction": "up" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer" + }, + "when": { + "direction": "north" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "x": 180 + }, + "when": { + "direction": "south" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 270 + }, + "when": { + "direction": "west" + } + }, + { + "apply": { + "model": "refinedstorage:block/importer", + "y": 90 + }, + "when": { + "direction": "east" + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_receiver.json new file mode 100644 index 000000000..1230656ad --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_receiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "refinedstorage:block/network_receiver/inactive" + }, + "active=true": { + "model": "refinedstorage:block/network_receiver/yellow" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_transmitter.json new file mode 100644 index 000000000..9e013723f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_network_transmitter.json @@ -0,0 +1,13 @@ +{ + "variants": { + "state=active": { + "model": "refinedstorage:block/network_transmitter/yellow" + }, + "state=error": { + "model": "refinedstorage:block/network_transmitter/error" + }, + "state=inactive": { + "model": "refinedstorage:block/network_transmitter/inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_relay.json new file mode 100644 index 000000000..867b9d79b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_relay.json @@ -0,0 +1,52 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/relay/inactive", + "x": 90 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/relay/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/relay/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/relay/inactive", + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/relay/inactive", + "x": -90, + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/relay/inactive", + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/relay/yellow", + "x": 90 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/relay/yellow", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/relay/yellow" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/relay/yellow", + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/relay/yellow", + "x": -90, + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/relay/yellow", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json new file mode 100644 index 000000000..1d58ec9cc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_security_manager.json @@ -0,0 +1,34 @@ +{ + "variants": { + "active=false,direction=east": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/security_manager/inactive" + }, + "active=false,direction=south": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/security_manager/inactive", + "y": 270 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/security_manager/yellow", + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/security_manager/yellow" + }, + "active=true,direction=south": { + "model": "refinedstorage:block/security_manager/yellow", + "y": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/security_manager/yellow", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json new file mode 100644 index 000000000..6f984ad8c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_wireless_transmitter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/inactive" + }, + "active=false,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 270 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 180 + }, + "active=false,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/inactive", + "x": 90, + "y": 90 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/wireless_transmitter/yellow" + }, + "active=true,direction=east": { + "model": "refinedstorage:block/wireless_transmitter/yellow", + "x": 90, + "y": 270 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/wireless_transmitter/yellow", + "x": 90, + "y": 180 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/wireless_transmitter/yellow", + "x": 90 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/wireless_transmitter/yellow", + "x": 180 + }, + "active=true,direction=west": { + "model": "refinedstorage:block/wireless_transmitter/yellow", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/black.json new file mode 100644 index 000000000..c3ee58e14 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/black.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/black", + "particle": "refinedstorage:block/cable/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/blue.json new file mode 100644 index 000000000..90dd91b09 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/blue.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/blue", + "particle": "refinedstorage:block/cable/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/brown.json new file mode 100644 index 000000000..a2dba7d8c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/brown.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/brown", + "particle": "refinedstorage:block/cable/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/cyan.json new file mode 100644 index 000000000..5ed76e0ca --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/cyan.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/cyan", + "particle": "refinedstorage:block/cable/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/gray.json new file mode 100644 index 000000000..efcaa42a9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/gray.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/gray", + "particle": "refinedstorage:block/cable/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/green.json new file mode 100644 index 000000000..efa21da11 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/green.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/green", + "particle": "refinedstorage:block/cable/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_blue.json new file mode 100644 index 000000000..4d5578850 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_blue.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/light_blue", + "particle": "refinedstorage:block/cable/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_gray.json new file mode 100644 index 000000000..8b77b8e41 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/light_gray.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/light_gray", + "particle": "refinedstorage:block/cable/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/lime.json new file mode 100644 index 000000000..a38a9bf53 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/lime.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/lime", + "particle": "refinedstorage:block/cable/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/magenta.json new file mode 100644 index 000000000..5c24ba1f4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/magenta.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/magenta", + "particle": "refinedstorage:block/cable/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/orange.json new file mode 100644 index 000000000..532a46062 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/orange.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/orange", + "particle": "refinedstorage:block/cable/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/pink.json new file mode 100644 index 000000000..f57ce10a6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/pink.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/pink", + "particle": "refinedstorage:block/cable/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/purple.json new file mode 100644 index 000000000..909f9ffb4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/purple.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/purple", + "particle": "refinedstorage:block/cable/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/red.json new file mode 100644 index 000000000..850af2ee3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/red.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/red", + "particle": "refinedstorage:block/cable/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/white.json new file mode 100644 index 000000000..7dd370a9e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/white.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/white", + "particle": "refinedstorage:block/cable/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/yellow.json new file mode 100644 index 000000000..e99eca36b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/core/yellow.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/core/base", + "textures": { + "cable": "refinedstorage:block/cable/yellow", + "particle": "refinedstorage:block/cable/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/black.json new file mode 100644 index 000000000..742389455 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/black.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/black", + "particle": "refinedstorage:block/cable/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/blue.json new file mode 100644 index 000000000..af76b6096 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/blue.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/blue", + "particle": "refinedstorage:block/cable/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/brown.json new file mode 100644 index 000000000..eb0816bf6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/brown.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/brown", + "particle": "refinedstorage:block/cable/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/cyan.json new file mode 100644 index 000000000..eb1c7023f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/cyan.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/cyan", + "particle": "refinedstorage:block/cable/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/gray.json new file mode 100644 index 000000000..c6d5f9faf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/gray.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/gray", + "particle": "refinedstorage:block/cable/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/green.json new file mode 100644 index 000000000..91a555548 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/green.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/green", + "particle": "refinedstorage:block/cable/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_blue.json new file mode 100644 index 000000000..3feb92338 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_blue.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/light_blue", + "particle": "refinedstorage:block/cable/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_gray.json new file mode 100644 index 000000000..ed6f21372 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/light_gray.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/light_gray", + "particle": "refinedstorage:block/cable/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/lime.json new file mode 100644 index 000000000..4acb9d514 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/lime.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/lime", + "particle": "refinedstorage:block/cable/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/magenta.json new file mode 100644 index 000000000..8091dd5c3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/magenta.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/magenta", + "particle": "refinedstorage:block/cable/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/orange.json new file mode 100644 index 000000000..d5bbe0c13 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/orange.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/orange", + "particle": "refinedstorage:block/cable/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/pink.json new file mode 100644 index 000000000..b41e380c7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/pink.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/pink", + "particle": "refinedstorage:block/cable/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/purple.json new file mode 100644 index 000000000..bdc13c758 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/purple.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/purple", + "particle": "refinedstorage:block/cable/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/red.json new file mode 100644 index 000000000..2c7f202e0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/red.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/red", + "particle": "refinedstorage:block/cable/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/white.json new file mode 100644 index 000000000..53604b2f3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/white.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/white", + "particle": "refinedstorage:block/cable/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/yellow.json new file mode 100644 index 000000000..136ea0a76 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/cable/extension/yellow.json @@ -0,0 +1,7 @@ +{ + "parent": "refinedstorage:block/cable/extension/base", + "textures": { + "cable": "refinedstorage:block/cable/yellow", + "particle": "refinedstorage:block/cable/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/black.json new file mode 100644 index 000000000..187f320a8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/black.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/black", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json new file mode 100644 index 000000000..a0e11586e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/blue.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/blue", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json new file mode 100644 index 000000000..29a58ccb7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/brown.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/brown", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json new file mode 100644 index 000000000..d6ce6015f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/cyan.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/cyan", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json new file mode 100644 index 000000000..bcdc05c64 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/gray.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/gray", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/green.json new file mode 100644 index 000000000..f70826d5a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/green.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/green", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json new file mode 100644 index 000000000..c58a511b0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_blue.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/light_blue", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json new file mode 100644 index 000000000..bf106add3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/light_gray.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/light_gray", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json new file mode 100644 index 000000000..1f82150c1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/lime.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/lime", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json new file mode 100644 index 000000000..d1940cc4a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/magenta.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/magenta", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json new file mode 100644 index 000000000..4732239d5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/orange.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/orange", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json new file mode 100644 index 000000000..709d768a0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/pink.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/pink", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json new file mode 100644 index 000000000..223030429 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/purple.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/purple", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/red.json new file mode 100644 index 000000000..496e26c24 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/red.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/red", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/white.json new file mode 100644 index 000000000..cdce06a67 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/white.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/white", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json new file mode 100644 index 000000000..0f664e898 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/controller/yellow.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/controller/on", + "cutout": "refinedstorage:block/controller/cutouts/yellow", + "particle": "refinedstorage:block/controller/off" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json new file mode 100644 index 000000000..1bea959c7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/black.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/black", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json new file mode 100644 index 000000000..d8c9cd6de --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/blue.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json new file mode 100644 index 000000000..db789f3fe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/brown.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/brown", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json new file mode 100644 index 000000000..eb14e01e7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/cyan.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/cyan", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json new file mode 100644 index 000000000..0c47613a4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/gray.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json new file mode 100644 index 000000000..27308af53 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/green.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/green", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/inactive.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/inactive.json new file mode 100644 index 000000000..4c8c586ed --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/inactive.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/inactive", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json new file mode 100644 index 000000000..9cfc16532 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_blue.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/light_blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json new file mode 100644 index 000000000..e4d5a80a8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/light_gray.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/light_gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json new file mode 100644 index 000000000..f18d92d32 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/lime.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/lime", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json new file mode 100644 index 000000000..124ae82e7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/magenta.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/magenta", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json new file mode 100644 index 000000000..c4453517a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/orange.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/orange", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json new file mode 100644 index 000000000..3eb8b0f96 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/pink.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/pink", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json new file mode 100644 index 000000000..5f055cc99 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/purple.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/purple", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json new file mode 100644 index 000000000..ba654f0da --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/red.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/red", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json new file mode 100644 index 000000000..9d3afe222 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/white.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/white", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json new file mode 100644 index 000000000..b6f97d78b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/yellow.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/crafting_grid/cutouts/yellow", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/crafting_grid/right", + "north": "refinedstorage:block/crafting_grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/black.json new file mode 100644 index 000000000..e3502bad7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/black.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/blue.json new file mode 100644 index 000000000..e20cd40f7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/blue.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/brown.json new file mode 100644 index 000000000..11f1b39da --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/brown.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/cyan.json new file mode 100644 index 000000000..630aa2150 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/cyan.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/gray.json new file mode 100644 index 000000000..9beb8eaa9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/gray.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/green.json new file mode 100644 index 000000000..15b8b880e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/green.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_blue.json new file mode 100644 index 000000000..b974fcc45 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_blue.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_gray.json new file mode 100644 index 000000000..ac714a953 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/light_gray.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/lime.json new file mode 100644 index 000000000..01208ac8d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/lime.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/magenta.json new file mode 100644 index 000000000..dbd37f85b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/magenta.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/orange.json new file mode 100644 index 000000000..c21c21c68 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/orange.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/pink.json new file mode 100644 index 000000000..6954ec4b6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/pink.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/purple.json new file mode 100644 index 000000000..1be37d0f9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/purple.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/red.json new file mode 100644 index 000000000..2ab06fc8e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/red.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/white.json new file mode 100644 index 000000000..ff9dba5c9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/white.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/yellow.json new file mode 100644 index 000000000..bb3c10449 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/detector/yellow.json @@ -0,0 +1,10 @@ +{ + "parent": "refinedstorage:block/detector/powered", + "textures": { + "bottom": "refinedstorage:block/detector/bottom", + "particle": "refinedstorage:block/detector/side", + "side": "refinedstorage:block/detector/side", + "top": "refinedstorage:block/detector/top", + "torch": "refinedstorage:block/detector/cutouts/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_black.json new file mode 100644 index 000000000..87e9a8372 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_black.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/black", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_blue.json new file mode 100644 index 000000000..6200f920d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_blue.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_brown.json new file mode 100644 index 000000000..4a6552077 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_brown.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/brown", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_cyan.json new file mode 100644 index 000000000..07eb050c7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_cyan.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/cyan", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_gray.json new file mode 100644 index 000000000..ca0b6a71f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_gray.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_green.json new file mode 100644 index 000000000..43042d4d6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_green.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/green", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_blue.json new file mode 100644 index 000000000..17991420d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_blue.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/light_blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_gray.json new file mode 100644 index 000000000..173797917 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_light_gray.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/light_gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_lime.json new file mode 100644 index 000000000..a90348539 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_lime.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/lime", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_magenta.json new file mode 100644 index 000000000..cae9a5597 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_magenta.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/magenta", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_orange.json new file mode 100644 index 000000000..004fa99ee --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_orange.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/orange", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_pink.json new file mode 100644 index 000000000..67631727a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_pink.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/pink", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_purple.json new file mode 100644 index 000000000..ba61b9ab9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_purple.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/purple", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_red.json new file mode 100644 index 000000000..5539a6623 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_red.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/red", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_white.json new file mode 100644 index 000000000..0ad7f0701 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_white.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/white", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_yellow.json new file mode 100644 index 000000000..8d7cbaae3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/base_yellow.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/yellow", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/black.json new file mode 100644 index 000000000..47bcf93c9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/black.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:black_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/blue.json new file mode 100644 index 000000000..c4376dc8b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/blue.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:blue_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/brown.json new file mode 100644 index 000000000..3b4cc4011 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/brown.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:brown_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/cyan.json new file mode 100644 index 000000000..7744a3b75 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/cyan.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:cyan_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/gray.json new file mode 100644 index 000000000..36d8b1e02 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/gray.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:gray_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/green.json new file mode 100644 index 000000000..b6767a803 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/green.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:green_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/inactive.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/inactive.json new file mode 100644 index 000000000..bd471c3da --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/inactive.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/north_cutout", + "textures": { + "cutout": "refinedstorage:block/disk_interface/cutouts/inactive", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/disk_interface/right", + "north": "refinedstorage:block/disk_interface/front", + "particle": "refinedstorage:block/disk_interface/right", + "south": "refinedstorage:block/disk_interface/back", + "up": "refinedstorage:block/disk_interface/top", + "west": "refinedstorage:block/disk_interface/left" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_blue.json new file mode 100644 index 000000000..b77981d41 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_blue.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_gray.json new file mode 100644 index 000000000..2a93274c2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/light_gray.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:light_gray_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/lime.json new file mode 100644 index 000000000..efb6e86fa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/lime.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:lime_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/magenta.json new file mode 100644 index 000000000..8e013eb99 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/magenta.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:magenta_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/orange.json new file mode 100644 index 000000000..5b4861e4a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/orange.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:orange_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/pink.json new file mode 100644 index 000000000..cd6d82ca6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/pink.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:pink_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/purple.json new file mode 100644 index 000000000..c1f2a6350 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/purple.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:purple_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/red.json new file mode 100644 index 000000000..b379ab9dd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/red.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:red_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/white.json new file mode 100644 index 000000000..aa7be645d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/white.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:white_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/yellow.json new file mode 100644 index 000000000..3d5b3a3b1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/disk_interface/yellow.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:yellow_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/black.json new file mode 100644 index 000000000..69dae2830 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/black.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/black", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json new file mode 100644 index 000000000..ff24f0f3e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/blue.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json new file mode 100644 index 000000000..dc417cbc5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/brown.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/brown", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json new file mode 100644 index 000000000..157ee72b1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/cyan.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/cyan", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json new file mode 100644 index 000000000..e9875f0cb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/gray.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/green.json new file mode 100644 index 000000000..9d5df20e6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/green.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/green", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/inactive.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/inactive.json new file mode 100644 index 000000000..60997f3d0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/inactive.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/inactive", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json new file mode 100644 index 000000000..c95429e80 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_blue.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/light_blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json new file mode 100644 index 000000000..fdb6712d3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/light_gray.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/light_gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json new file mode 100644 index 000000000..596e3eaed --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/lime.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/lime", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json new file mode 100644 index 000000000..2655d7896 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/magenta.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/magenta", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json new file mode 100644 index 000000000..2cb5c8475 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/orange.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/orange", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json new file mode 100644 index 000000000..effbc69e3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/pink.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/pink", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json new file mode 100644 index 000000000..c612d7afe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/purple.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/purple", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/red.json new file mode 100644 index 000000000..e88d01d47 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/red.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/red", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/white.json new file mode 100644 index 000000000..3ecbcba3c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/white.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/white", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json new file mode 100644 index 000000000..956017200 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/grid/yellow.json @@ -0,0 +1,13 @@ +{ + "parent": "refinedstorage:block/emissive_north_cutout", + "textures": { + "cutout": "refinedstorage:block/grid/cutouts/yellow", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/grid/right", + "north": "refinedstorage:block/grid/front", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json new file mode 100644 index 000000000..dbe2f3b89 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/black.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/black", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json new file mode 100644 index 000000000..4195939f0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/blue.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/blue", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json new file mode 100644 index 000000000..ae06d441c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/brown.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/brown", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json new file mode 100644 index 000000000..a1bd58e82 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/cyan.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/cyan", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json new file mode 100644 index 000000000..dd8586d50 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/gray.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/gray", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json new file mode 100644 index 000000000..ed46b6572 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/green.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/green", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/inactive.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/inactive.json new file mode 100644 index 000000000..ce680a8c4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/inactive.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/inactive", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json new file mode 100644 index 000000000..371247f10 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_blue.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/light_blue", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json new file mode 100644 index 000000000..70dd20c3b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/light_gray.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/light_gray", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json new file mode 100644 index 000000000..9ea090c27 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/lime.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/lime", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json new file mode 100644 index 000000000..1d4cd36ea --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/magenta.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/magenta", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json new file mode 100644 index 000000000..aad946ce1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/orange.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/orange", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json new file mode 100644 index 000000000..a865e2a79 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/pink.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/pink", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json new file mode 100644 index 000000000..752672632 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/purple.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/purple", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json new file mode 100644 index 000000000..adb40d93b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/red.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/red", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json new file mode 100644 index 000000000..39607d066 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/white.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/white", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json new file mode 100644 index 000000000..33d6e5cf0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_receiver/yellow.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_receiver/base", + "cutout": "refinedstorage:block/network_receiver/cutouts/yellow", + "particle": "refinedstorage:block/network_receiver/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json new file mode 100644 index 000000000..b8bb0e56b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/black.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/black", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json new file mode 100644 index 000000000..e11cf10d1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/blue.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/blue", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json new file mode 100644 index 000000000..aee1afd5d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/brown.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/brown", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json new file mode 100644 index 000000000..f585110b2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/cyan.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/cyan", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/error.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/error.json new file mode 100644 index 000000000..662f64a91 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/error.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/error", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json new file mode 100644 index 000000000..c727741c3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/gray.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/gray", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json new file mode 100644 index 000000000..5635cbba3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/green.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/green", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/inactive.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/inactive.json new file mode 100644 index 000000000..42633f0de --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/inactive.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/inactive", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json new file mode 100644 index 000000000..60d69c651 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_blue.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/light_blue", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json new file mode 100644 index 000000000..b694f049a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/light_gray.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/light_gray", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json new file mode 100644 index 000000000..3757387fd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/lime.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/lime", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json new file mode 100644 index 000000000..d6412e07b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/magenta.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/magenta", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json new file mode 100644 index 000000000..33b6e3d9a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/orange.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/orange", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json new file mode 100644 index 000000000..b1f676c1e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/pink.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/pink", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json new file mode 100644 index 000000000..e150018ff --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/purple.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/purple", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json new file mode 100644 index 000000000..65f0883b6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/red.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/red", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json new file mode 100644 index 000000000..2f8100c6d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/white.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/white", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json new file mode 100644 index 000000000..dabd774fd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/yellow.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/emissive_all_cutout", + "textures": { + "all": "refinedstorage:block/network_transmitter/base", + "cutout": "refinedstorage:block/network_transmitter/cutouts/yellow", + "particle": "refinedstorage:block/network_transmitter/base" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/black.json new file mode 100644 index 000000000..011f507b4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/black.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/black", + "cutout_east": "refinedstorage:block/relay/cutouts/in/black", + "cutout_north": "refinedstorage:block/relay/cutouts/out/black", + "cutout_south": "refinedstorage:block/relay/cutouts/in/black", + "cutout_up": "refinedstorage:block/relay/cutouts/in/black", + "cutout_west": "refinedstorage:block/relay/cutouts/in/black", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json new file mode 100644 index 000000000..eecabd495 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/blue.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/blue", + "cutout_east": "refinedstorage:block/relay/cutouts/in/blue", + "cutout_north": "refinedstorage:block/relay/cutouts/out/blue", + "cutout_south": "refinedstorage:block/relay/cutouts/in/blue", + "cutout_up": "refinedstorage:block/relay/cutouts/in/blue", + "cutout_west": "refinedstorage:block/relay/cutouts/in/blue", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json new file mode 100644 index 000000000..983c3f5b9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/brown.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/brown", + "cutout_east": "refinedstorage:block/relay/cutouts/in/brown", + "cutout_north": "refinedstorage:block/relay/cutouts/out/brown", + "cutout_south": "refinedstorage:block/relay/cutouts/in/brown", + "cutout_up": "refinedstorage:block/relay/cutouts/in/brown", + "cutout_west": "refinedstorage:block/relay/cutouts/in/brown", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json new file mode 100644 index 000000000..85c868e28 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/cyan.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/cyan", + "cutout_east": "refinedstorage:block/relay/cutouts/in/cyan", + "cutout_north": "refinedstorage:block/relay/cutouts/out/cyan", + "cutout_south": "refinedstorage:block/relay/cutouts/in/cyan", + "cutout_up": "refinedstorage:block/relay/cutouts/in/cyan", + "cutout_west": "refinedstorage:block/relay/cutouts/in/cyan", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json new file mode 100644 index 000000000..fe93b3f3b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/gray.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/gray", + "cutout_east": "refinedstorage:block/relay/cutouts/in/gray", + "cutout_north": "refinedstorage:block/relay/cutouts/out/gray", + "cutout_south": "refinedstorage:block/relay/cutouts/in/gray", + "cutout_up": "refinedstorage:block/relay/cutouts/in/gray", + "cutout_west": "refinedstorage:block/relay/cutouts/in/gray", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/green.json new file mode 100644 index 000000000..46524689b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/green.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/green", + "cutout_east": "refinedstorage:block/relay/cutouts/in/green", + "cutout_north": "refinedstorage:block/relay/cutouts/out/green", + "cutout_south": "refinedstorage:block/relay/cutouts/in/green", + "cutout_up": "refinedstorage:block/relay/cutouts/in/green", + "cutout_west": "refinedstorage:block/relay/cutouts/in/green", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/inactive.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/inactive.json new file mode 100644 index 000000000..4daf687f1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/inactive.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/inactive", + "cutout_east": "refinedstorage:block/relay/cutouts/in/inactive", + "cutout_north": "refinedstorage:block/relay/cutouts/out/inactive", + "cutout_south": "refinedstorage:block/relay/cutouts/in/inactive", + "cutout_up": "refinedstorage:block/relay/cutouts/in/inactive", + "cutout_west": "refinedstorage:block/relay/cutouts/in/inactive", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json new file mode 100644 index 000000000..01c356d48 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_blue.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/light_blue", + "cutout_east": "refinedstorage:block/relay/cutouts/in/light_blue", + "cutout_north": "refinedstorage:block/relay/cutouts/out/light_blue", + "cutout_south": "refinedstorage:block/relay/cutouts/in/light_blue", + "cutout_up": "refinedstorage:block/relay/cutouts/in/light_blue", + "cutout_west": "refinedstorage:block/relay/cutouts/in/light_blue", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json new file mode 100644 index 000000000..36daab22d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/light_gray.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/light_gray", + "cutout_east": "refinedstorage:block/relay/cutouts/in/light_gray", + "cutout_north": "refinedstorage:block/relay/cutouts/out/light_gray", + "cutout_south": "refinedstorage:block/relay/cutouts/in/light_gray", + "cutout_up": "refinedstorage:block/relay/cutouts/in/light_gray", + "cutout_west": "refinedstorage:block/relay/cutouts/in/light_gray", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json new file mode 100644 index 000000000..7e8ec140e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/lime.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/lime", + "cutout_east": "refinedstorage:block/relay/cutouts/in/lime", + "cutout_north": "refinedstorage:block/relay/cutouts/out/lime", + "cutout_south": "refinedstorage:block/relay/cutouts/in/lime", + "cutout_up": "refinedstorage:block/relay/cutouts/in/lime", + "cutout_west": "refinedstorage:block/relay/cutouts/in/lime", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json new file mode 100644 index 000000000..93187bed9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/magenta.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/magenta", + "cutout_east": "refinedstorage:block/relay/cutouts/in/magenta", + "cutout_north": "refinedstorage:block/relay/cutouts/out/magenta", + "cutout_south": "refinedstorage:block/relay/cutouts/in/magenta", + "cutout_up": "refinedstorage:block/relay/cutouts/in/magenta", + "cutout_west": "refinedstorage:block/relay/cutouts/in/magenta", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json new file mode 100644 index 000000000..1b6cccdbd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/orange.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/orange", + "cutout_east": "refinedstorage:block/relay/cutouts/in/orange", + "cutout_north": "refinedstorage:block/relay/cutouts/out/orange", + "cutout_south": "refinedstorage:block/relay/cutouts/in/orange", + "cutout_up": "refinedstorage:block/relay/cutouts/in/orange", + "cutout_west": "refinedstorage:block/relay/cutouts/in/orange", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json new file mode 100644 index 000000000..4615ad86e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/pink.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/pink", + "cutout_east": "refinedstorage:block/relay/cutouts/in/pink", + "cutout_north": "refinedstorage:block/relay/cutouts/out/pink", + "cutout_south": "refinedstorage:block/relay/cutouts/in/pink", + "cutout_up": "refinedstorage:block/relay/cutouts/in/pink", + "cutout_west": "refinedstorage:block/relay/cutouts/in/pink", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json new file mode 100644 index 000000000..80b234616 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/purple.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/purple", + "cutout_east": "refinedstorage:block/relay/cutouts/in/purple", + "cutout_north": "refinedstorage:block/relay/cutouts/out/purple", + "cutout_south": "refinedstorage:block/relay/cutouts/in/purple", + "cutout_up": "refinedstorage:block/relay/cutouts/in/purple", + "cutout_west": "refinedstorage:block/relay/cutouts/in/purple", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/red.json new file mode 100644 index 000000000..5b2b65688 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/red.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/red", + "cutout_east": "refinedstorage:block/relay/cutouts/in/red", + "cutout_north": "refinedstorage:block/relay/cutouts/out/red", + "cutout_south": "refinedstorage:block/relay/cutouts/in/red", + "cutout_up": "refinedstorage:block/relay/cutouts/in/red", + "cutout_west": "refinedstorage:block/relay/cutouts/in/red", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/white.json new file mode 100644 index 000000000..24ddfe02b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/white.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/white", + "cutout_east": "refinedstorage:block/relay/cutouts/in/white", + "cutout_north": "refinedstorage:block/relay/cutouts/out/white", + "cutout_south": "refinedstorage:block/relay/cutouts/in/white", + "cutout_up": "refinedstorage:block/relay/cutouts/in/white", + "cutout_west": "refinedstorage:block/relay/cutouts/in/white", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json new file mode 100644 index 000000000..d83096f46 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/relay/yellow.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/relay/cutouts/in/yellow", + "cutout_east": "refinedstorage:block/relay/cutouts/in/yellow", + "cutout_north": "refinedstorage:block/relay/cutouts/out/yellow", + "cutout_south": "refinedstorage:block/relay/cutouts/in/yellow", + "cutout_up": "refinedstorage:block/relay/cutouts/in/yellow", + "cutout_west": "refinedstorage:block/relay/cutouts/in/yellow", + "down": "refinedstorage:block/relay/in", + "east": "refinedstorage:block/relay/in", + "north": "refinedstorage:block/relay/out", + "particle": "refinedstorage:block/relay/in", + "south": "refinedstorage:block/relay/in", + "up": "refinedstorage:block/relay/in", + "west": "refinedstorage:block/relay/in" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json new file mode 100644 index 000000000..80e160d29 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/black", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json new file mode 100644 index 000000000..78e86a1ad --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/blue", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json new file mode 100644 index 000000000..8cd7fa835 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/brown", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json new file mode 100644 index 000000000..ec9a26bdc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/cyan.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/cyan", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json new file mode 100644 index 000000000..b79503189 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/gray.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/gray", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json new file mode 100644 index 000000000..a8c6d22bb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/green.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/green", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/inactive.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/inactive.json new file mode 100644 index 000000000..9d88acc41 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/inactive.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/inactive", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/inactive", + "cutout_south": "refinedstorage:block/security_manager/cutouts/back/inactive", + "cutout_up": "refinedstorage:block/security_manager/cutouts/top/inactive", + "cutout_west": "refinedstorage:block/security_manager/cutouts/left/inactive", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/security_manager/right", + "north": "refinedstorage:block/security_manager/front", + "particle": "refinedstorage:block/security_manager/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json new file mode 100644 index 000000000..dba3ca672 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_blue.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/light_blue", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json new file mode 100644 index 000000000..961884b50 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/light_gray.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/light_gray", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json new file mode 100644 index 000000000..2d169eec4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/lime.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/lime", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json new file mode 100644 index 000000000..bd92610c2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/magenta.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/magenta", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json new file mode 100644 index 000000000..facebacfe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/orange.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/orange", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json new file mode 100644 index 000000000..1b5b4be0c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/pink.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/pink", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json new file mode 100644 index 000000000..41f70d9d7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/purple.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/purple", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json new file mode 100644 index 000000000..5d7cf7bc8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/red.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/red", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json new file mode 100644 index 000000000..ff8161470 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/white.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/white", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json new file mode 100644 index 000000000..b0ce171cc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/security_manager/yellow.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/security_manager/cutouts/right/yellow", + "cutout_north": "refinedstorage:block/security_manager/cutouts/front/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/back", + "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/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/black.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/black.json new file mode 100644 index 000000000..1b49416e2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/black.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/blue.json new file mode 100644 index 000000000..d49f046cd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/blue.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/brown.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/brown.json new file mode 100644 index 000000000..b04c5ec49 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/brown.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/cyan.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/cyan.json new file mode 100644 index 000000000..095cf1179 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/gray.json new file mode 100644 index 000000000..504acc360 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/gray.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/green.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/green.json new file mode 100644 index 000000000..0a8060b20 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/green.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_blue.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_blue.json new file mode 100644 index 000000000..be2928184 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_gray.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_gray.json new file mode 100644 index 000000000..6e75fc667 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/light_gray.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/lime.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/lime.json new file mode 100644 index 000000000..a271a57e4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/lime.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/magenta.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/magenta.json new file mode 100644 index 000000000..1bd5abffa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/magenta.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/orange.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/orange.json new file mode 100644 index 000000000..ed02db79c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/orange.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/pink.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/pink.json new file mode 100644 index 000000000..866850fe5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/pink.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/purple.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/purple.json new file mode 100644 index 000000000..10fda228d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/purple.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/red.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/red.json new file mode 100644 index 000000000..85378d0d8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/red.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/white.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/white.json new file mode 100644 index 000000000..890d58808 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/white.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/yellow.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/yellow.json new file mode 100644 index 000000000..4af235888 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/yellow.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/active", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_cable.json new file mode 100644 index 000000000..ce96a1ea5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_constructor.json new file mode 100644 index 000000000..5a667f478 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_controller.json new file mode 100644 index 000000000..71a5e3329 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/black", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_crafting_grid.json new file mode 100644 index 000000000..4c7a66270 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/black" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json new file mode 100644 index 000000000..cb9427193 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/black" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_destructor.json new file mode 100644 index 000000000..d4a17a659 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_detector.json new file mode 100644 index 000000000..14c6c812f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/black" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_disk_interface.json new file mode 100644 index 000000000..47bcf93c9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:black_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_exporter.json new file mode 100644 index 000000000..98f4cc6d8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_external_storage.json new file mode 100644 index 000000000..dee1f271b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_grid.json new file mode 100644 index 000000000..10d3c7824 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/black" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_importer.json new file mode 100644 index 000000000..c3a799d8f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_receiver.json new file mode 100644 index 000000000..fca1a0f6e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_transmitter.json new file mode 100644 index 000000000..d5d9f6f92 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_relay.json new file mode 100644 index 000000000..c83a2f3e5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/black" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_security_manager.json new file mode 100644 index 000000000..2461ba732 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/black" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_wireless_transmitter.json new file mode 100644 index 000000000..817d84784 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/black_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/black" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_cable.json new file mode 100644 index 000000000..becda8c7a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_constructor.json new file mode 100644 index 000000000..d71e1f3f3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json new file mode 100644 index 000000000..cd228763f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/blue", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafting_grid.json new file mode 100644 index 000000000..850afd33b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json new file mode 100644 index 000000000..bc76a6088 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_destructor.json new file mode 100644 index 000000000..fbe3de3ae --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_detector.json new file mode 100644 index 000000000..5c0fdec67 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_disk_interface.json new file mode 100644 index 000000000..c4376dc8b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:blue_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_exporter.json new file mode 100644 index 000000000..5d4f3a990 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_external_storage.json new file mode 100644 index 000000000..74f374472 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_grid.json new file mode 100644 index 000000000..591beeacc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_importer.json new file mode 100644 index 000000000..d19c64a11 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_receiver.json new file mode 100644 index 000000000..cf7b38034 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_transmitter.json new file mode 100644 index 000000000..b2489e1c4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_relay.json new file mode 100644 index 000000000..e43c3dc24 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_security_manager.json new file mode 100644 index 000000000..9c167fbce --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_wireless_transmitter.json new file mode 100644 index 000000000..59fe9b964 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/blue_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_cable.json new file mode 100644 index 000000000..01fa4059f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_constructor.json new file mode 100644 index 000000000..9a2d87e9a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json new file mode 100644 index 000000000..198bd7412 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/brown", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafting_grid.json new file mode 100644 index 000000000..373886de3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/brown" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json new file mode 100644 index 000000000..56cbbdfcd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/brown" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_destructor.json new file mode 100644 index 000000000..c1e34017a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_detector.json new file mode 100644 index 000000000..29d2b1f1b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/brown" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_disk_interface.json new file mode 100644 index 000000000..3b4cc4011 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:brown_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_exporter.json new file mode 100644 index 000000000..48436f48b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_external_storage.json new file mode 100644 index 000000000..eb0a024f4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_grid.json new file mode 100644 index 000000000..1555741a9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/brown" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_importer.json new file mode 100644 index 000000000..c3cde7677 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_receiver.json new file mode 100644 index 000000000..78bf6d9a5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_transmitter.json new file mode 100644 index 000000000..077c21c38 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_relay.json new file mode 100644 index 000000000..561c50579 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/brown" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_security_manager.json new file mode 100644 index 000000000..aafea8af6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/brown" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_wireless_transmitter.json new file mode 100644 index 000000000..a2f986830 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/brown_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/brown" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cable.json new file mode 100644 index 000000000..881f8fd4c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/constructor.json new file mode 100644 index 000000000..891cc82bd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/controller.json new file mode 100644 index 000000000..0a1278937 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/light_blue", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/crafting_grid.json new file mode 100644 index 000000000..3cb36833c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/light_blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json new file mode 100644 index 000000000..990f3923d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/light_blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_cable.json new file mode 100644 index 000000000..a4c00fb26 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_constructor.json new file mode 100644 index 000000000..b36e03a91 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json new file mode 100644 index 000000000..6aba1c7ea --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/cyan", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafting_grid.json new file mode 100644 index 000000000..8f474c06a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/cyan" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json new file mode 100644 index 000000000..47221fabc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/cyan" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_destructor.json new file mode 100644 index 000000000..d3c2abb58 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_detector.json new file mode 100644 index 000000000..3695c27b9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/cyan" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_disk_interface.json new file mode 100644 index 000000000..7744a3b75 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:cyan_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_exporter.json new file mode 100644 index 000000000..262968b84 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_external_storage.json new file mode 100644 index 000000000..1b69e38e5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_grid.json new file mode 100644 index 000000000..52a013952 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/cyan" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_importer.json new file mode 100644 index 000000000..1e10e86e4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_receiver.json new file mode 100644 index 000000000..387b8a0df --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_transmitter.json new file mode 100644 index 000000000..bad884ef0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_relay.json new file mode 100644 index 000000000..7887e980b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/cyan" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_security_manager.json new file mode 100644 index 000000000..6c6b74e59 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/cyan" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_wireless_transmitter.json new file mode 100644 index 000000000..10e3c18b5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/cyan_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/cyan" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/destructor.json new file mode 100644 index 000000000..3ded37d46 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/detector.json new file mode 100644 index 000000000..7518bfed4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/light_blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/disk_interface.json new file mode 100644 index 000000000..b77981d41 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/exporter.json new file mode 100644 index 000000000..1af07c0bb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/external_storage.json new file mode 100644 index 000000000..f7b13100d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json new file mode 100644 index 000000000..93dc8d0b0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/gray", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafting_grid.json new file mode 100644 index 000000000..434b1c1a1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json new file mode 100644 index 000000000..f88c49bf5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_detector.json new file mode 100644 index 000000000..955ebe926 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_disk_interface.json new file mode 100644 index 000000000..36d8b1e02 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:gray_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_grid.json new file mode 100644 index 000000000..cb0f0eb3f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_receiver.json new file mode 100644 index 000000000..57eaeae78 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_transmitter.json new file mode 100644 index 000000000..7e40175ae --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_relay.json new file mode 100644 index 000000000..5182ae03b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_security_manager.json new file mode 100644 index 000000000..63ef2a89c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_wireless_transmitter.json new file mode 100644 index 000000000..a4373232f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/gray_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_cable.json new file mode 100644 index 000000000..b149b6f51 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_constructor.json new file mode 100644 index 000000000..a2cf169a4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_controller.json new file mode 100644 index 000000000..c323c7204 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/green", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_crafting_grid.json new file mode 100644 index 000000000..feefe5c1f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/green" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json new file mode 100644 index 000000000..77e71dcaa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/green" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_destructor.json new file mode 100644 index 000000000..2b9909972 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_detector.json new file mode 100644 index 000000000..53d69c61e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/green" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_disk_interface.json new file mode 100644 index 000000000..b6767a803 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:green_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_exporter.json new file mode 100644 index 000000000..e1203053c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_external_storage.json new file mode 100644 index 000000000..07313f7b1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_grid.json new file mode 100644 index 000000000..dfb4e4c02 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/green" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_importer.json new file mode 100644 index 000000000..25f9556a1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_receiver.json new file mode 100644 index 000000000..bfd6abe21 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_transmitter.json new file mode 100644 index 000000000..8028a9492 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_relay.json new file mode 100644 index 000000000..bc87c45fc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/green" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_security_manager.json new file mode 100644 index 000000000..2e2cf43aa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/green" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_wireless_transmitter.json new file mode 100644 index 000000000..33fdbf4c5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/green_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/green" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/grid.json new file mode 100644 index 000000000..3cea56e59 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/light_blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/importer.json new file mode 100644 index 000000000..af1da5042 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_cable.json new file mode 100644 index 000000000..7f2d09eac --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_constructor.json new file mode 100644 index 000000000..de4ad8dc1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_destructor.json new file mode 100644 index 000000000..7f2ef447c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_exporter.json new file mode 100644 index 000000000..8b148b499 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_external_storage.json new file mode 100644 index 000000000..ee04745bf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_importer.json new file mode 100644 index 000000000..ed340b426 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_blue_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_cable.json new file mode 100644 index 000000000..ff3cecf8a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_constructor.json new file mode 100644 index 000000000..f353937d3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json new file mode 100644 index 000000000..6290639b0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/light_gray", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafting_grid.json new file mode 100644 index 000000000..f37ea7bed --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/light_gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json new file mode 100644 index 000000000..128f618ca --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/light_gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_destructor.json new file mode 100644 index 000000000..f269deefe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_detector.json new file mode 100644 index 000000000..641cc7f99 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/light_gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_disk_interface.json new file mode 100644 index 000000000..2a93274c2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:light_gray_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_exporter.json new file mode 100644 index 000000000..b0add85c4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_external_storage.json new file mode 100644 index 000000000..c72d9a066 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_grid.json new file mode 100644 index 000000000..d5a1ec2ea --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/light_gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_importer.json new file mode 100644 index 000000000..9d1916528 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_receiver.json new file mode 100644 index 000000000..2904de56c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_transmitter.json new file mode 100644 index 000000000..81d72525e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_relay.json new file mode 100644 index 000000000..0566c6591 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/light_gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_security_manager.json new file mode 100644 index 000000000..73bec21e8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/light_gray" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_wireless_transmitter.json new file mode 100644 index 000000000..e327fc5b0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/light_gray" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_cable.json new file mode 100644 index 000000000..e14af629d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_constructor.json new file mode 100644 index 000000000..22d5deed0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json new file mode 100644 index 000000000..804c8cc39 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/lime", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafting_grid.json new file mode 100644 index 000000000..602eed3c0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/lime" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json new file mode 100644 index 000000000..d795339fd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/lime" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_destructor.json new file mode 100644 index 000000000..225bf12cc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_detector.json new file mode 100644 index 000000000..f80ecda05 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/lime" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_disk_interface.json new file mode 100644 index 000000000..efb6e86fa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:lime_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_exporter.json new file mode 100644 index 000000000..6f1347f58 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_external_storage.json new file mode 100644 index 000000000..8e86bd34c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_grid.json new file mode 100644 index 000000000..a4af15d74 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/lime" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_importer.json new file mode 100644 index 000000000..c592b50cd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_receiver.json new file mode 100644 index 000000000..559f85959 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_transmitter.json new file mode 100644 index 000000000..3ca5c592b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_relay.json new file mode 100644 index 000000000..4995f2790 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/lime" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_security_manager.json new file mode 100644 index 000000000..d4302e628 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/lime" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_wireless_transmitter.json new file mode 100644 index 000000000..a3460086e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/lime_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/lime" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_cable.json new file mode 100644 index 000000000..3f9d5fd86 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_constructor.json new file mode 100644 index 000000000..75f101291 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json new file mode 100644 index 000000000..27afae2e2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/magenta", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafting_grid.json new file mode 100644 index 000000000..09da4fd08 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/magenta" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json new file mode 100644 index 000000000..6852bbc37 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/magenta" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_destructor.json new file mode 100644 index 000000000..bf4bd4793 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_detector.json new file mode 100644 index 000000000..b95caae09 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/magenta" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_disk_interface.json new file mode 100644 index 000000000..8e013eb99 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:magenta_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_exporter.json new file mode 100644 index 000000000..30cd139f4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_external_storage.json new file mode 100644 index 000000000..0fd1a2fbc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_grid.json new file mode 100644 index 000000000..ccf16da2a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/magenta" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_importer.json new file mode 100644 index 000000000..3bc635fa0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_receiver.json new file mode 100644 index 000000000..479b3307c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_transmitter.json new file mode 100644 index 000000000..cdf7d12ed --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_relay.json new file mode 100644 index 000000000..62c7289f7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/magenta" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_security_manager.json new file mode 100644 index 000000000..fd1c205e4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/magenta" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_wireless_transmitter.json new file mode 100644 index 000000000..ed96b4c25 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/magenta_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/magenta" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_receiver.json new file mode 100644 index 000000000..00852bad2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_transmitter.json new file mode 100644 index 000000000..496000af9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_cable.json new file mode 100644 index 000000000..fdac24489 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_constructor.json new file mode 100644 index 000000000..daf0ae0fc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json new file mode 100644 index 000000000..45550db85 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/orange", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafting_grid.json new file mode 100644 index 000000000..d736bd604 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/orange" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json new file mode 100644 index 000000000..61fc873b6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/orange" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_destructor.json new file mode 100644 index 000000000..54d7964ed --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_detector.json new file mode 100644 index 000000000..981fe9cd9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/orange" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_disk_interface.json new file mode 100644 index 000000000..5b4861e4a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:orange_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_exporter.json new file mode 100644 index 000000000..821b39924 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_external_storage.json new file mode 100644 index 000000000..d24dd2a4a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_grid.json new file mode 100644 index 000000000..e393e45cb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/orange" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_importer.json new file mode 100644 index 000000000..5c2143061 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_receiver.json new file mode 100644 index 000000000..d0ab605be --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_transmitter.json new file mode 100644 index 000000000..91ad8ebc8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_relay.json new file mode 100644 index 000000000..579dfe0d8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/orange" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_security_manager.json new file mode 100644 index 000000000..8f6158753 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/orange" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_wireless_transmitter.json new file mode 100644 index 000000000..b52b69db1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/orange_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/orange" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_cable.json new file mode 100644 index 000000000..64792d539 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_constructor.json new file mode 100644 index 000000000..756af9afe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json new file mode 100644 index 000000000..6ea5e57d6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/pink", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafting_grid.json new file mode 100644 index 000000000..fda3b0610 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/pink" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json new file mode 100644 index 000000000..920e54942 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/pink" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_destructor.json new file mode 100644 index 000000000..a47d8a9fc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_detector.json new file mode 100644 index 000000000..9928e6282 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/pink" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_disk_interface.json new file mode 100644 index 000000000..cd6d82ca6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:pink_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_exporter.json new file mode 100644 index 000000000..7a2868221 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_external_storage.json new file mode 100644 index 000000000..7d0b7024a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_grid.json new file mode 100644 index 000000000..30fd424ad --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/pink" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_importer.json new file mode 100644 index 000000000..366a87c2e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_receiver.json new file mode 100644 index 000000000..c47cf7e83 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_transmitter.json new file mode 100644 index 000000000..031f409b0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_relay.json new file mode 100644 index 000000000..4bbb16179 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/pink" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_security_manager.json new file mode 100644 index 000000000..cac6365ff --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/pink" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_wireless_transmitter.json new file mode 100644 index 000000000..08ce71ffa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/pink_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/pink" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_cable.json new file mode 100644 index 000000000..72224fd35 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_constructor.json new file mode 100644 index 000000000..9a6ad5010 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json new file mode 100644 index 000000000..12fc5e8e9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/purple", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafting_grid.json new file mode 100644 index 000000000..73f981509 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/purple" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json new file mode 100644 index 000000000..1316bea3d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/purple" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_destructor.json new file mode 100644 index 000000000..4a0e8e86e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_detector.json new file mode 100644 index 000000000..59c4484aa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/purple" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_disk_interface.json new file mode 100644 index 000000000..c1f2a6350 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:purple_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_exporter.json new file mode 100644 index 000000000..68af3f0ac --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_external_storage.json new file mode 100644 index 000000000..2aa13b42b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_grid.json new file mode 100644 index 000000000..767a528fc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/purple" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_importer.json new file mode 100644 index 000000000..f668976bb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_receiver.json new file mode 100644 index 000000000..a49112dc6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_transmitter.json new file mode 100644 index 000000000..4c8f20058 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_relay.json new file mode 100644 index 000000000..cc6f35751 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/purple" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_security_manager.json new file mode 100644 index 000000000..66dd7051e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/purple" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_wireless_transmitter.json new file mode 100644 index 000000000..8fb9784be --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/purple_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/purple" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_cable.json new file mode 100644 index 000000000..8a44a4817 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_constructor.json new file mode 100644 index 000000000..2c8b736c2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_controller.json new file mode 100644 index 000000000..beba052cc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/red", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_crafting_grid.json new file mode 100644 index 000000000..0dda2dccb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/red" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json new file mode 100644 index 000000000..eb572767f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/red" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_destructor.json new file mode 100644 index 000000000..896d1c4e1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_detector.json new file mode 100644 index 000000000..dd6e1a655 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/red" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_disk_interface.json new file mode 100644 index 000000000..b379ab9dd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:red_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_exporter.json new file mode 100644 index 000000000..f45f22e3d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_external_storage.json new file mode 100644 index 000000000..ef3f57f4b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_grid.json new file mode 100644 index 000000000..9804e5629 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/red" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_importer.json new file mode 100644 index 000000000..7bb2636cc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_receiver.json new file mode 100644 index 000000000..854ea4223 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_transmitter.json new file mode 100644 index 000000000..c5130965e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_relay.json new file mode 100644 index 000000000..eec5ad21d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/red" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_security_manager.json new file mode 100644 index 000000000..7e736cfca --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/red" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_wireless_transmitter.json new file mode 100644 index 000000000..46af8e787 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/red_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/red" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/relay.json new file mode 100644 index 000000000..f80bff15c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/light_blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/security_manager.json new file mode 100644 index 000000000..553c29bff --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/light_blue" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_cable.json new file mode 100644 index 000000000..ab10d7937 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_constructor.json new file mode 100644 index 000000000..1f898a193 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_controller.json new file mode 100644 index 000000000..26deaf85c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/white", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_crafting_grid.json new file mode 100644 index 000000000..3a5c5236f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/white" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json new file mode 100644 index 000000000..bb2593f05 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/white" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_destructor.json new file mode 100644 index 000000000..cd154ad42 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_detector.json new file mode 100644 index 000000000..603aac15b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/white" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_disk_interface.json new file mode 100644 index 000000000..aa7be645d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:white_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_exporter.json new file mode 100644 index 000000000..ddba84b9e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_external_storage.json new file mode 100644 index 000000000..b0f5b2dde --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_grid.json new file mode 100644 index 000000000..2dde828f0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/white" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_importer.json new file mode 100644 index 000000000..19761b821 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_receiver.json new file mode 100644 index 000000000..44918d495 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_transmitter.json new file mode 100644 index 000000000..387709872 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_relay.json new file mode 100644 index 000000000..ab7a79c71 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/white" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_security_manager.json new file mode 100644 index 000000000..4217f6984 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/white" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_wireless_transmitter.json new file mode 100644 index 000000000..0b6fcffa0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/white_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/white" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/wireless_transmitter.json new file mode 100644 index 000000000..3fe08d2c1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/light_blue" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_cable.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_cable.json new file mode 100644 index 000000000..62079712c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_cable.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/cable/base", + "textures": { + "cable": "refinedstorage:block/cable/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_constructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_constructor.json new file mode 100644 index 000000000..fcee028e7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_constructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/constructor/base", + "textures": { + "cable": "refinedstorage:block/cable/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json new file mode 100644 index 000000000..36d657554 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json @@ -0,0 +1,29 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:stored_in_controller": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:stored_in_controller": 0.01 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:stored_in_controller": 0.3 + } + }, + { + "model": "refinedstorage:block/controller/yellow", + "predicate": { + "refinedstorage:stored_in_controller": 0.4 + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafting_grid.json new file mode 100644 index 000000000..3b735a601 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafting_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/crafting_grid/yellow" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json new file mode 100644 index 000000000..7821d06ec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/controller/yellow" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_destructor.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_destructor.json new file mode 100644 index 000000000..2ba0132b7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_destructor.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/destructor/base", + "textures": { + "cable": "refinedstorage:block/cable/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_detector.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_detector.json new file mode 100644 index 000000000..1444e5dfb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/detector/yellow" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_disk_interface.json new file mode 100644 index 000000000..3d5b3a3b1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_disk_interface.json @@ -0,0 +1,3 @@ +{ + "loader": "refinedstorage:yellow_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_exporter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_exporter.json new file mode 100644 index 000000000..f179ca180 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_exporter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/exporter/base", + "textures": { + "cable": "refinedstorage:block/cable/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_external_storage.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_external_storage.json new file mode 100644 index 000000000..425ad7d39 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_external_storage.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/external_storage/base", + "textures": { + "cable": "refinedstorage:block/cable/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_grid.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_grid.json new file mode 100644 index 000000000..eb556abd9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/grid/yellow" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_importer.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_importer.json new file mode 100644 index 000000000..1a4023ae5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_importer.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:item/importer/base", + "textures": { + "cable": "refinedstorage:block/cable/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_receiver.json new file mode 100644 index 000000000..3874deca3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_receiver.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_receiver/inactive", + "textures": { + "cutout": "refinedstorage:block/network_receiver/cutouts/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_transmitter.json new file mode 100644 index 000000000..979fd4394 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_network_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/network_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/network_transmitter/cutouts/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_relay.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_relay.json new file mode 100644 index 000000000..d178b571d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_relay.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/relay/yellow" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_security_manager.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_security_manager.json new file mode 100644 index 000000000..940cf1a9c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_security_manager.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/security_manager/yellow" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_wireless_transmitter.json new file mode 100644 index 000000000..9671f807d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/assets/refinedstorage/models/item/yellow_wireless_transmitter.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/wireless_transmitter/inactive", + "textures": { + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/yellow" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_cable.json new file mode 100644 index 000000000..0e5275bc7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_constructor.json new file mode 100644 index 000000000..315012175 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_controller.json new file mode 100644 index 000000000..9127aefd7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafting_grid.json new file mode 100644 index 000000000..746522bc2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_destructor.json new file mode 100644 index 000000000..21231112f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_detector.json new file mode 100644 index 000000000..5f4e877f5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_disk_interface.json new file mode 100644 index 000000000..57d6eede0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_exporter.json new file mode 100644 index 000000000..1f36df89c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_external_storage.json new file mode 100644 index 000000000..6e4a5a627 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_grid.json new file mode 100644 index 000000000..2b17747d4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_importer.json new file mode 100644 index 000000000..9c8bfa8bb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_receiver.json new file mode 100644 index 000000000..470c64d1f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_transmitter.json new file mode 100644 index 000000000..b0326fbb0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_relay.json new file mode 100644 index 000000000..73ff1e21d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_security_manager.json new file mode 100644 index 000000000..5700c3a2e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_wireless_transmitter.json new file mode 100644 index 000000000..a868f3ba2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_cable.json new file mode 100644 index 000000000..228ba079a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_constructor.json new file mode 100644 index 000000000..f5f021f2c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_controller.json new file mode 100644 index 000000000..42a982d2f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafting_grid.json new file mode 100644 index 000000000..bf3ff788d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_destructor.json new file mode 100644 index 000000000..11057121f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_detector.json new file mode 100644 index 000000000..772fab37e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_disk_interface.json new file mode 100644 index 000000000..3f0ac883f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_exporter.json new file mode 100644 index 000000000..d989ab572 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_external_storage.json new file mode 100644 index 000000000..81068e70a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_grid.json new file mode 100644 index 000000000..966322760 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_importer.json new file mode 100644 index 000000000..c8c3c7941 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_receiver.json new file mode 100644 index 000000000..ff651f5b0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_transmitter.json new file mode 100644 index 000000000..2f6c8a3b5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_relay.json new file mode 100644 index 000000000..b5ad8c38a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_security_manager.json new file mode 100644 index 000000000..83861b5a0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_wireless_transmitter.json new file mode 100644 index 000000000..c00324a00 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/blue_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/blue_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_cable.json new file mode 100644 index 000000000..082faa555 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_constructor.json new file mode 100644 index 000000000..8cfc608f5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_controller.json new file mode 100644 index 000000000..6916e658d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafting_grid.json new file mode 100644 index 000000000..4d03fb4b0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_destructor.json new file mode 100644 index 000000000..ef4bbd6dd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_detector.json new file mode 100644 index 000000000..a9cc5b228 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_disk_interface.json new file mode 100644 index 000000000..7bb2a77e3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_exporter.json new file mode 100644 index 000000000..befa264b3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_external_storage.json new file mode 100644 index 000000000..61bcc521b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_grid.json new file mode 100644 index 000000000..c82161afd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_importer.json new file mode 100644 index 000000000..0f2fda82a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_receiver.json new file mode 100644 index 000000000..608743d16 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_transmitter.json new file mode 100644 index 000000000..b8e802958 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_relay.json new file mode 100644 index 000000000..0d482e672 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_security_manager.json new file mode 100644 index 000000000..45dbdb3a4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_wireless_transmitter.json new file mode 100644 index 000000000..9cc91ec96 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_cable.json new file mode 100644 index 000000000..d22b956ed --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_constructor.json new file mode 100644 index 000000000..b81529b80 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_controller.json new file mode 100644 index 000000000..7037d653d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafting_grid.json new file mode 100644 index 000000000..5b79b9104 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_destructor.json new file mode 100644 index 000000000..0c9109543 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_detector.json new file mode 100644 index 000000000..8e4476726 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_disk_interface.json new file mode 100644 index 000000000..a8aa862a4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_exporter.json new file mode 100644 index 000000000..776dfe157 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_external_storage.json new file mode 100644 index 000000000..78428b14e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_grid.json new file mode 100644 index 000000000..31941b67a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_importer.json new file mode 100644 index 000000000..08393be77 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_receiver.json new file mode 100644 index 000000000..40ddd4bc4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_transmitter.json new file mode 100644 index 000000000..793e83729 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_relay.json new file mode 100644 index 000000000..bf95a119e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_security_manager.json new file mode 100644 index 000000000..1f49d6c5e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json new file mode 100644 index 000000000..1a8932eca --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/cyan_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/cyan_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_cable.json new file mode 100644 index 000000000..9cea2ab01 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_constructor.json new file mode 100644 index 000000000..99c957b11 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_controller.json new file mode 100644 index 000000000..355a787a3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafting_grid.json new file mode 100644 index 000000000..d4ab49d1a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_destructor.json new file mode 100644 index 000000000..61906159c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_detector.json new file mode 100644 index 000000000..7bfd38b4a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_disk_interface.json new file mode 100644 index 000000000..26d1c43df --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_exporter.json new file mode 100644 index 000000000..6d99ab483 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_external_storage.json new file mode 100644 index 000000000..c36dd5622 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_grid.json new file mode 100644 index 000000000..49d660805 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_importer.json new file mode 100644 index 000000000..0e4e76ca2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_receiver.json new file mode 100644 index 000000000..dfa19d773 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_transmitter.json new file mode 100644 index 000000000..e5945309a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_relay.json new file mode 100644 index 000000000..2927d6da2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_security_manager.json new file mode 100644 index 000000000..9684b7478 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_wireless_transmitter.json new file mode 100644 index 000000000..16be20f07 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/gray_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/gray_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_cable.json new file mode 100644 index 000000000..af58dbca9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_constructor.json new file mode 100644 index 000000000..9e292d1bd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_controller.json new file mode 100644 index 000000000..486e92399 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafting_grid.json new file mode 100644 index 000000000..c9bd9814d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_destructor.json new file mode 100644 index 000000000..c3641cdaf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_detector.json new file mode 100644 index 000000000..ec4127f55 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_disk_interface.json new file mode 100644 index 000000000..05069ca3b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_exporter.json new file mode 100644 index 000000000..939fb41c1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_external_storage.json new file mode 100644 index 000000000..d8b637433 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_grid.json new file mode 100644 index 000000000..b820a1f88 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_importer.json new file mode 100644 index 000000000..bf69062b6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_receiver.json new file mode 100644 index 000000000..f09384fb5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_transmitter.json new file mode 100644 index 000000000..fdeb7c940 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_relay.json new file mode 100644 index 000000000..c3b8bc93d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_security_manager.json new file mode 100644 index 000000000..11cb8671d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_wireless_transmitter.json new file mode 100644 index 000000000..d7f93ee3d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_cable.json new file mode 100644 index 000000000..12f9f8d9b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_constructor.json new file mode 100644 index 000000000..29e753024 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_controller.json new file mode 100644 index 000000000..6b015e628 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafting_grid.json new file mode 100644 index 000000000..bdf78be97 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_destructor.json new file mode 100644 index 000000000..d848fa094 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_detector.json new file mode 100644 index 000000000..a20936991 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_disk_interface.json new file mode 100644 index 000000000..367077f40 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_exporter.json new file mode 100644 index 000000000..76f9f65ec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_external_storage.json new file mode 100644 index 000000000..60b437163 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_grid.json new file mode 100644 index 000000000..18dfe9df9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_importer.json new file mode 100644 index 000000000..8d1f2c375 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_receiver.json new file mode 100644 index 000000000..863c5117f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_transmitter.json new file mode 100644 index 000000000..309279a32 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_relay.json new file mode 100644 index 000000000..9cab4e048 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_security_manager.json new file mode 100644 index 000000000..cef9744d6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json new file mode 100644 index 000000000..5628f79f7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_cable.json new file mode 100644 index 000000000..0a8fe9445 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_constructor.json new file mode 100644 index 000000000..61cfce7fb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_controller.json new file mode 100644 index 000000000..5c2f84802 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafting_grid.json new file mode 100644 index 000000000..42025b675 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_destructor.json new file mode 100644 index 000000000..c806e3850 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_detector.json new file mode 100644 index 000000000..7d9adf5be --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_disk_interface.json new file mode 100644 index 000000000..adbf71979 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_exporter.json new file mode 100644 index 000000000..c0ba6490c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_external_storage.json new file mode 100644 index 000000000..6bd09288b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_grid.json new file mode 100644 index 000000000..cd3106f83 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_importer.json new file mode 100644 index 000000000..5c85b1ec8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_receiver.json new file mode 100644 index 000000000..a2ae34bf4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_transmitter.json new file mode 100644 index 000000000..5345cf554 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_relay.json new file mode 100644 index 000000000..d352aa494 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_security_manager.json new file mode 100644 index 000000000..033148063 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json new file mode 100644 index 000000000..16e52c24e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_cable.json new file mode 100644 index 000000000..8b0530768 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_constructor.json new file mode 100644 index 000000000..d0800f969 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_controller.json new file mode 100644 index 000000000..a6726af82 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafting_grid.json new file mode 100644 index 000000000..b83821fd2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_destructor.json new file mode 100644 index 000000000..9f162866f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_detector.json new file mode 100644 index 000000000..07ef4989d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_disk_interface.json new file mode 100644 index 000000000..4cf9fc9e5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_exporter.json new file mode 100644 index 000000000..87967b4a1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_external_storage.json new file mode 100644 index 000000000..90642f560 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_grid.json new file mode 100644 index 000000000..ccb929e7b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_importer.json new file mode 100644 index 000000000..ec4fcc6fc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_receiver.json new file mode 100644 index 000000000..15f253d9f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_transmitter.json new file mode 100644 index 000000000..1f053bbb0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_relay.json new file mode 100644 index 000000000..1027b1e13 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_security_manager.json new file mode 100644 index 000000000..c83fb03e9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_wireless_transmitter.json new file mode 100644 index 000000000..924643324 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_cable.json new file mode 100644 index 000000000..54aa1bdd4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_constructor.json new file mode 100644 index 000000000..8a53efef4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_controller.json new file mode 100644 index 000000000..bd5807994 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafting_grid.json new file mode 100644 index 000000000..788ede166 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_destructor.json new file mode 100644 index 000000000..1daebd733 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_detector.json new file mode 100644 index 000000000..7e7caab89 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_disk_interface.json new file mode 100644 index 000000000..7b5f58d5a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_exporter.json new file mode 100644 index 000000000..5b56ba820 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_external_storage.json new file mode 100644 index 000000000..0b6914f5b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_grid.json new file mode 100644 index 000000000..a02f44db3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_importer.json new file mode 100644 index 000000000..3c3f9d19b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_receiver.json new file mode 100644 index 000000000..f6455c4d7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_transmitter.json new file mode 100644 index 000000000..b46fff0ab --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_relay.json new file mode 100644 index 000000000..8f4e6bbd7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_security_manager.json new file mode 100644 index 000000000..7abafbdb3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json new file mode 100644 index 000000000..bc2394b38 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_cable.json new file mode 100644 index 000000000..83ee8e788 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_constructor.json new file mode 100644 index 000000000..c904cd7b7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_controller.json new file mode 100644 index 000000000..59263e7aa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafting_grid.json new file mode 100644 index 000000000..7df882cec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_destructor.json new file mode 100644 index 000000000..c51a3a4ce --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_detector.json new file mode 100644 index 000000000..dd9905f6e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_disk_interface.json new file mode 100644 index 000000000..68ff415b1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_exporter.json new file mode 100644 index 000000000..d5fe0942a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_external_storage.json new file mode 100644 index 000000000..97beb6052 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_grid.json new file mode 100644 index 000000000..9f4e250ba --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_importer.json new file mode 100644 index 000000000..71dca9400 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_receiver.json new file mode 100644 index 000000000..09de3a0bd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_transmitter.json new file mode 100644 index 000000000..64fefba4f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_relay.json new file mode 100644 index 000000000..baf6b74ec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_security_manager.json new file mode 100644 index 000000000..adc1efa2a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_wireless_transmitter.json new file mode 100644 index 000000000..01928a846 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_cable.json new file mode 100644 index 000000000..b0903d4db --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_constructor.json new file mode 100644 index 000000000..8d73528a8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_controller.json new file mode 100644 index 000000000..15a82a245 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafting_grid.json new file mode 100644 index 000000000..2f915930b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_destructor.json new file mode 100644 index 000000000..62d33223a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_detector.json new file mode 100644 index 000000000..c9e30db34 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_disk_interface.json new file mode 100644 index 000000000..d3349bbdc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_exporter.json new file mode 100644 index 000000000..6dfb751ee --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_external_storage.json new file mode 100644 index 000000000..0427fb100 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_grid.json new file mode 100644 index 000000000..8be6c2e92 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_importer.json new file mode 100644 index 000000000..35efedf99 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_receiver.json new file mode 100644 index 000000000..e70753cca --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_transmitter.json new file mode 100644 index 000000000..9f2825c46 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_relay.json new file mode 100644 index 000000000..ac0366548 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_security_manager.json new file mode 100644 index 000000000..a69087c82 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_wireless_transmitter.json new file mode 100644 index 000000000..995582c74 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_cable.json new file mode 100644 index 000000000..dd43c70d4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_constructor.json new file mode 100644 index 000000000..e72077a14 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_controller.json new file mode 100644 index 000000000..2ae9265b4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafting_grid.json new file mode 100644 index 000000000..a8a868848 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_destructor.json new file mode 100644 index 000000000..9dbe6b4ec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_detector.json new file mode 100644 index 000000000..7666a6ec9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_disk_interface.json new file mode 100644 index 000000000..db4eaa3f2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_exporter.json new file mode 100644 index 000000000..c35a1e714 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_external_storage.json new file mode 100644 index 000000000..7ee8348e5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_grid.json new file mode 100644 index 000000000..7963e6cb1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_importer.json new file mode 100644 index 000000000..bc2c367a2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_receiver.json new file mode 100644 index 000000000..a2f1c0a3e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_transmitter.json new file mode 100644 index 000000000..24976866d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_relay.json new file mode 100644 index 000000000..ac0824f44 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_security_manager.json new file mode 100644 index 000000000..66021c4fa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_wireless_transmitter.json new file mode 100644 index 000000000..429fc6775 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_cable.json new file mode 100644 index 000000000..02c5e3834 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_constructor.json new file mode 100644 index 000000000..f50df9cee --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_controller.json new file mode 100644 index 000000000..e8feaf32e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafting_grid.json new file mode 100644 index 000000000..6aab29326 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_destructor.json new file mode 100644 index 000000000..beb7d1e9a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_detector.json new file mode 100644 index 000000000..b8fa57db5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_disk_interface.json new file mode 100644 index 000000000..fb987ca1c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_exporter.json new file mode 100644 index 000000000..a86a2714b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_external_storage.json new file mode 100644 index 000000000..60a450fac --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_grid.json new file mode 100644 index 000000000..a5d8c9c42 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_importer.json new file mode 100644 index 000000000..dd64c6241 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_receiver.json new file mode 100644 index 000000000..19e9349d7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_transmitter.json new file mode 100644 index 000000000..51ec7ddea --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_relay.json new file mode 100644 index 000000000..00adcd8f6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_security_manager.json new file mode 100644 index 000000000..987f3f331 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_wireless_transmitter.json new file mode 100644 index 000000000..7ad920ef7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/red_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/red_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_cable.json new file mode 100644 index 000000000..ca0190d62 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_constructor.json new file mode 100644 index 000000000..f5d1b04d3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_controller.json new file mode 100644 index 000000000..e13d8ddaf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafting_grid.json new file mode 100644 index 000000000..8cbb2ba66 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_destructor.json new file mode 100644 index 000000000..7ea7fd127 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_detector.json new file mode 100644 index 000000000..e789f9a45 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_disk_interface.json new file mode 100644 index 000000000..f268a6a41 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_exporter.json new file mode 100644 index 000000000..e376272f0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_external_storage.json new file mode 100644 index 000000000..758cbf6d9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_grid.json new file mode 100644 index 000000000..462993c6b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_importer.json new file mode 100644 index 000000000..a9bebfeaf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_receiver.json new file mode 100644 index 000000000..a04baa0a2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_transmitter.json new file mode 100644 index 000000000..2e5541de8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_relay.json new file mode 100644 index 000000000..ffc941e60 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_security_manager.json new file mode 100644 index 000000000..8ee8f7352 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_wireless_transmitter.json new file mode 100644 index 000000000..8a9e09ecf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_cable.json new file mode 100644 index 000000000..5eaff371f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_cable.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cables": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_cable" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cables" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_cable" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_constructor.json new file mode 100644 index 000000000..50470aa66 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_constructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_constructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_constructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_constructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_constructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_controller.json new file mode 100644 index 000000000..80b530616 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_controller.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_controllers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_controller" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_controllers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_controller" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafting_grid.json new file mode 100644 index 000000000..36953c2b5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafting_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_crafting_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crafting_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_crafting_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_destructor.json new file mode 100644 index 000000000..a0cb3b7df --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_destructor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_destructors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_destructor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_destructors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_destructor" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_detector.json new file mode 100644 index 000000000..7d1ba3795 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_detector.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_detectors": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_detector" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_detectors" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_detector" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_disk_interface.json new file mode 100644 index 000000000..4e601d292 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_disk_interface.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_disk_interfaces": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_disk_interface" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_disk_interfaces" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_disk_interface" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_exporter.json new file mode 100644 index 000000000..2358c29be --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_exporter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_exporters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_exporter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_exporters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_exporter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_external_storage.json new file mode 100644 index 000000000..774196664 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_external_storage.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_external_storages": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_external_storage" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_external_storages" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_external_storage" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_grid.json new file mode 100644 index 000000000..d1a7368e4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_grid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_grids": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_grid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_grids" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_grid" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_importer.json new file mode 100644 index 000000000..abf3ccafb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_importer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_importers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_importer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_importers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_importer" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_receiver.json new file mode 100644 index 000000000..59b1e9690 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_receiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_receivers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_receivers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_network_receiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_receivers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_network_receiver" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_transmitter.json new file mode 100644 index 000000000..165445491 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_network_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_network_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_network_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_network_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_network_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_relay.json new file mode 100644 index 000000000..cdfa52d87 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_relay.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_relays": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_relay" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_relays" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_relay" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_security_manager.json new file mode 100644 index 000000000..ecc0041c1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_security_manager.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_security_managers": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_security_manager" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_security_managers" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_security_manager" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json new file mode 100644 index 000000000..6aad49925 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_wireless_transmitter" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wireless_transmitters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wireless_transmitters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_wireless_transmitter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json new file mode 100644 index 000000000..648334b11 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json new file mode 100644 index 000000000..8be210c46 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json new file mode 100644 index 000000000..8123a56fc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json new file mode 100644 index 000000000..8f0b69498 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json new file mode 100644 index 000000000..5ec03bd97 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json new file mode 100644 index 000000000..a9a83086b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json new file mode 100644 index 000000000..52898b736 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json new file mode 100644 index 000000000..24c802142 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json new file mode 100644 index 000000000..e574c4fdd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json new file mode 100644 index 000000000..c4384836c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json new file mode 100644 index 000000000..a9ed752ae --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json new file mode 100644 index 000000000..8d07fbbd0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json new file mode 100644 index 000000000..defbf005a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json new file mode 100644 index 000000000..3933a7c36 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json new file mode 100644 index 000000000..a58ea2e45 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json new file mode 100644 index 000000000..64d2af459 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json new file mode 100644 index 000000000..56885102f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json new file mode 100644 index 000000000..1bb7d29e5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json new file mode 100644 index 000000000..12da65050 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json new file mode 100644 index 000000000..d274f5fd8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json new file mode 100644 index 000000000..0809791cb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json new file mode 100644 index 000000000..18a317a93 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json new file mode 100644 index 000000000..a44f903cf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_receiver.json new file mode 100644 index 000000000..217df93e6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_transmitter.json new file mode 100644 index 000000000..2cc41cc84 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_relay.json new file mode 100644 index 000000000..96b197d1b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_security_manager.json new file mode 100644 index 000000000..e75eaaab8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_wireless_transmitter.json new file mode 100644 index 000000000..984dcc955 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:blue_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/blue_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_cable.json new file mode 100644 index 000000000..8a0b39f6a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_constructor.json new file mode 100644 index 000000000..1ad80947f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_controller.json new file mode 100644 index 000000000..9eae82c39 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafting_grid.json new file mode 100644 index 000000000..428bae5fe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_creative_controller.json new file mode 100644 index 000000000..bd406e189 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_destructor.json new file mode 100644 index 000000000..208ca71b7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_detector.json new file mode 100644 index 000000000..c27e729d3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_disk_interface.json new file mode 100644 index 000000000..080a5f622 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_grid.json new file mode 100644 index 000000000..a4f3fdc25 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_receiver.json new file mode 100644 index 000000000..772cc7a3a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_transmitter.json new file mode 100644 index 000000000..1e2dc8f4e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_relay.json new file mode 100644 index 000000000..866982400 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_security_manager.json new file mode 100644 index 000000000..efaa86333 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_wireless_transmitter.json new file mode 100644 index 000000000..3312f0440 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cable.json new file mode 100644 index 000000000..f9956450f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/constructor.json new file mode 100644 index 000000000..04230b181 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/controller.json new file mode 100644 index 000000000..6316da1bd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafting_grid.json new file mode 100644 index 000000000..757bac51c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/creative_controller.json new file mode 100644 index 000000000..c76ba2f3a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_cable.json new file mode 100644 index 000000000..fd572122f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_constructor.json new file mode 100644 index 000000000..2a5f8ed8d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_controller.json new file mode 100644 index 000000000..efa1911f4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafting_grid.json new file mode 100644 index 000000000..e412b1d4d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_creative_controller.json new file mode 100644 index 000000000..c105f081c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_destructor.json new file mode 100644 index 000000000..9c36b7308 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_detector.json new file mode 100644 index 000000000..5f9ae121e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_disk_interface.json new file mode 100644 index 000000000..1ae5ce2ee --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_grid.json new file mode 100644 index 000000000..7954e6cf2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_receiver.json new file mode 100644 index 000000000..3731c0cfb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_transmitter.json new file mode 100644 index 000000000..f8126882b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_relay.json new file mode 100644 index 000000000..0bb33a77e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_security_manager.json new file mode 100644 index 000000000..ccd1d4309 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_wireless_transmitter.json new file mode 100644 index 000000000..d6e57fea8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:cyan_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/cyan_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/destructor.json new file mode 100644 index 000000000..5aefe9504 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/detector.json new file mode 100644 index 000000000..158f38e5e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/disk_interface.json new file mode 100644 index 000000000..05c0639bd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_controller.json new file mode 100644 index 000000000..a2e7791ea --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafting_grid.json new file mode 100644 index 000000000..30b2c0f42 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_creative_controller.json new file mode 100644 index 000000000..c09227605 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_detector.json new file mode 100644 index 000000000..91ad54b1f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_disk_interface.json new file mode 100644 index 000000000..8f2ae3499 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_grid.json new file mode 100644 index 000000000..6ee8c592e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_receiver.json new file mode 100644 index 000000000..ea905f0f9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_transmitter.json new file mode 100644 index 000000000..83b00cd87 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_relay.json new file mode 100644 index 000000000..635106c6a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_security_manager.json new file mode 100644 index 000000000..c48615268 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_wireless_transmitter.json new file mode 100644 index 000000000..244be7449 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_cable.json new file mode 100644 index 000000000..49a2b9a72 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_constructor.json new file mode 100644 index 000000000..75609629f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_controller.json new file mode 100644 index 000000000..c8463fe0a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafting_grid.json new file mode 100644 index 000000000..36d2e970e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_creative_controller.json new file mode 100644 index 000000000..ca4cdc980 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_destructor.json new file mode 100644 index 000000000..3adcf929a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_detector.json new file mode 100644 index 000000000..b0ce29372 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_disk_interface.json new file mode 100644 index 000000000..efda445ca --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_grid.json new file mode 100644 index 000000000..0c3640b49 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_receiver.json new file mode 100644 index 000000000..3396f152f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_transmitter.json new file mode 100644 index 000000000..aeb7ec831 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_relay.json new file mode 100644 index 000000000..effbee11b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_security_manager.json new file mode 100644 index 000000000..477a5def5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_wireless_transmitter.json new file mode 100644 index 000000000..facfa38a7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/grid.json new file mode 100644 index 000000000..1d872c7a7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_cable.json new file mode 100644 index 000000000..0bf3d6281 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_blue_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_blue_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_constructor.json new file mode 100644 index 000000000..6ee100f09 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_blue_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_blue_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_destructor.json new file mode 100644 index 000000000..bf974dec0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_blue_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_blue_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_blue_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_cable.json new file mode 100644 index 000000000..c02e7952f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_constructor.json new file mode 100644 index 000000000..1d8abc1d3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_controller.json new file mode 100644 index 000000000..73318448f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafting_grid.json new file mode 100644 index 000000000..e923a22c8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_creative_controller.json new file mode 100644 index 000000000..fed9b9a50 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_destructor.json new file mode 100644 index 000000000..b560cf89d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_detector.json new file mode 100644 index 000000000..d0ab4ca69 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_disk_interface.json new file mode 100644 index 000000000..36a02aace --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_grid.json new file mode 100644 index 000000000..dbdf999f9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_receiver.json new file mode 100644 index 000000000..2d160c49b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_transmitter.json new file mode 100644 index 000000000..c650f9b12 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_relay.json new file mode 100644 index 000000000..48a5e7f03 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_security_manager.json new file mode 100644 index 000000000..48e4e6b02 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_wireless_transmitter.json new file mode 100644 index 000000000..ddf3e5d0a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_cable.json new file mode 100644 index 000000000..9585b32c5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_constructor.json new file mode 100644 index 000000000..492673796 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_controller.json new file mode 100644 index 000000000..1a2782e67 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafting_grid.json new file mode 100644 index 000000000..57cc8b57c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_creative_controller.json new file mode 100644 index 000000000..fdd127086 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_destructor.json new file mode 100644 index 000000000..258475a29 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_detector.json new file mode 100644 index 000000000..b56c8ee45 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_disk_interface.json new file mode 100644 index 000000000..50029864d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_grid.json new file mode 100644 index 000000000..e3244476e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_receiver.json new file mode 100644 index 000000000..bb87854ee --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_transmitter.json new file mode 100644 index 000000000..98678ab6d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_relay.json new file mode 100644 index 000000000..23d4b416b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_security_manager.json new file mode 100644 index 000000000..5a276b206 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_wireless_transmitter.json new file mode 100644 index 000000000..7fa08e6be --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_cable.json new file mode 100644 index 000000000..4518d8e9c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_constructor.json new file mode 100644 index 000000000..b9f46f2f0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_controller.json new file mode 100644 index 000000000..220e8f226 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafting_grid.json new file mode 100644 index 000000000..213e7070f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_creative_controller.json new file mode 100644 index 000000000..3386023c0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_destructor.json new file mode 100644 index 000000000..1e14318b7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_detector.json new file mode 100644 index 000000000..75cbfb2df --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_disk_interface.json new file mode 100644 index 000000000..ea4c18868 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_grid.json new file mode 100644 index 000000000..a3b9967da --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_receiver.json new file mode 100644 index 000000000..20c7c3fc7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_transmitter.json new file mode 100644 index 000000000..519cc93c5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_relay.json new file mode 100644 index 000000000..9d5ae07c8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_security_manager.json new file mode 100644 index 000000000..e99c042f4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_wireless_transmitter.json new file mode 100644 index 000000000..98150a16a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_receiver.json new file mode 100644 index 000000000..a2b0583de --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_transmitter.json new file mode 100644 index 000000000..54bd2e7c4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_cable.json new file mode 100644 index 000000000..ec66f74f5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_constructor.json new file mode 100644 index 000000000..91775c6e6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_controller.json new file mode 100644 index 000000000..bb1c56a6a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafting_grid.json new file mode 100644 index 000000000..2d58ffded --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_creative_controller.json new file mode 100644 index 000000000..d3288c66e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_destructor.json new file mode 100644 index 000000000..3316fc948 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_detector.json new file mode 100644 index 000000000..f606197b6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_disk_interface.json new file mode 100644 index 000000000..d822a7f76 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_grid.json new file mode 100644 index 000000000..2f8450762 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_receiver.json new file mode 100644 index 000000000..06e007fd4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_transmitter.json new file mode 100644 index 000000000..66a257655 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_relay.json new file mode 100644 index 000000000..b39a4057a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_security_manager.json new file mode 100644 index 000000000..d38d3f6ae --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_wireless_transmitter.json new file mode 100644 index 000000000..45ebec51f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_cable.json new file mode 100644 index 000000000..b64de0634 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_constructor.json new file mode 100644 index 000000000..b13ff1611 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_controller.json new file mode 100644 index 000000000..cbbcd5491 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafting_grid.json new file mode 100644 index 000000000..56e94f59e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_creative_controller.json new file mode 100644 index 000000000..614cbbfa5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_destructor.json new file mode 100644 index 000000000..5372cc420 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_detector.json new file mode 100644 index 000000000..cc9ef919e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_disk_interface.json new file mode 100644 index 000000000..a4d9c7132 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_grid.json new file mode 100644 index 000000000..98a1a6cfe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_receiver.json new file mode 100644 index 000000000..524b6f77d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_transmitter.json new file mode 100644 index 000000000..adfe359a8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_relay.json new file mode 100644 index 000000000..f6287c8f7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_security_manager.json new file mode 100644 index 000000000..2b94afa0f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_wireless_transmitter.json new file mode 100644 index 000000000..732b922c0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_cable.json new file mode 100644 index 000000000..a60b36871 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_constructor.json new file mode 100644 index 000000000..cfd9ff8a3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_controller.json new file mode 100644 index 000000000..312380c02 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafting_grid.json new file mode 100644 index 000000000..3c43045fd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_creative_controller.json new file mode 100644 index 000000000..589ee2382 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_destructor.json new file mode 100644 index 000000000..73d247b5a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_detector.json new file mode 100644 index 000000000..4ddd7f527 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_disk_interface.json new file mode 100644 index 000000000..e84dbb325 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_grid.json new file mode 100644 index 000000000..b4682e83f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_receiver.json new file mode 100644 index 000000000..bec3c2667 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_transmitter.json new file mode 100644 index 000000000..482dfb63e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_relay.json new file mode 100644 index 000000000..6b816941d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_security_manager.json new file mode 100644 index 000000000..e15d8cbe6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_wireless_transmitter.json new file mode 100644 index 000000000..dc392f9d6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_cable.json new file mode 100644 index 000000000..1ccc97a34 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_constructor.json new file mode 100644 index 000000000..af687b3fd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_controller.json new file mode 100644 index 000000000..ef8ab7d65 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafting_grid.json new file mode 100644 index 000000000..89def9c61 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_creative_controller.json new file mode 100644 index 000000000..421a8ed51 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_destructor.json new file mode 100644 index 000000000..11226a220 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_detector.json new file mode 100644 index 000000000..56df24da6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_disk_interface.json new file mode 100644 index 000000000..926cb0bc3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_grid.json new file mode 100644 index 000000000..c65e393fe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_receiver.json new file mode 100644 index 000000000..5310dfc53 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_transmitter.json new file mode 100644 index 000000000..3355b6793 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_relay.json new file mode 100644 index 000000000..af0e1bf53 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_security_manager.json new file mode 100644 index 000000000..dd4ffddcb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_wireless_transmitter.json new file mode 100644 index 000000000..cb659bbb9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:red_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/red_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/relay.json new file mode 100644 index 000000000..2c727c13b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/security_manager.json new file mode 100644 index 000000000..af5ebe762 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_cable.json new file mode 100644 index 000000000..8a7f09c24 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_constructor.json new file mode 100644 index 000000000..dbe524878 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_controller.json new file mode 100644 index 000000000..56638f889 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafting_grid.json new file mode 100644 index 000000000..166c3a42b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_creative_controller.json new file mode 100644 index 000000000..e8168fbc1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_destructor.json new file mode 100644 index 000000000..806585694 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_detector.json new file mode 100644 index 000000000..44c0b1e6f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_disk_interface.json new file mode 100644 index 000000000..1a39b9de4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_grid.json new file mode 100644 index 000000000..61361a837 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_receiver.json new file mode 100644 index 000000000..101a7f9f5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_transmitter.json new file mode 100644 index 000000000..34a4aeee6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_relay.json new file mode 100644 index 000000000..d23e95892 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_security_manager.json new file mode 100644 index 000000000..889a472bf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_wireless_transmitter.json new file mode 100644 index 000000000..32a02bb65 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/wireless_transmitter.json new file mode 100644 index 000000000..968302c6f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_cable.json new file mode 100644 index 000000000..8f351c21d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_cable.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_cable" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_cable" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_constructor.json new file mode 100644 index 000000000..f91438fb8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_constructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_constructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_constructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_controller.json new file mode 100644 index 000000000..e4b17e966 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_controller.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "refinedstorage:energy" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafting_grid.json new file mode 100644 index 000000000..a42021818 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafting_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_crafting_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_crafting_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_creative_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_creative_controller.json new file mode 100644 index 000000000..b280fb198 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_creative_controller.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_creative_controller" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_creative_controller" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_destructor.json new file mode 100644 index 000000000..473874387 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_destructor.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_destructor" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_destructor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_detector.json new file mode 100644 index 000000000..4a969ba1e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_detector.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_detector" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_detector" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_disk_interface.json new file mode 100644 index 000000000..e67828299 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_disk_interface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_disk_interface" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_disk_interface" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_grid.json new file mode 100644 index 000000000..beea41b1d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_grid.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_grid" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_grid" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_receiver.json new file mode 100644 index 000000000..1587bc1e1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_receiver.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_network_receiver" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_network_receiver" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_transmitter.json new file mode 100644 index 000000000..62262ec75 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_network_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_network_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_network_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_relay.json new file mode 100644 index 000000000..ee66221db --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_relay.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_relay" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_relay" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_security_manager.json new file mode 100644 index 000000000..621bd69a4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_security_manager.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_security_manager" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_security_manager" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_wireless_transmitter.json new file mode 100644 index 000000000..7ba60d977 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_wireless_transmitter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_wireless_transmitter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_wireless_transmitter" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_cable.json new file mode 100644 index 000000000..fe6c33d40 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_constructor.json new file mode 100644 index 000000000..f4227f8e0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_controller.json new file mode 100644 index 000000000..8f307d29b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafting_grid.json new file mode 100644 index 000000000..950ec4bd6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_destructor.json new file mode 100644 index 000000000..a33019976 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_detector.json new file mode 100644 index 000000000..91615cb03 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_disk_interface.json new file mode 100644 index 000000000..530f49f77 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_exporter.json new file mode 100644 index 000000000..fd66d590b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_external_storage.json new file mode 100644 index 000000000..622018463 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_grid.json new file mode 100644 index 000000000..6d8a7d9a4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_importer.json new file mode 100644 index 000000000..dc68f43d7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_receiver.json new file mode 100644 index 000000000..3134337f3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_transmitter.json new file mode 100644 index 000000000..3acbdf370 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_relay.json new file mode 100644 index 000000000..7551e005f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_security_manager.json new file mode 100644 index 000000000..85bcea064 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_wireless_transmitter.json new file mode 100644 index 000000000..b6a146e2a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/black" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:black_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_cable.json new file mode 100644 index 000000000..9d5226d42 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_constructor.json new file mode 100644 index 000000000..7c6e82d73 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_controller.json new file mode 100644 index 000000000..5cff836db --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafting_grid.json new file mode 100644 index 000000000..ae2989f00 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_destructor.json new file mode 100644 index 000000000..3685b8957 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_detector.json new file mode 100644 index 000000000..23a137a4e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_disk_interface.json new file mode 100644 index 000000000..6729306b8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_exporter.json new file mode 100644 index 000000000..8a8705e98 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_external_storage.json new file mode 100644 index 000000000..7beb31462 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_grid.json new file mode 100644 index 000000000..0b3ada883 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_importer.json new file mode 100644 index 000000000..b5193bd3c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_receiver.json new file mode 100644 index 000000000..1a4f86c25 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_transmitter.json new file mode 100644 index 000000000..15722afb5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_relay.json new file mode 100644 index 000000000..3a472b83e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_security_manager.json new file mode 100644 index 000000000..821ffe3e2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_wireless_transmitter.json new file mode 100644 index 000000000..a1287eabe --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:blue_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_cable.json new file mode 100644 index 000000000..ee40fbb83 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_constructor.json new file mode 100644 index 000000000..d2042027a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_controller.json new file mode 100644 index 000000000..3a295c0eb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafting_grid.json new file mode 100644 index 000000000..32dfa9e95 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_destructor.json new file mode 100644 index 000000000..f0abf0ed7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_detector.json new file mode 100644 index 000000000..b3bb0086e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_disk_interface.json new file mode 100644 index 000000000..2720d27bb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_exporter.json new file mode 100644 index 000000000..95e6e41ff --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_external_storage.json new file mode 100644 index 000000000..5ef385536 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_grid.json new file mode 100644 index 000000000..4f158bcf9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_importer.json new file mode 100644 index 000000000..8235e520f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_receiver.json new file mode 100644 index 000000000..ebce51710 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_transmitter.json new file mode 100644 index 000000000..efdf26d59 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_relay.json new file mode 100644 index 000000000..912f60205 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_security_manager.json new file mode 100644 index 000000000..049d9d901 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_wireless_transmitter.json new file mode 100644 index 000000000..413698db6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/brown" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:brown_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_cable.json new file mode 100644 index 000000000..d1cdd2b5c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_constructor.json new file mode 100644 index 000000000..4a0e5e88c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_controller.json new file mode 100644 index 000000000..169169801 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafting_grid.json new file mode 100644 index 000000000..1ae71ceaf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_destructor.json new file mode 100644 index 000000000..386d63b12 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_detector.json new file mode 100644 index 000000000..0f9f8eecf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_disk_interface.json new file mode 100644 index 000000000..9257985e6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_exporter.json new file mode 100644 index 000000000..239258137 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_external_storage.json new file mode 100644 index 000000000..5b59fd942 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_grid.json new file mode 100644 index 000000000..faddab5c6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_importer.json new file mode 100644 index 000000000..67e7b501c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_receiver.json new file mode 100644 index 000000000..be7d66e7d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_transmitter.json new file mode 100644 index 000000000..9bf8011d0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_relay.json new file mode 100644 index 000000000..61db4919c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_security_manager.json new file mode 100644 index 000000000..d17843f7b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_wireless_transmitter.json new file mode 100644 index 000000000..7c8506231 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/cyan" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cyan_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_cable.json new file mode 100644 index 000000000..38009878a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_constructor.json new file mode 100644 index 000000000..77b1c05b2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_controller.json new file mode 100644 index 000000000..f65529c5e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafting_grid.json new file mode 100644 index 000000000..203ba2aeb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_destructor.json new file mode 100644 index 000000000..e60d38c55 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_detector.json new file mode 100644 index 000000000..0919d65fa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_disk_interface.json new file mode 100644 index 000000000..e3790dc8d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_exporter.json new file mode 100644 index 000000000..631648caa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_external_storage.json new file mode 100644 index 000000000..496b51880 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_grid.json new file mode 100644 index 000000000..8632c6dfd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_importer.json new file mode 100644 index 000000000..acec1d7ac --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_receiver.json new file mode 100644 index 000000000..69fbc198a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_transmitter.json new file mode 100644 index 000000000..3f1d338ef --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_relay.json new file mode 100644 index 000000000..f69097bac --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_security_manager.json new file mode 100644 index 000000000..c2720891a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_wireless_transmitter.json new file mode 100644 index 000000000..0e24b750f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:gray_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_cable.json new file mode 100644 index 000000000..fec6d4d23 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_constructor.json new file mode 100644 index 000000000..f32cc73d6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_controller.json new file mode 100644 index 000000000..654a0958f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafting_grid.json new file mode 100644 index 000000000..b55c95ba3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_destructor.json new file mode 100644 index 000000000..12a1ce517 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_detector.json new file mode 100644 index 000000000..995aa626a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_disk_interface.json new file mode 100644 index 000000000..d008b232a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_exporter.json new file mode 100644 index 000000000..fe04b418a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_external_storage.json new file mode 100644 index 000000000..dcf6aeb62 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_grid.json new file mode 100644 index 000000000..94cb81471 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_importer.json new file mode 100644 index 000000000..3f10ed2f6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_receiver.json new file mode 100644 index 000000000..39fdd1762 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_transmitter.json new file mode 100644 index 000000000..db823fa02 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_relay.json new file mode 100644 index 000000000..2898926ca --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_security_manager.json new file mode 100644 index 000000000..90b8c3838 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_wireless_transmitter.json new file mode 100644 index 000000000..59db82659 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/green" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:green_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_cable.json new file mode 100644 index 000000000..6f521a2fa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_blue_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_constructor.json new file mode 100644 index 000000000..5e62713df --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_blue_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_controller.json new file mode 100644 index 000000000..04ad0a5bb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafting_grid.json new file mode 100644 index 000000000..f91ba2e3d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_destructor.json new file mode 100644 index 000000000..9330102ed --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_blue_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_detector.json new file mode 100644 index 000000000..18b39d557 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_disk_interface.json new file mode 100644 index 000000000..cb353408c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_exporter.json new file mode 100644 index 000000000..3f88145ec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_blue_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_external_storage.json new file mode 100644 index 000000000..e4823b34e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_blue_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_grid.json new file mode 100644 index 000000000..8eaf39107 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_importer.json new file mode 100644 index 000000000..7cdd85ce2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_blue_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_receiver.json new file mode 100644 index 000000000..631baf767 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_transmitter.json new file mode 100644 index 000000000..2957577b6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_relay.json new file mode 100644 index 000000000..5b7c128a6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_security_manager.json new file mode 100644 index 000000000..f03a7ef14 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_wireless_transmitter.json new file mode 100644 index 000000000..40f44cd7b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/light_blue" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_cable.json new file mode 100644 index 000000000..f0b11d9e8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_constructor.json new file mode 100644 index 000000000..5bca579ce --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_controller.json new file mode 100644 index 000000000..be2e39ed7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafting_grid.json new file mode 100644 index 000000000..311096fc2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_destructor.json new file mode 100644 index 000000000..f895695b2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_detector.json new file mode 100644 index 000000000..f61892e9c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_disk_interface.json new file mode 100644 index 000000000..fbeb2291a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_exporter.json new file mode 100644 index 000000000..3d1ce0a1e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_external_storage.json new file mode 100644 index 000000000..f50e0d8f9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_grid.json new file mode 100644 index 000000000..801d875bf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_importer.json new file mode 100644 index 000000000..d517b86e6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_receiver.json new file mode 100644 index 000000000..c506dcc4d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_transmitter.json new file mode 100644 index 000000000..dedf78b2a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_relay.json new file mode 100644 index 000000000..a50a262b9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_security_manager.json new file mode 100644 index 000000000..1ebc26d66 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_wireless_transmitter.json new file mode 100644 index 000000000..286c56388 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/light_gray" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:light_gray_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_cable.json new file mode 100644 index 000000000..509a8e51b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_constructor.json new file mode 100644 index 000000000..2b45bfed3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_controller.json new file mode 100644 index 000000000..3efd99948 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafting_grid.json new file mode 100644 index 000000000..0931f0393 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_destructor.json new file mode 100644 index 000000000..ed75dcaf9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_detector.json new file mode 100644 index 000000000..006448bdb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_disk_interface.json new file mode 100644 index 000000000..ce7b0b6fa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_exporter.json new file mode 100644 index 000000000..355c561d6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_external_storage.json new file mode 100644 index 000000000..84f6052ea --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_grid.json new file mode 100644 index 000000000..eeaca05dd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_importer.json new file mode 100644 index 000000000..8647b0a30 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_receiver.json new file mode 100644 index 000000000..83465ea5b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_transmitter.json new file mode 100644 index 000000000..a8aac405e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_relay.json new file mode 100644 index 000000000..caff5038b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_security_manager.json new file mode 100644 index 000000000..e41f10c48 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_wireless_transmitter.json new file mode 100644 index 000000000..d37f001b4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/lime" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:lime_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_cable.json new file mode 100644 index 000000000..cba3236f7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_constructor.json new file mode 100644 index 000000000..246578830 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_controller.json new file mode 100644 index 000000000..37cb0772f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafting_grid.json new file mode 100644 index 000000000..afaf3a517 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_destructor.json new file mode 100644 index 000000000..682ef55a2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_detector.json new file mode 100644 index 000000000..dddff7634 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_disk_interface.json new file mode 100644 index 000000000..efdf6d7a4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_exporter.json new file mode 100644 index 000000000..b03229e43 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_external_storage.json new file mode 100644 index 000000000..69410d136 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_grid.json new file mode 100644 index 000000000..600d227d0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_importer.json new file mode 100644 index 000000000..995d32092 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_receiver.json new file mode 100644 index 000000000..713859e91 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_transmitter.json new file mode 100644 index 000000000..e911edf59 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_relay.json new file mode 100644 index 000000000..7305f491d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_security_manager.json new file mode 100644 index 000000000..1b45a2793 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_wireless_transmitter.json new file mode 100644 index 000000000..d32c6c8ff --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/magenta" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:magenta_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_cable.json new file mode 100644 index 000000000..afd80ebad --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_constructor.json new file mode 100644 index 000000000..cccf6e187 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_controller.json new file mode 100644 index 000000000..56ca3c435 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafting_grid.json new file mode 100644 index 000000000..b3620a114 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_destructor.json new file mode 100644 index 000000000..e9d2f0c42 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_detector.json new file mode 100644 index 000000000..5b7770556 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_disk_interface.json new file mode 100644 index 000000000..8c89b7f76 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_exporter.json new file mode 100644 index 000000000..f1f6a7438 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_external_storage.json new file mode 100644 index 000000000..9090e6db1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_grid.json new file mode 100644 index 000000000..4510ec857 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_importer.json new file mode 100644 index 000000000..c1b6b7ac9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_receiver.json new file mode 100644 index 000000000..b7aa4d758 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_transmitter.json new file mode 100644 index 000000000..bce9257e7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_relay.json new file mode 100644 index 000000000..30cec6ff7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_security_manager.json new file mode 100644 index 000000000..c76922f32 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_wireless_transmitter.json new file mode 100644 index 000000000..e36f9bcce --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/orange" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:orange_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_cable.json new file mode 100644 index 000000000..cd7c85838 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_constructor.json new file mode 100644 index 000000000..9a0d3599c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_controller.json new file mode 100644 index 000000000..0f44a044a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafting_grid.json new file mode 100644 index 000000000..80bc704a5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_destructor.json new file mode 100644 index 000000000..047936fd4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_detector.json new file mode 100644 index 000000000..fb5224966 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_disk_interface.json new file mode 100644 index 000000000..3092e1867 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_exporter.json new file mode 100644 index 000000000..868f3e2b2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_external_storage.json new file mode 100644 index 000000000..badda0f30 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_grid.json new file mode 100644 index 000000000..092fda008 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_importer.json new file mode 100644 index 000000000..f569a1915 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_receiver.json new file mode 100644 index 000000000..6b1fce0e2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_transmitter.json new file mode 100644 index 000000000..45037693c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_relay.json new file mode 100644 index 000000000..520fde85e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_security_manager.json new file mode 100644 index 000000000..2f077bfd0 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_wireless_transmitter.json new file mode 100644 index 000000000..60a6dbac2 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/pink" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:pink_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_cable.json new file mode 100644 index 000000000..b2d713622 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_constructor.json new file mode 100644 index 000000000..3ea65170f --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_controller.json new file mode 100644 index 000000000..df1c21099 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafting_grid.json new file mode 100644 index 000000000..e1a653ef9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_destructor.json new file mode 100644 index 000000000..38d0ad6d8 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_detector.json new file mode 100644 index 000000000..6cd4e2913 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_disk_interface.json new file mode 100644 index 000000000..74f5e3915 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_exporter.json new file mode 100644 index 000000000..811387c81 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_external_storage.json new file mode 100644 index 000000000..25bf2e588 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_grid.json new file mode 100644 index 000000000..e6bd167df --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_importer.json new file mode 100644 index 000000000..984b717f7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_receiver.json new file mode 100644 index 000000000..472de4ebc --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_transmitter.json new file mode 100644 index 000000000..7504278c6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_relay.json new file mode 100644 index 000000000..374aa6bff --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_security_manager.json new file mode 100644 index 000000000..c4b0279bd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_wireless_transmitter.json new file mode 100644 index 000000000..09f9f94f7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/purple" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:purple_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_cable.json new file mode 100644 index 000000000..5a82be84e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_constructor.json new file mode 100644 index 000000000..d9a565bab --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_controller.json new file mode 100644 index 000000000..2db9ee76a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafting_grid.json new file mode 100644 index 000000000..f347b4a7d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_destructor.json new file mode 100644 index 000000000..853d07f3c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_detector.json new file mode 100644 index 000000000..74dd4f669 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_disk_interface.json new file mode 100644 index 000000000..da87948c6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_exporter.json new file mode 100644 index 000000000..f68e210b3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_external_storage.json new file mode 100644 index 000000000..945fc6ef3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_grid.json new file mode 100644 index 000000000..270282fa5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_importer.json new file mode 100644 index 000000000..bded8503b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_receiver.json new file mode 100644 index 000000000..5c9750e39 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_transmitter.json new file mode 100644 index 000000000..7a7e6aaec --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_relay.json new file mode 100644 index 000000000..e90cec1d4 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_security_manager.json new file mode 100644 index 000000000..888cbdaf7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_wireless_transmitter.json new file mode 100644 index 000000000..dc66ddd10 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/red" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:red_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_cable.json new file mode 100644 index 000000000..0dfa72e95 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_constructor.json new file mode 100644 index 000000000..4c44977cd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_controller.json new file mode 100644 index 000000000..f277d705d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafting_grid.json new file mode 100644 index 000000000..475700391 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_destructor.json new file mode 100644 index 000000000..04fa14c56 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_detector.json new file mode 100644 index 000000000..c55ef06f5 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_disk_interface.json new file mode 100644 index 000000000..c287f3bb9 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_exporter.json new file mode 100644 index 000000000..ec2099473 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_external_storage.json new file mode 100644 index 000000000..f513b9c58 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_grid.json new file mode 100644 index 000000000..3fc6951b7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_importer.json new file mode 100644 index 000000000..30c6bfc9e --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_receiver.json new file mode 100644 index 000000000..e2bc94b87 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_transmitter.json new file mode 100644 index 000000000..8d86aa070 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_relay.json new file mode 100644 index 000000000..0be956e73 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_security_manager.json new file mode 100644 index 000000000..d404cd49b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_wireless_transmitter.json new file mode 100644 index 000000000..17cebd42a --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/white" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:white_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_cable.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_cable.json new file mode 100644 index 000000000..2e96c0954 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_cable.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:cables" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_cable" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_constructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_constructor.json new file mode 100644 index 000000000..addf2945d --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_constructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:constructors" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_controller.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_controller.json new file mode 100644 index 000000000..cdf592b79 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_controller.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:controllers" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_controller" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafting_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafting_grid.json new file mode 100644 index 000000000..12ca33299 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafting_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:crafting_grids" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_destructor.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_destructor.json new file mode 100644 index 000000000..c2057f2bf --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_destructor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:destructors" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_detector.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_detector.json new file mode 100644 index 000000000..c0396c782 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_detector.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:detectors" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_disk_interface.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_disk_interface.json new file mode 100644 index 000000000..bcbf3e8c6 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_disk_interface.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:disk_interfaces" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_exporter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_exporter.json new file mode 100644 index 000000000..fc05873c7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_exporter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:exporters" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_external_storage.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_external_storage.json new file mode 100644 index 000000000..be1eee534 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_external_storage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:external_storages" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_grid.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_grid.json new file mode 100644 index 000000000..5f425cd8b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_grid.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:grids" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_importer.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_importer.json new file mode 100644 index 000000000..8b6c9390c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_importer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:importers" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_receiver.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_receiver.json new file mode 100644 index 000000000..8d17678cb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_receiver.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_receivers" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_transmitter.json new file mode 100644 index 000000000..9308f1354 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_network_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:network_transmitters" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_relay.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_relay.json new file mode 100644 index 000000000..d1b9202a7 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_relay.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:relays" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_security_manager.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_security_manager.json new file mode 100644 index 000000000..4f1b0d9bb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_security_manager.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:security_managers" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_wireless_transmitter.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_wireless_transmitter.json new file mode 100644 index 000000000..919379f84 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_wireless_transmitter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "refinedstorage:wireless_transmitters" + }, + { + "tag": "c:dyes/yellow" + } + ], + "result": { + "count": 1, + "id": "refinedstorage:yellow_wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/cables.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/cables.json new file mode 100644 index 000000000..f2a2085cd --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/cables.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:cable", + "refinedstorage:light_gray_cable", + "refinedstorage:cyan_cable", + "refinedstorage:purple_cable", + "refinedstorage:blue_cable", + "refinedstorage:brown_cable", + "refinedstorage:green_cable", + "refinedstorage:red_cable", + "refinedstorage:black_cable", + "refinedstorage:white_cable", + "refinedstorage:orange_cable", + "refinedstorage:magenta_cable", + "refinedstorage:light_blue_cable", + "refinedstorage:yellow_cable", + "refinedstorage:lime_cable", + "refinedstorage:pink_cable" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/constructors.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/constructors.json new file mode 100644 index 000000000..acb900834 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/constructors.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_constructor", + "refinedstorage:orange_constructor", + "refinedstorage:magenta_constructor", + "refinedstorage:light_blue_constructor", + "refinedstorage:yellow_constructor", + "refinedstorage:lime_constructor", + "refinedstorage:pink_constructor", + "refinedstorage:constructor", + "refinedstorage:light_gray_constructor", + "refinedstorage:cyan_constructor", + "refinedstorage:purple_constructor", + "refinedstorage:blue_constructor", + "refinedstorage:brown_constructor", + "refinedstorage:green_constructor", + "refinedstorage:red_constructor", + "refinedstorage:black_constructor" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/controllers.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/controllers.json new file mode 100644 index 000000000..a0b54cda3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/controllers.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:controller", + "refinedstorage:yellow_controller", + "refinedstorage:lime_controller", + "refinedstorage:pink_controller", + "refinedstorage:gray_controller", + "refinedstorage:light_gray_controller", + "refinedstorage:cyan_controller", + "refinedstorage:purple_controller", + "refinedstorage:blue_controller", + "refinedstorage:brown_controller", + "refinedstorage:green_controller", + "refinedstorage:red_controller", + "refinedstorage:black_controller", + "refinedstorage:white_controller", + "refinedstorage:orange_controller", + "refinedstorage:magenta_controller" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/crafting_grids.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/crafting_grids.json new file mode 100644 index 000000000..b783c1200 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/crafting_grids.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_crafting_grid", + "refinedstorage:orange_crafting_grid", + "refinedstorage:magenta_crafting_grid", + "refinedstorage:crafting_grid", + "refinedstorage:yellow_crafting_grid", + "refinedstorage:lime_crafting_grid", + "refinedstorage:pink_crafting_grid", + "refinedstorage:gray_crafting_grid", + "refinedstorage:light_gray_crafting_grid", + "refinedstorage:cyan_crafting_grid", + "refinedstorage:purple_crafting_grid", + "refinedstorage:blue_crafting_grid", + "refinedstorage:brown_crafting_grid", + "refinedstorage:green_crafting_grid", + "refinedstorage:red_crafting_grid", + "refinedstorage:black_crafting_grid" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/creative_controllers.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/creative_controllers.json new file mode 100644 index 000000000..e9dacbb96 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/creative_controllers.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_creative_controller", + "refinedstorage:orange_creative_controller", + "refinedstorage:magenta_creative_controller", + "refinedstorage:creative_controller", + "refinedstorage:yellow_creative_controller", + "refinedstorage:lime_creative_controller", + "refinedstorage:pink_creative_controller", + "refinedstorage:gray_creative_controller", + "refinedstorage:light_gray_creative_controller", + "refinedstorage:cyan_creative_controller", + "refinedstorage:purple_creative_controller", + "refinedstorage:blue_creative_controller", + "refinedstorage:brown_creative_controller", + "refinedstorage:green_creative_controller", + "refinedstorage:red_creative_controller", + "refinedstorage:black_creative_controller" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/destructors.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/destructors.json new file mode 100644 index 000000000..1b17d2858 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/destructors.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_destructor", + "refinedstorage:orange_destructor", + "refinedstorage:magenta_destructor", + "refinedstorage:light_blue_destructor", + "refinedstorage:yellow_destructor", + "refinedstorage:lime_destructor", + "refinedstorage:pink_destructor", + "refinedstorage:destructor", + "refinedstorage:light_gray_destructor", + "refinedstorage:cyan_destructor", + "refinedstorage:purple_destructor", + "refinedstorage:blue_destructor", + "refinedstorage:brown_destructor", + "refinedstorage:green_destructor", + "refinedstorage:red_destructor", + "refinedstorage:black_destructor" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/detectors.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/detectors.json new file mode 100644 index 000000000..01c7a610c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/detectors.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_detector", + "refinedstorage:orange_detector", + "refinedstorage:magenta_detector", + "refinedstorage:detector", + "refinedstorage:yellow_detector", + "refinedstorage:lime_detector", + "refinedstorage:pink_detector", + "refinedstorage:gray_detector", + "refinedstorage:light_gray_detector", + "refinedstorage:cyan_detector", + "refinedstorage:purple_detector", + "refinedstorage:blue_detector", + "refinedstorage:brown_detector", + "refinedstorage:green_detector", + "refinedstorage:red_detector", + "refinedstorage:black_detector" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/disk_interfaces.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/disk_interfaces.json new file mode 100644 index 000000000..67a99c997 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/disk_interfaces.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_disk_interface", + "refinedstorage:orange_disk_interface", + "refinedstorage:magenta_disk_interface", + "refinedstorage:disk_interface", + "refinedstorage:yellow_disk_interface", + "refinedstorage:lime_disk_interface", + "refinedstorage:pink_disk_interface", + "refinedstorage:gray_disk_interface", + "refinedstorage:light_gray_disk_interface", + "refinedstorage:cyan_disk_interface", + "refinedstorage:purple_disk_interface", + "refinedstorage:blue_disk_interface", + "refinedstorage:brown_disk_interface", + "refinedstorage:green_disk_interface", + "refinedstorage:red_disk_interface", + "refinedstorage:black_disk_interface" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/exporters.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/exporters.json new file mode 100644 index 000000000..c335bd3db --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/exporters.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_exporter", + "refinedstorage:orange_exporter", + "refinedstorage:magenta_exporter", + "refinedstorage:light_blue_exporter", + "refinedstorage:yellow_exporter", + "refinedstorage:lime_exporter", + "refinedstorage:pink_exporter", + "refinedstorage:exporter", + "refinedstorage:light_gray_exporter", + "refinedstorage:cyan_exporter", + "refinedstorage:purple_exporter", + "refinedstorage:blue_exporter", + "refinedstorage:brown_exporter", + "refinedstorage:green_exporter", + "refinedstorage:red_exporter", + "refinedstorage:black_exporter" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/external_storages.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/external_storages.json new file mode 100644 index 000000000..9816bb053 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/external_storages.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_external_storage", + "refinedstorage:orange_external_storage", + "refinedstorage:magenta_external_storage", + "refinedstorage:light_blue_external_storage", + "refinedstorage:yellow_external_storage", + "refinedstorage:lime_external_storage", + "refinedstorage:pink_external_storage", + "refinedstorage:external_storage", + "refinedstorage:light_gray_external_storage", + "refinedstorage:cyan_external_storage", + "refinedstorage:purple_external_storage", + "refinedstorage:blue_external_storage", + "refinedstorage:brown_external_storage", + "refinedstorage:green_external_storage", + "refinedstorage:red_external_storage", + "refinedstorage:black_external_storage" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/fluid_storage_disks.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/fluid_storage_disks.json new file mode 100644 index 000000000..68c04988c --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/fluid_storage_disks.json @@ -0,0 +1,8 @@ +{ + "values": [ + "refinedstorage:64b_fluid_storage_disk", + "refinedstorage:256b_fluid_storage_disk", + "refinedstorage:1024b_fluid_storage_disk", + "refinedstorage:4096b_fluid_storage_disk" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/grids.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/grids.json new file mode 100644 index 000000000..3c59ac637 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/grids.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_grid", + "refinedstorage:orange_grid", + "refinedstorage:magenta_grid", + "refinedstorage:grid", + "refinedstorage:yellow_grid", + "refinedstorage:lime_grid", + "refinedstorage:pink_grid", + "refinedstorage:gray_grid", + "refinedstorage:light_gray_grid", + "refinedstorage:cyan_grid", + "refinedstorage:purple_grid", + "refinedstorage:blue_grid", + "refinedstorage:brown_grid", + "refinedstorage:green_grid", + "refinedstorage:red_grid", + "refinedstorage:black_grid" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/importers.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/importers.json new file mode 100644 index 000000000..f2b2be1cb --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/importers.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_importer", + "refinedstorage:orange_importer", + "refinedstorage:magenta_importer", + "refinedstorage:light_blue_importer", + "refinedstorage:yellow_importer", + "refinedstorage:lime_importer", + "refinedstorage:pink_importer", + "refinedstorage:importer", + "refinedstorage:light_gray_importer", + "refinedstorage:cyan_importer", + "refinedstorage:purple_importer", + "refinedstorage:blue_importer", + "refinedstorage:brown_importer", + "refinedstorage:green_importer", + "refinedstorage:red_importer", + "refinedstorage:black_importer" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_receivers.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_receivers.json new file mode 100644 index 000000000..afe70d8a1 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_receivers.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_network_receiver", + "refinedstorage:orange_network_receiver", + "refinedstorage:magenta_network_receiver", + "refinedstorage:network_receiver", + "refinedstorage:yellow_network_receiver", + "refinedstorage:lime_network_receiver", + "refinedstorage:pink_network_receiver", + "refinedstorage:gray_network_receiver", + "refinedstorage:light_gray_network_receiver", + "refinedstorage:cyan_network_receiver", + "refinedstorage:purple_network_receiver", + "refinedstorage:blue_network_receiver", + "refinedstorage:brown_network_receiver", + "refinedstorage:green_network_receiver", + "refinedstorage:red_network_receiver", + "refinedstorage:black_network_receiver" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_transmitters.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_transmitters.json new file mode 100644 index 000000000..b8645cfaa --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/network_transmitters.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_network_transmitter", + "refinedstorage:orange_network_transmitter", + "refinedstorage:magenta_network_transmitter", + "refinedstorage:network_transmitter", + "refinedstorage:yellow_network_transmitter", + "refinedstorage:lime_network_transmitter", + "refinedstorage:pink_network_transmitter", + "refinedstorage:gray_network_transmitter", + "refinedstorage:light_gray_network_transmitter", + "refinedstorage:cyan_network_transmitter", + "refinedstorage:purple_network_transmitter", + "refinedstorage:blue_network_transmitter", + "refinedstorage:brown_network_transmitter", + "refinedstorage:green_network_transmitter", + "refinedstorage:red_network_transmitter", + "refinedstorage:black_network_transmitter" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/relays.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/relays.json new file mode 100644 index 000000000..0616c8e14 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/relays.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_relay", + "refinedstorage:orange_relay", + "refinedstorage:magenta_relay", + "refinedstorage:relay", + "refinedstorage:yellow_relay", + "refinedstorage:lime_relay", + "refinedstorage:pink_relay", + "refinedstorage:gray_relay", + "refinedstorage:light_gray_relay", + "refinedstorage:cyan_relay", + "refinedstorage:purple_relay", + "refinedstorage:blue_relay", + "refinedstorage:brown_relay", + "refinedstorage:green_relay", + "refinedstorage:red_relay", + "refinedstorage:black_relay" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/security_managers.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/security_managers.json new file mode 100644 index 000000000..dd466636b --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/security_managers.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_security_manager", + "refinedstorage:orange_security_manager", + "refinedstorage:magenta_security_manager", + "refinedstorage:security_manager", + "refinedstorage:yellow_security_manager", + "refinedstorage:lime_security_manager", + "refinedstorage:pink_security_manager", + "refinedstorage:gray_security_manager", + "refinedstorage:light_gray_security_manager", + "refinedstorage:cyan_security_manager", + "refinedstorage:purple_security_manager", + "refinedstorage:blue_security_manager", + "refinedstorage:brown_security_manager", + "refinedstorage:green_security_manager", + "refinedstorage:red_security_manager", + "refinedstorage:black_security_manager" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/storage_disks.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/storage_disks.json new file mode 100644 index 000000000..51302c492 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/storage_disks.json @@ -0,0 +1,8 @@ +{ + "values": [ + "refinedstorage:1k_storage_disk", + "refinedstorage:4k_storage_disk", + "refinedstorage:16k_storage_disk", + "refinedstorage:64k_storage_disk" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/wireless_transmitters.json b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/wireless_transmitters.json new file mode 100644 index 000000000..d2af672e3 --- /dev/null +++ b/refinedstorage-platform-common/src/generated/resources/data/refinedstorage/tags/item/wireless_transmitters.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_wireless_transmitter", + "refinedstorage:orange_wireless_transmitter", + "refinedstorage:magenta_wireless_transmitter", + "refinedstorage:wireless_transmitter", + "refinedstorage:yellow_wireless_transmitter", + "refinedstorage:lime_wireless_transmitter", + "refinedstorage:pink_wireless_transmitter", + "refinedstorage:gray_wireless_transmitter", + "refinedstorage:light_gray_wireless_transmitter", + "refinedstorage:cyan_wireless_transmitter", + "refinedstorage:purple_wireless_transmitter", + "refinedstorage:blue_wireless_transmitter", + "refinedstorage:brown_wireless_transmitter", + "refinedstorage:green_wireless_transmitter", + "refinedstorage:red_wireless_transmitter", + "refinedstorage:black_wireless_transmitter" + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java new file mode 100644 index 000000000..d984184de --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractClientModInitializer.java @@ -0,0 +1,135 @@ +package com.refinedmods.refinedstorage.platform.common; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorScreen; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorScreen; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerScreen; +import com.refinedmods.refinedstorage.platform.common.detector.DetectorScreen; +import com.refinedmods.refinedstorage.platform.common.exporter.ExporterScreen; +import com.refinedmods.refinedstorage.platform.common.grid.GridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.screen.CraftingGridScreen; +import com.refinedmods.refinedstorage.platform.common.grid.screen.GridScreen; +import com.refinedmods.refinedstorage.platform.common.grid.screen.hint.FluidGridInsertionHint; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceScreen; +import com.refinedmods.refinedstorage.platform.common.importer.ImporterScreen; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterScreen; +import com.refinedmods.refinedstorage.platform.common.networking.RelayScreen; +import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardScreen; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardScreen; +import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerScreen; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveScreen; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceScreen; +import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageScreen; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridScreen; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockScreen; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockScreen; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorScreen; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResourceRendering; +import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeScreen; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterScreen; + +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.MenuAccess; +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; +import net.minecraft.world.inventory.MenuType; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public abstract class AbstractClientModInitializer { + protected static void registerScreens(final ScreenRegistration registration) { + registration.register(Menus.INSTANCE.getDiskDrive(), DiskDriveScreen::new); + registration.register(Menus.INSTANCE.getGrid(), GridScreen::new); + registration.register(Menus.INSTANCE.getCraftingGrid(), CraftingGridScreen::new); + registration.register(Menus.INSTANCE.getWirelessGrid(), GridScreen::new); + registration.register(Menus.INSTANCE.getController(), ControllerScreen::new); + registration.register(Menus.INSTANCE.getItemStorage(), ItemStorageBlockScreen::new); + registration.register(Menus.INSTANCE.getFluidStorage(), FluidStorageBlockScreen::new); + registration.register(Menus.INSTANCE.getImporter(), ImporterScreen::new); + registration.register(Menus.INSTANCE.getExporter(), ExporterScreen::new); + registration.register(Menus.INSTANCE.getInterface(), InterfaceScreen::new); + registration.register(Menus.INSTANCE.getExternalStorage(), ExternalStorageScreen::new); + registration.register(Menus.INSTANCE.getDetector(), DetectorScreen::new); + registration.register(Menus.INSTANCE.getDestructor(), DestructorScreen::new); + registration.register(Menus.INSTANCE.getConstructor(), ConstructorScreen::new); + registration.register(Menus.INSTANCE.getRegulatorUpgrade(), RegulatorUpgradeScreen::new); + registration.register(Menus.INSTANCE.getWirelessTransmitter(), WirelessTransmitterScreen::new); + registration.register(Menus.INSTANCE.getStorageMonitor(), StorageMonitorScreen::new); + registration.register(Menus.INSTANCE.getNetworkTransmitter(), NetworkTransmitterScreen::new); + registration.register(Menus.INSTANCE.getPortableGridBlock(), PortableGridScreen::new); + registration.register(Menus.INSTANCE.getPortableGridItem(), PortableGridScreen::new); + registration.register(Menus.INSTANCE.getSecurityCard(), SecurityCardScreen::new); + registration.register(Menus.INSTANCE.getFallbackSecurityCard(), FallbackSecurityCardScreen::new); + registration.register(Menus.INSTANCE.getSecurityManager(), SecurityManagerScreen::new); + registration.register(Menus.INSTANCE.getRelay(), RelayScreen::new); + registration.register(Menus.INSTANCE.getDiskInterface(), DiskInterfaceScreen::new); + } + + protected static void registerAlternativeGridHints() { + PlatformApi.INSTANCE.addAlternativeGridInsertionHint(new FluidGridInsertionHint()); + } + + protected static void registerResourceRendering() { + PlatformApi.INSTANCE.registerResourceRendering(ItemResource.class, new ItemResourceRendering()); + PlatformApi.INSTANCE.registerResourceRendering(FluidResource.class, new FluidResourceRendering()); + } + + protected static void handleInputEvents() { + final Player player = Minecraft.getInstance().player; + if (player == null) { + return; + } + final KeyMapping openWirelessGrid = KeyMappings.INSTANCE.getOpenWirelessGrid(); + while (openWirelessGrid != null && openWirelessGrid.consumeClick()) { + PlatformApi.INSTANCE.useNetworkBoundItem( + player, + Items.INSTANCE.getWirelessGrid(), + Items.INSTANCE.getCreativeWirelessGrid() + ); + } + } + + protected static void registerDiskModels() { + final ResourceLocation diskModel = createIdentifier("block/disk/disk"); + for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { + PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( + Items.INSTANCE.getItemStorageDisk(variant), + diskModel + ); + } + + final ResourceLocation fluidDiskModel = createIdentifier("block/disk/fluid_disk"); + for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { + PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( + Items.INSTANCE.getFluidStorageDisk(variant), + fluidDiskModel + ); + } + } + + @FunctionalInterface + public interface ScreenRegistration { + > void register(MenuType type, + ScreenConstructor + factory); + } + + @FunctionalInterface + public interface ScreenConstructor> { + U create(T menu, Inventory inventory, Component title); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java new file mode 100644 index 000000000..4f68e9153 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractModInitializer.java @@ -0,0 +1,886 @@ +package com.refinedmods.refinedstorage.platform.common; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyNetworkComponentImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.GraphNetworkComponentImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.security.SecurityNetworkComponentImpl; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.api.network.security.SecurityNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.PlatformApiProxy; +import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; +import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardItem; +import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardState; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.BlockBreakDestructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorBlockEntity; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorContainerMenu; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorBlockEntity; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorContainerMenu; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.FluidBreakDestructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.ItemDropConstructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.ItemPickupDestructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.PlaceBlockConstructorStrategy; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.PlaceFireworksConstructorStrategy; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.PlaceFluidConstructorStrategy; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntityTypeFactory; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.ContentIds; +import com.refinedmods.refinedstorage.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.platform.common.content.ExtendedMenuTypeFactory; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.content.LootFunctions; +import com.refinedmods.refinedstorage.platform.common.content.MenuTypeFactory; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.content.RegistryCallback; +import com.refinedmods.refinedstorage.platform.common.content.Sounds; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerContainerMenu; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerData; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerType; +import com.refinedmods.refinedstorage.platform.common.detector.DetectorBlockEntity; +import com.refinedmods.refinedstorage.platform.common.detector.DetectorContainerMenu; +import com.refinedmods.refinedstorage.platform.common.exporter.ExporterBlockEntity; +import com.refinedmods.refinedstorage.platform.common.exporter.ExporterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.GridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.grid.GridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.GridData; +import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridData; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlock; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceData; +import com.refinedmods.refinedstorage.platform.common.importer.ImporterBlockEntity; +import com.refinedmods.refinedstorage.platform.common.importer.ImporterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; +import com.refinedmods.refinedstorage.platform.common.misc.WrenchItem; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkCardItem; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlockEntity; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlockEntity; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterData; +import com.refinedmods.refinedstorage.platform.common.networking.RelayBlockEntity; +import com.refinedmods.refinedstorage.platform.common.networking.RelayContainerMenu; +import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; +import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardContainerMenu; +import com.refinedmods.refinedstorage.platform.common.security.PlatformSecurityNetworkComponentImpl; +import com.refinedmods.refinedstorage.platform.common.security.PlayerBoundSecurityCardData; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardBoundPlayer; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardContainerMenu; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardData; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardPermissions; +import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlock; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridItemContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridLootItemFunction; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlock; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockBlockItem; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlock; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockBlockItem; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.StorageBlockData; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.StorageBlockLootItemFunction; +import com.refinedmods.refinedstorage.platform.common.storage.storagedisk.FluidStorageDiskItem; +import com.refinedmods.refinedstorage.platform.common.storage.storagedisk.ItemStorageDiskItem; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.FluidStorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.FluidStorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.ItemStorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.ItemStorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlock; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.SimpleBlock; +import com.refinedmods.refinedstorage.platform.common.support.SimpleItem; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyLootItemFunction; +import com.refinedmods.refinedstorage.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.network.bounditem.InventorySlotReferenceFactory; +import com.refinedmods.refinedstorage.platform.common.support.network.component.PlatformStorageNetworkComponent; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceFactory; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.platform.common.upgrade.FortuneUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.upgrade.RangeUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeContainerMenu; +import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeState; +import com.refinedmods.refinedstorage.platform.common.upgrade.SimpleUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeWithEnchantedBookRecipeSerializer; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.BaseWirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.CreativeRangeUpgradeWirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.RangeUpgradeWirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterBlockEntity; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterData; + +import java.util.Optional; +import java.util.UUID; +import java.util.function.BiFunction; +import java.util.function.Supplier; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import net.minecraft.core.BlockPos; +import net.minecraft.core.GlobalPos; +import net.minecraft.core.UUIDUtil; +import net.minecraft.core.component.DataComponentType; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; + +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CABLE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CONSTRUCTION_CORE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CONSTRUCTOR; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CONTROLLER; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CRAFTING_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_CONTROLLER; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DESTRUCTION_CORE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DESTRUCTOR; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DETECTOR; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DISK_DRIVE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DISK_INTERFACE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.EXPORTER; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.EXTERNAL_STORAGE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.FLUID_STORAGE_BLOCK; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.IMPORTER; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.INTERFACE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.ITEM_STORAGE_BLOCK; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.MACHINE_CASING; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.NETWORK_RECEIVER; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.NETWORK_TRANSMITTER; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PORTABLE_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PROCESSOR_BINDING; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER_BLOCK; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON_BLOCK; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.REGULATOR_UPGRADE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.RELAY; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SECURITY_CARD; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SECURITY_MANAGER; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SILICON; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.STORAGE_BLOCK; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.STORAGE_HOUSING; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.STORAGE_MONITOR; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WIRELESS_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WIRELESS_TRANSMITTER; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WRENCH; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forFluidStorageBlock; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forFluidStorageDisk; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forFluidStoragePart; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forItemStorageBlock; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forItemStoragePart; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forProcessor; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.forStorageDisk; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public abstract class AbstractModInitializer { + private static final String ITEM_REGISTRY_KEY = "item"; + private static final String FLUID_REGISTRY_KEY = "fluid"; + + protected final void initializePlatformApi() { + ((PlatformApiProxy) PlatformApi.INSTANCE).setDelegate(new PlatformApiImpl()); + registerStorageTypes(); + registerResourceTypes(); + registerAdditionalResourceFactories(); + registerDestructorStrategyFactories(); + registerConstructorStrategyFactories(); + registerStorageMonitorInsertionStrategies(); + registerStorageMonitorExtractionStrategies(); + registerNetworkComponents(); + registerWirelessTransmitterRangeModifiers(); + registerPermissions(); + registerInventorySlotReference(); + } + + private void registerStorageTypes() { + PlatformApi.INSTANCE.getStorageTypeRegistry().register( + createIdentifier(ITEM_REGISTRY_KEY), + StorageTypes.ITEM + ); + PlatformApi.INSTANCE.getStorageTypeRegistry().register( + createIdentifier(FLUID_REGISTRY_KEY), + StorageTypes.FLUID + ); + } + + private void registerResourceTypes() { + PlatformApi.INSTANCE.getResourceTypeRegistry().register( + createIdentifier(ITEM_REGISTRY_KEY), + ResourceTypes.ITEM + ); + PlatformApi.INSTANCE.getResourceTypeRegistry().register( + createIdentifier(FLUID_REGISTRY_KEY), + ResourceTypes.FLUID + ); + } + + private void registerAdditionalResourceFactories() { + PlatformApi.INSTANCE.addResourceFactory(new FluidResourceFactory()); + } + + private void registerDestructorStrategyFactories() { + PlatformApi.INSTANCE.addDestructorStrategyFactory(new BlockBreakDestructorStrategyFactory()); + PlatformApi.INSTANCE.addDestructorStrategyFactory(new FluidBreakDestructorStrategyFactory()); + PlatformApi.INSTANCE.addDestructorStrategyFactory(new ItemPickupDestructorStrategyFactory()); + } + + private void registerConstructorStrategyFactories() { + PlatformApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> + Optional.of(new PlaceBlockConstructorStrategy(level, pos, direction))); + PlatformApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> + Optional.of(new PlaceFireworksConstructorStrategy(level, pos, direction))); + PlatformApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> + Optional.of(new PlaceFluidConstructorStrategy(level, pos, direction))); + PlatformApi.INSTANCE.addConstructorStrategyFactory(new ItemDropConstructorStrategyFactory()); + } + + private void registerStorageMonitorInsertionStrategies() { + PlatformApi.INSTANCE.addStorageMonitorInsertionStrategy(new ItemStorageMonitorInsertionStrategy()); + PlatformApi.INSTANCE.addStorageMonitorInsertionStrategy(new FluidStorageMonitorInsertionStrategy()); + } + + private void registerStorageMonitorExtractionStrategies() { + PlatformApi.INSTANCE.addStorageMonitorExtractionStrategy(new ItemStorageMonitorExtractionStrategy()); + PlatformApi.INSTANCE.addStorageMonitorExtractionStrategy(new FluidStorageMonitorExtractionStrategy()); + } + + private void registerNetworkComponents() { + PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + EnergyNetworkComponent.class, + network -> new EnergyNetworkComponentImpl() + ); + PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + GraphNetworkComponent.class, + GraphNetworkComponentImpl::new + ); + PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + StorageNetworkComponent.class, + network -> new PlatformStorageNetworkComponent() + ); + PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + PlatformSecurityNetworkComponent.class, + network -> new PlatformSecurityNetworkComponentImpl(PlatformApi.INSTANCE.createDefaultSecurityPolicy()) + ); + PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( + SecurityNetworkComponent.class, + network -> new SecurityNetworkComponentImpl(PlatformApi.INSTANCE.createDefaultSecurityPolicy()) + ); + } + + private void registerWirelessTransmitterRangeModifiers() { + PlatformApi.INSTANCE.addWirelessTransmitterRangeModifier(new BaseWirelessTransmitterRangeModifier()); + PlatformApi.INSTANCE.addWirelessTransmitterRangeModifier(new RangeUpgradeWirelessTransmitterRangeModifier()); + PlatformApi.INSTANCE.addWirelessTransmitterRangeModifier( + new CreativeRangeUpgradeWirelessTransmitterRangeModifier() + ); + } + + private void registerPermissions() { + for (final BuiltinPermission permission : BuiltinPermission.values()) { + PlatformApi.INSTANCE.getPermissionRegistry().register(permission.getId(), permission); + } + } + + protected final void registerBlocks( + final RegistryCallback callback, + final BiFunction diskDriveBlockEntityFactory, + final BiFunction portableGridBlockEntityFactory, + final BiFunction creativePortableGridBlockEntityFactory, + final BiFunction diskInterfaceBlockEntityFactory + ) { + Blocks.INSTANCE.setQuartzEnrichedIronBlock(callback.register(QUARTZ_ENRICHED_IRON_BLOCK, SimpleBlock::new)); + Blocks.INSTANCE.setQuartzEnrichedCopperBlock(callback.register(QUARTZ_ENRICHED_COPPER_BLOCK, SimpleBlock::new)); + Blocks.INSTANCE.setDiskDrive( + callback.register(DISK_DRIVE, () -> new DiskDriveBlock(diskDriveBlockEntityFactory)) + ); + Blocks.INSTANCE.setMachineCasing(callback.register(MACHINE_CASING, SimpleBlock::new)); + for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { + Blocks.INSTANCE.setItemStorageBlock(variant, callback.register( + forItemStorageBlock(variant), + () -> new ItemStorageBlock(variant) + )); + } + for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { + Blocks.INSTANCE.setFluidStorageBlock(variant, callback.register( + forFluidStorageBlock(variant), + () -> new FluidStorageBlock(variant) + )); + } + Blocks.INSTANCE.getController().registerBlocks(callback); + Blocks.INSTANCE.getCreativeController().registerBlocks(callback); + Blocks.INSTANCE.getCable().registerBlocks(callback); + Blocks.INSTANCE.getGrid().registerBlocks(callback); + Blocks.INSTANCE.getCraftingGrid().registerBlocks(callback); + Blocks.INSTANCE.getDetector().registerBlocks(callback); + Blocks.INSTANCE.getImporter().registerBlocks(callback); + Blocks.INSTANCE.getExporter().registerBlocks(callback); + Blocks.INSTANCE.getExternalStorage().registerBlocks(callback); + Blocks.INSTANCE.getConstructor().registerBlocks(callback); + Blocks.INSTANCE.getDestructor().registerBlocks(callback); + Blocks.INSTANCE.setInterface(callback.register(INTERFACE, InterfaceBlock::new)); + Blocks.INSTANCE.getWirelessTransmitter().registerBlocks(callback); + Blocks.INSTANCE.setStorageMonitor(callback.register(STORAGE_MONITOR, StorageMonitorBlock::new)); + Blocks.INSTANCE.getNetworkReceiver().registerBlocks(callback); + Blocks.INSTANCE.getNetworkTransmitter().registerBlocks(callback); + Blocks.INSTANCE.setPortableGrid(callback.register(PORTABLE_GRID, () -> new PortableGridBlock( + PortableGridType.NORMAL, + portableGridBlockEntityFactory + ))); + Blocks.INSTANCE.setCreativePortableGrid(callback.register(CREATIVE_PORTABLE_GRID, () -> new PortableGridBlock( + PortableGridType.CREATIVE, + creativePortableGridBlockEntityFactory + ))); + Blocks.INSTANCE.getSecurityManager().registerBlocks(callback); + Blocks.INSTANCE.getRelay().registerBlocks(callback); + Blocks.INSTANCE.setDiskInterface(diskInterfaceBlockEntityFactory).registerBlocks(callback); + } + + protected final void registerItems(final RegistryCallback callback) { + registerSimpleItems(callback); + Blocks.INSTANCE.getGrid().registerItems(callback); + Blocks.INSTANCE.getCraftingGrid().registerItems(callback); + Blocks.INSTANCE.getCable().registerItems(callback, Items.INSTANCE::addCable); + Blocks.INSTANCE.getController().registerItems(callback, Items.INSTANCE::addController); + Blocks.INSTANCE.getCreativeController().registerItems(callback, Items.INSTANCE::addCreativeController); + Blocks.INSTANCE.getDetector().registerItems(callback, Items.INSTANCE::addDetector); + Blocks.INSTANCE.getImporter().registerItems(callback, Items.INSTANCE::addImporter); + Blocks.INSTANCE.getExporter().registerItems(callback, Items.INSTANCE::addExporter); + Blocks.INSTANCE.getExternalStorage().registerItems(callback, Items.INSTANCE::addExternalStorage); + Blocks.INSTANCE.getConstructor().registerItems(callback, Items.INSTANCE::addConstructor); + Blocks.INSTANCE.getDestructor().registerItems(callback, Items.INSTANCE::addDestructor); + Blocks.INSTANCE.getWirelessTransmitter().registerItems(callback, Items.INSTANCE::addWirelessTransmitter); + Blocks.INSTANCE.getNetworkReceiver().registerItems(callback, Items.INSTANCE::addNetworkReceiver); + Blocks.INSTANCE.getNetworkTransmitter().registerItems(callback, Items.INSTANCE::addNetworkTransmitter); + Blocks.INSTANCE.getSecurityManager().registerItems(callback, Items.INSTANCE::addSecurityManager); + Blocks.INSTANCE.getRelay().registerItems(callback, Items.INSTANCE::addRelay); + Blocks.INSTANCE.getDiskInterface().registerItems(callback, Items.INSTANCE::addDiskInterface); + registerStorageItems(callback); + registerUpgrades(callback); + } + + private void registerSimpleItems(final RegistryCallback callback) { + Items.INSTANCE.setQuartzEnrichedIron(callback.register(QUARTZ_ENRICHED_IRON, SimpleItem::new)); + Items.INSTANCE.setQuartzEnrichedCopper(callback.register(QUARTZ_ENRICHED_COPPER, SimpleItem::new)); + callback.register( + QUARTZ_ENRICHED_IRON_BLOCK, + () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedIronBlock()) + ); + callback.register( + QUARTZ_ENRICHED_COPPER_BLOCK, + () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedCopperBlock()) + ); + Items.INSTANCE.setSilicon(callback.register(SILICON, SimpleItem::new)); + Items.INSTANCE.setProcessorBinding(callback.register(PROCESSOR_BINDING, SimpleItem::new)); + callback.register(DISK_DRIVE, () -> Blocks.INSTANCE.getDiskDrive().createBlockItem()); + Items.INSTANCE.setWrench(callback.register(WRENCH, WrenchItem::new)); + Items.INSTANCE.setStorageHousing(callback.register(STORAGE_HOUSING, SimpleItem::new)); + callback.register(MACHINE_CASING, () -> new BaseBlockItem(Blocks.INSTANCE.getMachineCasing())); + callback.register(STORAGE_MONITOR, () -> Blocks.INSTANCE.getStorageMonitor().createBlockItem()); + callback.register(INTERFACE, () -> Blocks.INSTANCE.getInterface().createBlockItem()); + Items.INSTANCE.setConstructionCore(callback.register(CONSTRUCTION_CORE, SimpleItem::new)); + Items.INSTANCE.setDestructionCore(callback.register(DESTRUCTION_CORE, SimpleItem::new)); + for (final ProcessorItem.Type type : ProcessorItem.Type.values()) { + registerProcessor(callback, type); + } + Items.INSTANCE.setConfigurationCard(callback.register( + ContentIds.CONFIGURATION_CARD, + ConfigurationCardItem::new + )); + Items.INSTANCE.setNetworkCard(callback.register(ContentIds.NETWORK_CARD, NetworkCardItem::new)); + } + + private void registerProcessor(final RegistryCallback callback, final ProcessorItem.Type type) { + Items.INSTANCE.setProcessor(type, callback.register(forProcessor(type), ProcessorItem::new)); + } + + private void registerStorageItems(final RegistryCallback callback) { + for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { + registerItemStorageItems(callback, variant); + } + for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { + registerFluidStorageItems(callback, variant); + } + } + + private void registerItemStorageItems(final RegistryCallback callback, + final ItemStorageType.Variant variant) { + if (variant != ItemStorageType.Variant.CREATIVE) { + Items.INSTANCE.setItemStoragePart(variant, callback.register( + forItemStoragePart(variant), + SimpleItem::new) + ); + } + Items.INSTANCE.setItemStorageDisk(variant, callback.register( + forStorageDisk(variant), + () -> new ItemStorageDiskItem(variant) + )); + callback.register( + forItemStorageBlock(variant), + () -> new ItemStorageBlockBlockItem(Blocks.INSTANCE.getItemStorageBlock(variant), variant) + ); + } + + private void registerFluidStorageItems(final RegistryCallback callback, + final FluidStorageType.Variant variant) { + if (variant != FluidStorageType.Variant.CREATIVE) { + Items.INSTANCE.setFluidStoragePart(variant, callback.register( + forFluidStoragePart(variant), + SimpleItem::new) + ); + } + Items.INSTANCE.setFluidStorageDisk(variant, callback.register( + forFluidStorageDisk(variant), + () -> new FluidStorageDiskItem(variant) + )); + callback.register( + forFluidStorageBlock(variant), + () -> new FluidStorageBlockBlockItem(Blocks.INSTANCE.getFluidStorageBlock(variant), variant) + ); + } + + private void registerUpgrades(final RegistryCallback callback) { + Items.INSTANCE.setUpgrade(callback.register( + ContentIds.UPGRADE, + SimpleItem::new + )); + final Supplier speedUpgrade = callback.register( + ContentIds.SPEED_UPGRADE, + SimpleUpgradeItem::speedUpgrade + ); + Items.INSTANCE.setSpeedUpgrade(speedUpgrade); + final Supplier stackUpgrade = callback.register( + ContentIds.STACK_UPGRADE, + SimpleUpgradeItem::stackUpgrade + ); + Items.INSTANCE.setStackUpgrade(stackUpgrade); + final Supplier fortune1Upgrade = callback.register( + ContentIds.FORTUNE_1_UPGRADE, + () -> new FortuneUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), 1) + ); + Items.INSTANCE.setFortune1Upgrade(fortune1Upgrade); + final Supplier fortune2Upgrade = callback.register( + ContentIds.FORTUNE_2_UPGRADE, + () -> new FortuneUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), 2) + ); + Items.INSTANCE.setFortune2Upgrade(fortune2Upgrade); + final Supplier fortune3Upgrade = callback.register( + ContentIds.FORTUNE_3_UPGRADE, + () -> new FortuneUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), 3) + ); + Items.INSTANCE.setFortune3Upgrade(fortune3Upgrade); + final Supplier silkTouchUpgrade = callback.register( + ContentIds.SILK_TOUCH_UPGRADE, + SimpleUpgradeItem::silkTouchUpgrade + ); + Items.INSTANCE.setSilkTouchUpgrade(silkTouchUpgrade); + Items.INSTANCE.setRangeUpgrade(callback.register( + ContentIds.RANGE_UPGRADE, + () -> new RangeUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), false) + )); + Items.INSTANCE.setCreativeRangeUpgrade(callback.register( + ContentIds.CREATIVE_RANGE_UPGRADE, + () -> new RangeUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), true) + )); + } + + protected final void registerUpgradeMappings() { + PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.IMPORTER) + .add(Items.INSTANCE.getSpeedUpgrade(), 4) + .add(Items.INSTANCE.getStackUpgrade()) + .add(Items.INSTANCE.getRegulatorUpgrade()); + + PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.EXPORTER) + .add(Items.INSTANCE.getSpeedUpgrade(), 4) + .add(Items.INSTANCE.getStackUpgrade()) + .add(Items.INSTANCE.getRegulatorUpgrade()); + + PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.DESTRUCTOR) + .add(Items.INSTANCE.getSpeedUpgrade(), 4) + .add(Items.INSTANCE.getFortune1Upgrade()) + .add(Items.INSTANCE.getFortune2Upgrade()) + .add(Items.INSTANCE.getFortune3Upgrade()) + .add(Items.INSTANCE.getSilkTouchUpgrade()); + + PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.CONSTRUCTOR) + .add(Items.INSTANCE.getSpeedUpgrade(), 4) + .add(Items.INSTANCE.getStackUpgrade()); + + PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.WIRELESS_TRANSMITTER) + .add(Items.INSTANCE.getRangeUpgrade(), 4) + .add(Items.INSTANCE.getCreativeRangeUpgrade()); + + PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.DISK_INTERFACE) + .add(Items.INSTANCE.getSpeedUpgrade(), 4) + .add(Items.INSTANCE.getStackUpgrade()); + } + + protected final void registerBlockEntities( + final RegistryCallback> callback, + final BlockEntityTypeFactory typeFactory, + final BlockEntityTypeFactory.BlockEntitySupplier diskDriveBlockEntitySupplier, + final BlockEntityTypeFactory.BlockEntitySupplier + portableGridBlockEntitySupplier, + final BlockEntityTypeFactory.BlockEntitySupplier + creativePortableGridBlockEntitySupplier, + final BlockEntityTypeFactory.BlockEntitySupplier + diskInterfaceBlockEntitySupplier + ) { + BlockEntities.INSTANCE.setCable(callback.register( + CABLE, + () -> typeFactory.create((pos, state) -> new BaseNetworkNodeContainerBlockEntity<>( + BlockEntities.INSTANCE.getCable(), + pos, + state, + new SimpleNetworkNode(Platform.INSTANCE.getConfig().getCable().getEnergyUsage()) + ), Blocks.INSTANCE.getCable().toArray()) + )); + BlockEntities.INSTANCE.setController(callback.register( + CONTROLLER, + () -> typeFactory.create( + (pos, state) -> new ControllerBlockEntity(ControllerType.NORMAL, pos, state), + Blocks.INSTANCE.getController().toArray() + ) + )); + BlockEntities.INSTANCE.setCreativeController(callback.register( + CREATIVE_CONTROLLER, + () -> typeFactory.create( + (pos, state) -> new ControllerBlockEntity(ControllerType.CREATIVE, pos, state), + Blocks.INSTANCE.getCreativeController().toArray() + ) + )); + BlockEntities.INSTANCE.setDiskDrive(callback.register( + DISK_DRIVE, + () -> typeFactory.create(diskDriveBlockEntitySupplier, Blocks.INSTANCE.getDiskDrive()) + )); + BlockEntities.INSTANCE.setGrid(callback.register( + GRID, + () -> typeFactory.create(GridBlockEntity::new, Blocks.INSTANCE.getGrid().toArray()) + )); + BlockEntities.INSTANCE.setCraftingGrid(callback.register( + CRAFTING_GRID, + () -> typeFactory.create(CraftingGridBlockEntity::new, Blocks.INSTANCE.getCraftingGrid().toArray()) + )); + for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { + BlockEntities.INSTANCE.setItemStorageBlock(variant, callback.register( + forItemStorageBlock(variant), + () -> typeFactory.create( + (pos, state) -> new ItemStorageBlockBlockEntity(pos, state, variant), + Blocks.INSTANCE.getItemStorageBlock(variant) + ) + )); + } + for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { + BlockEntities.INSTANCE.setFluidStorageBlock(variant, callback.register( + forFluidStorageBlock(variant), + () -> typeFactory.create( + (pos, state) -> new FluidStorageBlockBlockEntity(pos, state, variant), + Blocks.INSTANCE.getFluidStorageBlock(variant) + ) + )); + } + BlockEntities.INSTANCE.setImporter(callback.register( + IMPORTER, + () -> typeFactory.create(ImporterBlockEntity::new, Blocks.INSTANCE.getImporter().toArray()) + + )); + BlockEntities.INSTANCE.setExporter(callback.register( + EXPORTER, + () -> typeFactory.create(ExporterBlockEntity::new, Blocks.INSTANCE.getExporter().toArray()) + + )); + BlockEntities.INSTANCE.setInterface(callback.register( + INTERFACE, + () -> typeFactory.create(InterfaceBlockEntity::new, Blocks.INSTANCE.getInterface()) + )); + BlockEntities.INSTANCE.setExternalStorage(callback.register( + EXTERNAL_STORAGE, + () -> typeFactory.create(ExternalStorageBlockEntity::new, Blocks.INSTANCE.getExternalStorage().toArray()) + )); + BlockEntities.INSTANCE.setDetector(callback.register( + DETECTOR, + () -> typeFactory.create(DetectorBlockEntity::new, Blocks.INSTANCE.getDetector().toArray()) + )); + BlockEntities.INSTANCE.setConstructor(callback.register( + CONSTRUCTOR, + () -> typeFactory.create(ConstructorBlockEntity::new, Blocks.INSTANCE.getConstructor().toArray()) + )); + BlockEntities.INSTANCE.setDestructor(callback.register( + DESTRUCTOR, + () -> typeFactory.create(DestructorBlockEntity::new, Blocks.INSTANCE.getDestructor().toArray()) + )); + BlockEntities.INSTANCE.setWirelessTransmitter(callback.register( + WIRELESS_TRANSMITTER, + () -> typeFactory.create( + WirelessTransmitterBlockEntity::new, + Blocks.INSTANCE.getWirelessTransmitter().toArray() + ) + )); + BlockEntities.INSTANCE.setStorageMonitor(callback.register( + STORAGE_MONITOR, + () -> typeFactory.create(StorageMonitorBlockEntity::new, Blocks.INSTANCE.getStorageMonitor()) + )); + BlockEntities.INSTANCE.setNetworkReceiver(callback.register( + NETWORK_RECEIVER, + () -> typeFactory.create(NetworkReceiverBlockEntity::new, Blocks.INSTANCE.getNetworkReceiver().toArray()) + )); + BlockEntities.INSTANCE.setNetworkTransmitter(callback.register( + NETWORK_TRANSMITTER, + () -> typeFactory.create( + NetworkTransmitterBlockEntity::new, + Blocks.INSTANCE.getNetworkTransmitter().toArray() + ) + )); + BlockEntities.INSTANCE.setPortableGrid(callback.register( + PORTABLE_GRID, + () -> typeFactory.create(portableGridBlockEntitySupplier::create, Blocks.INSTANCE.getPortableGrid()) + )); + BlockEntities.INSTANCE.setCreativePortableGrid(callback.register( + CREATIVE_PORTABLE_GRID, + () -> typeFactory.create( + creativePortableGridBlockEntitySupplier::create, + Blocks.INSTANCE.getCreativePortableGrid() + ) + )); + BlockEntities.INSTANCE.setSecurityManager(callback.register( + SECURITY_MANAGER, + () -> typeFactory.create( + SecurityManagerBlockEntity::new, + Blocks.INSTANCE.getSecurityManager().toArray() + ) + )); + BlockEntities.INSTANCE.setRelay(callback.register( + RELAY, + () -> typeFactory.create(RelayBlockEntity::new, Blocks.INSTANCE.getRelay().toArray()) + )); + BlockEntities.INSTANCE.setDiskInterface(callback.register( + DISK_INTERFACE, + () -> typeFactory.create(diskInterfaceBlockEntitySupplier, Blocks.INSTANCE.getDiskInterface().toArray()) + )); + } + + protected final void registerMenus(final RegistryCallback> callback, + final MenuTypeFactory menuTypeFactory, + final ExtendedMenuTypeFactory extendedMenuTypeFactory) { + Menus.INSTANCE.setController(callback.register( + CONTROLLER, + () -> extendedMenuTypeFactory.create(ControllerContainerMenu::new, ControllerData.STREAM_CODEC) + )); + Menus.INSTANCE.setDiskDrive(callback.register( + DISK_DRIVE, + () -> extendedMenuTypeFactory.create(DiskDriveContainerMenu::new, ResourceContainerData.STREAM_CODEC) + )); + Menus.INSTANCE.setGrid(callback.register( + GRID, + () -> extendedMenuTypeFactory.create(GridContainerMenu::new, GridData.STREAM_CODEC) + )); + Menus.INSTANCE.setCraftingGrid(callback.register( + CRAFTING_GRID, + () -> extendedMenuTypeFactory.create(CraftingGridContainerMenu::new, GridData.STREAM_CODEC) + )); + Menus.INSTANCE.setWirelessGrid(callback.register( + WIRELESS_GRID, + () -> extendedMenuTypeFactory.create(WirelessGridContainerMenu::new, WirelessGridData.STREAM_CODEC) + )); + Menus.INSTANCE.setItemStorage(callback.register( + ITEM_STORAGE_BLOCK, + () -> extendedMenuTypeFactory.create(ItemStorageBlockContainerMenu::new, StorageBlockData.STREAM_CODEC) + )); + Menus.INSTANCE.setFluidStorage(callback.register( + FLUID_STORAGE_BLOCK, + () -> extendedMenuTypeFactory.create(FluidStorageBlockContainerMenu::new, StorageBlockData.STREAM_CODEC) + )); + Menus.INSTANCE.setImporter(callback.register( + IMPORTER, + () -> extendedMenuTypeFactory.create(ImporterContainerMenu::new, ResourceContainerData.STREAM_CODEC) + )); + Menus.INSTANCE.setExporter(callback.register( + EXPORTER, + () -> extendedMenuTypeFactory.create(ExporterContainerMenu::new, ResourceContainerData.STREAM_CODEC) + )); + Menus.INSTANCE.setInterface(callback.register( + INTERFACE, + () -> extendedMenuTypeFactory.create(InterfaceContainerMenu::new, InterfaceData.STREAM_CODEC) + )); + Menus.INSTANCE.setExternalStorage(callback.register( + EXTERNAL_STORAGE, + () -> extendedMenuTypeFactory.create(ExternalStorageContainerMenu::new, ResourceContainerData.STREAM_CODEC) + )); + Menus.INSTANCE.setDetector(callback.register( + DETECTOR, + () -> extendedMenuTypeFactory.create(DetectorContainerMenu::new, SingleAmountData.STREAM_CODEC) + )); + Menus.INSTANCE.setDestructor(callback.register( + DESTRUCTOR, + () -> extendedMenuTypeFactory.create(DestructorContainerMenu::new, ResourceContainerData.STREAM_CODEC) + )); + Menus.INSTANCE.setConstructor(callback.register( + CONSTRUCTOR, + () -> extendedMenuTypeFactory.create(ConstructorContainerMenu::new, ResourceContainerData.STREAM_CODEC) + )); + Menus.INSTANCE.setRegulatorUpgrade(callback.register( + REGULATOR_UPGRADE, + () -> extendedMenuTypeFactory.create(RegulatorUpgradeContainerMenu::new, SingleAmountData.STREAM_CODEC) + )); + Menus.INSTANCE.setWirelessTransmitter(callback.register( + WIRELESS_TRANSMITTER, + () -> extendedMenuTypeFactory.create(WirelessTransmitterContainerMenu::new, + WirelessTransmitterData.STREAM_CODEC) + )); + Menus.INSTANCE.setStorageMonitor(callback.register( + STORAGE_MONITOR, + () -> extendedMenuTypeFactory.create(StorageMonitorContainerMenu::new, ResourceContainerData.STREAM_CODEC) + )); + Menus.INSTANCE.setNetworkTransmitter(callback.register( + NETWORK_TRANSMITTER, + () -> extendedMenuTypeFactory.create(NetworkTransmitterContainerMenu::new, + NetworkTransmitterData.STREAM_CODEC) + )); + Menus.INSTANCE.setPortableGridBlock(callback.register( + createIdentifier("portable_grid_block"), + () -> extendedMenuTypeFactory.create(PortableGridBlockContainerMenu::new, PortableGridData.STREAM_CODEC) + )); + Menus.INSTANCE.setPortableGridItem(callback.register( + createIdentifier("portable_grid_item"), + () -> extendedMenuTypeFactory.create(PortableGridItemContainerMenu::new, PortableGridData.STREAM_CODEC) + )); + Menus.INSTANCE.setSecurityCard(callback.register( + SECURITY_CARD, + () -> extendedMenuTypeFactory.create(SecurityCardContainerMenu::new, + PlayerBoundSecurityCardData.STREAM_CODEC) + )); + Menus.INSTANCE.setFallbackSecurityCard(callback.register( + FALLBACK_SECURITY_CARD, + () -> extendedMenuTypeFactory.create(FallbackSecurityCardContainerMenu::new, SecurityCardData.STREAM_CODEC) + )); + Menus.INSTANCE.setSecurityManager(callback.register( + SECURITY_MANAGER, + () -> menuTypeFactory.create(SecurityManagerContainerMenu::new) + )); + Menus.INSTANCE.setRelay(callback.register( + RELAY, + () -> extendedMenuTypeFactory.create(RelayContainerMenu::new, ResourceContainerData.STREAM_CODEC) + )); + Menus.INSTANCE.setDiskInterface(callback.register( + DISK_INTERFACE, + () -> extendedMenuTypeFactory.create(DiskInterfaceContainerMenu::new, ResourceContainerData.STREAM_CODEC) + )); + } + + protected final void registerLootFunctions(final RegistryCallback> callback) { + LootFunctions.INSTANCE.setStorageBlock(callback.register( + STORAGE_BLOCK, + () -> new LootItemFunctionType<>(MapCodec.unit(new StorageBlockLootItemFunction())) + )); + LootFunctions.INSTANCE.setPortableGrid(callback.register( + PORTABLE_GRID, + () -> new LootItemFunctionType<>(MapCodec.unit(new PortableGridLootItemFunction())) + )); + LootFunctions.INSTANCE.setEnergy(callback.register( + createIdentifier("energy"), + () -> new LootItemFunctionType<>(MapCodec.unit(new EnergyLootItemFunction())) + )); + } + + protected final void registerSounds(final RegistryCallback callback) { + Sounds.INSTANCE.setWrench(callback.register( + WRENCH, + () -> SoundEvent.createVariableRangeEvent(WRENCH) + )); + } + + protected final void registerRecipeSerializers(final RegistryCallback> callback) { + callback.register( + createIdentifier("upgrade_with_enchanted_book"), + UpgradeWithEnchantedBookRecipeSerializer::new + ); + } + + protected final void registerDataComponents(final RegistryCallback> callback) { + DataComponents.INSTANCE.setEnergy( + callback.register(createIdentifier("energy"), () -> DataComponentType.builder() + .persistent(Codec.LONG) + .networkSynchronized(ByteBufCodecs.VAR_LONG) + .build())); + DataComponents.INSTANCE.setNetworkLocation( + callback.register(createIdentifier("network_location"), () -> DataComponentType.builder() + .persistent(GlobalPos.CODEC) + .networkSynchronized(GlobalPos.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setStorageReference( + callback.register(createIdentifier("storage_reference"), () -> DataComponentType.builder() + .persistent(UUIDUtil.CODEC) + .networkSynchronized(UUIDUtil.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setRegulatorUpgradeState( + callback.register(createIdentifier("regulator_upgrade_state"), + () -> DataComponentType.builder() + .persistent(RegulatorUpgradeState.CODEC) + .networkSynchronized(RegulatorUpgradeState.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setSecurityCardBoundPlayer( + callback.register(createIdentifier("security_card_bound_player"), + () -> DataComponentType.builder() + .persistent(SecurityCardBoundPlayer.CODEC) + .networkSynchronized(SecurityCardBoundPlayer.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setSecurityCardPermissions( + callback.register(createIdentifier("security_card_permissions"), + () -> DataComponentType.builder() + .persistent(SecurityCardPermissions.CODEC) + .networkSynchronized(SecurityCardPermissions.STREAM_CODEC) + .build())); + DataComponents.INSTANCE.setConfigurationCardState( + callback.register(createIdentifier("configuration_card_state"), + () -> DataComponentType.builder() + .persistent(ConfigurationCardState.CODEC) + .networkSynchronized(ConfigurationCardState.STREAM_CODEC) + .build())); + } + + protected final void registerInventorySlotReference() { + PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry().register( + createIdentifier("inventory"), + InventorySlotReferenceFactory.INSTANCE + ); + } + + protected static boolean allowComponentsUpdateAnimation(final ItemStack oldStack, final ItemStack newStack) { + return oldStack.getItem() != newStack.getItem(); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractPlatform.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractPlatform.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractPlatform.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractPlatform.java index 70c66290a..7f90c8e2d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractPlatform.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/AbstractPlatform.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common; +package com.refinedmods.refinedstorage.platform.common; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; -import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; public abstract class AbstractPlatform implements Platform { private final MenuOpener menuOpener; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Config.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Config.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java index 738a7afd4..757c10b70 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Config.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Config.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common; +package com.refinedmods.refinedstorage.platform.common; -import com.refinedmods.refinedstorage2.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridMatrixCloseBehavior; -import com.refinedmods.refinedstorage2.platform.common.grid.GridSortingTypes; -import com.refinedmods.refinedstorage2.platform.common.support.stretching.ScreenSize; +import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridMatrixCloseBehavior; +import com.refinedmods.refinedstorage.platform.common.grid.GridSortingTypes; +import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSize; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Platform.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Platform.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java index c790ac1ac..86186925d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/Platform.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/Platform.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +package com.refinedmods.refinedstorage.platform.common; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java new file mode 100644 index 000000000..1509064ff --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformApiImpl.java @@ -0,0 +1,576 @@ +package com.refinedmods.refinedstorage.platform.common; + +import com.refinedmods.refinedstorage.api.core.component.ComponentMapFactory; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.NetworkBuilder; +import com.refinedmods.refinedstorage.api.network.NetworkComponent; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.NetworkBuilderImpl; +import com.refinedmods.refinedstorage.api.network.impl.NetworkFactory; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHints; +import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.security.BuiltinPermissions; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItemHelper; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.api.storage.StorageType; +import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.energy.EnergyItemHelper; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceProvider; +import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.platform.api.upgrade.BuiltinUpgradeDestinations; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.platform.common.grid.NoopGridSynchronizer; +import com.refinedmods.refinedstorage.platform.common.grid.screen.hint.GridInsertionHintsImpl; +import com.refinedmods.refinedstorage.platform.common.grid.screen.hint.ItemGridInsertionHint; +import com.refinedmods.refinedstorage.platform.common.grid.screen.hint.SingleItemGridInsertionHint; +import com.refinedmods.refinedstorage.platform.common.grid.strategy.CompositeGridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.common.grid.strategy.CompositeGridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.grid.strategy.CompositeGridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; +import com.refinedmods.refinedstorage.platform.common.storage.ClientStorageRepository; +import com.refinedmods.refinedstorage.platform.common.storage.StorageContainerItemHelperImpl; +import com.refinedmods.refinedstorage.platform.common.storage.StorageRepositoryImpl; +import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.CompositeStorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.CompositeStorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyItemHelperImpl; +import com.refinedmods.refinedstorage.platform.common.support.energy.ItemBlockEnergyStorage; +import com.refinedmods.refinedstorage.platform.common.support.energy.ItemEnergyStorage; +import com.refinedmods.refinedstorage.platform.common.support.network.ConnectionProviderImpl; +import com.refinedmods.refinedstorage.platform.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.platform.common.support.network.bounditem.CompositeSlotReferenceProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.bounditem.InventorySlotReference; +import com.refinedmods.refinedstorage.platform.common.support.network.bounditem.NetworkBoundItemHelperImpl; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.platform.common.support.registry.PlatformRegistryImpl; +import com.refinedmods.refinedstorage.platform.common.support.resource.CompositeRecipeModIngredientConverter; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceFactory; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResourceFactory; +import com.refinedmods.refinedstorage.platform.common.upgrade.BuiltinUpgradeDestinationsImpl; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeRegistryImpl; +import com.refinedmods.refinedstorage.platform.common.util.ServerEventQueue; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.CompositeWirelessTransmitterRangeModifier; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.PriorityQueue; +import java.util.Queue; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.saveddata.SavedData; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; +import static java.util.Objects.requireNonNull; + +public class PlatformApiImpl implements PlatformApi { + private final StorageRepository clientStorageRepository = new ClientStorageRepository( + C2SPackets::sendStorageInfoRequest + ); + private final ComponentMapFactory networkComponentMapFactory = + new ComponentMapFactory<>(); + private final NetworkBuilder networkBuilder = + new NetworkBuilderImpl(new NetworkFactory(networkComponentMapFactory)); + private final PlatformRegistry storageTypeRegistry = new PlatformRegistryImpl<>(); + private final PlatformRegistry resourceTypeRegistry = new PlatformRegistryImpl<>(); + private final PlatformRegistry gridSynchronizerRegistry = new PlatformRegistryImpl<>(); + private final PlatformRegistry importerTransferStrategyRegistry = + new PlatformRegistryImpl<>(); + private final PlatformRegistry exporterTransferStrategyRegistry = + new PlatformRegistryImpl<>(); + private final UpgradeRegistry upgradeRegistry = new UpgradeRegistryImpl(); + private final BuiltinUpgradeDestinations builtinUpgradeDestinations = new BuiltinUpgradeDestinationsImpl(); + private final Queue externalStorageProviderFactories = new PriorityQueue<>( + Comparator.comparingInt(PlatformExternalStorageProviderFactory::getPriority) + ); + private final Queue destructorStrategyFactories = new PriorityQueue<>( + Comparator.comparingInt(DestructorStrategyFactory::getPriority) + ); + private final Queue constructorStrategyFactories = new PriorityQueue<>( + Comparator.comparingInt(ConstructorStrategyFactory::getPriority) + ); + private final CompositeStorageMonitorInsertionStrategy storageMonitorInsertionStrategy = + new CompositeStorageMonitorInsertionStrategy(); + private final CompositeStorageMonitorExtractionStrategy storageMonitorExtractionStrategy = + new CompositeStorageMonitorExtractionStrategy(); + private final CompositeRecipeModIngredientConverter ingredientConverter = + new CompositeRecipeModIngredientConverter(); + private final StorageContainerItemHelper storageContainerItemHelper = new StorageContainerItemHelperImpl(); + private final List gridInsertionStrategyFactories = new ArrayList<>(); + private final GridInsertionHintsImpl gridInsertionHints = new GridInsertionHintsImpl( + new ItemGridInsertionHint(), + new SingleItemGridInsertionHint() + ); + private final List gridExtractionStrategyFactories = new ArrayList<>(); + private final List gridScrollingStrategyFactories = new ArrayList<>(); + private final ResourceFactory itemResourceFactory = new ItemResourceFactory(); + private final ResourceFactory fluidResourceFactory = new FluidResourceFactory(); + private final Set resourceFactories = new HashSet<>(); + private final Map, ResourceRendering> resourceRenderingMap = new HashMap<>(); + private final CompositeWirelessTransmitterRangeModifier wirelessTransmitterRangeModifier = + new CompositeWirelessTransmitterRangeModifier(); + private final EnergyItemHelper energyItemHelper = new EnergyItemHelperImpl(); + private final NetworkBoundItemHelper networkBoundItemHelper = new NetworkBoundItemHelperImpl(); + private final PlatformRegistry slotReferenceFactoryRegistry = new PlatformRegistryImpl<>(); + private final CompositeSlotReferenceProvider slotReferenceProvider = new CompositeSlotReferenceProvider(); + private final PlatformRegistry permissionRegistry = new PlatformRegistryImpl<>(); + + public PlatformApiImpl() { + gridSynchronizerRegistry.register(createIdentifier("off"), NoopGridSynchronizer.INSTANCE); + } + + @Override + public PlatformRegistry getStorageTypeRegistry() { + return storageTypeRegistry; + } + + @Override + public StorageRepository getClientStorageRepository() { + return clientStorageRepository; + } + + @SuppressWarnings("DataFlowIssue") // NeoForge makes null datafixer safe + @Override + public StorageRepository getStorageRepository(final Level level) { + final ServerLevel serverLevel = requireNonNull(level.getServer().getLevel(Level.OVERWORLD)); + return serverLevel.getDataStorage().computeIfAbsent(new SavedData.Factory<>( + StorageRepositoryImpl::new, + StorageRepositoryImpl::new, + null + ), StorageRepositoryImpl.NAME); + } + + @Override + public StorageContainerItemHelper getStorageContainerItemHelper() { + return storageContainerItemHelper; + } + + @Override + public PlatformRegistry getResourceTypeRegistry() { + return resourceTypeRegistry; + } + + @Override + public PlatformRegistry getImporterTransferStrategyRegistry() { + return importerTransferStrategyRegistry; + } + + @Override + public PlatformRegistry getExporterTransferStrategyRegistry() { + return exporterTransferStrategyRegistry; + } + + @Override + public void addExternalStorageProviderFactory(final PlatformExternalStorageProviderFactory factory) { + externalStorageProviderFactories.add(factory); + } + + @Override + public Collection getExternalStorageProviderFactories() { + return externalStorageProviderFactories; + } + + @Override + public Collection getDestructorStrategyFactories() { + return destructorStrategyFactories; + } + + @Override + public void addDestructorStrategyFactory(final DestructorStrategyFactory factory) { + destructorStrategyFactories.add(factory); + } + + @Override + public Collection getConstructorStrategyFactories() { + return constructorStrategyFactories; + } + + @Override + public void addConstructorStrategyFactory(final ConstructorStrategyFactory factory) { + constructorStrategyFactories.add(factory); + } + + @Override + public void addStorageMonitorExtractionStrategy(final StorageMonitorExtractionStrategy strategy) { + storageMonitorExtractionStrategy.addStrategy(strategy); + } + + @Override + public StorageMonitorExtractionStrategy getStorageMonitorExtractionStrategy() { + return storageMonitorExtractionStrategy; + } + + @Override + public void addStorageMonitorInsertionStrategy(final StorageMonitorInsertionStrategy strategy) { + storageMonitorInsertionStrategy.addStrategy(strategy); + } + + @Override + public StorageMonitorInsertionStrategy getStorageMonitorInsertionStrategy() { + return storageMonitorInsertionStrategy; + } + + @Override + public ComponentMapFactory getNetworkComponentMapFactory() { + return networkComponentMapFactory; + } + + @Override + public PlatformRegistry getGridSynchronizerRegistry() { + return gridSynchronizerRegistry; + } + + @Override + public UpgradeRegistry getUpgradeRegistry() { + return upgradeRegistry; + } + + @Override + public BuiltinUpgradeDestinations getBuiltinUpgradeDestinations() { + return builtinUpgradeDestinations; + } + + @Override + public InWorldNetworkNodeContainer createInWorldNetworkNodeContainer( + final BlockEntity blockEntity, + final NetworkNode node, + final String name, + final int priority, + final ConnectionLogic connectionLogic, + @Nullable final Supplier keyProvider + ) { + return new InWorldNetworkNodeContainerImpl(blockEntity, node, name, priority, connectionLogic, keyProvider); + } + + @Override + public void onNetworkNodeContainerInitialized(final InWorldNetworkNodeContainer container, + @Nullable final Level level, + @Nullable final Runnable callback) { + if (level == null || level.isClientSide()) { + return; + } + final ConnectionProviderImpl connectionProvider = new ConnectionProviderImpl(level); + ServerEventQueue.queue(() -> { + // The container could've been removed by the time it has been placed, and by the time the event queue has + // run. In that case, don't initialize the network node because it no longer exists. + // This is a workaround for the "Carry On" mod. The mod places the block (which creates a block entity and + // requests this network node initialization) and then overrides the placed block entity with their own + // block entity. This triggers a new initialization, but then this one can no longer run! + if (container.isRemoved()) { + return; + } + networkBuilder.initialize(container, connectionProvider); + if (callback != null) { + callback.run(); + } + }); + } + + @Override + public void onNetworkNodeContainerRemoved(final InWorldNetworkNodeContainer container, + @Nullable final Level level) { + if (level == null || level.isClientSide()) { + return; + } + // "Carry On" mod places the block (which creates a block entity and requests network node initialization) + // and then overrides the placed block entity with their own information. + // However, when the placed block entity is replaced, the server event queue hasn't run yet and there is + // no network loaded yet, even though the network node initialization was requested. + // Stop continuing here to avoid further code failing due to a missing network. + if (container.getNode().getNetwork() == null) { + return; + } + final ConnectionProviderImpl connectionProvider = new ConnectionProviderImpl(level); + networkBuilder.remove(container, connectionProvider); + } + + @Override + public void onNetworkNodeContainerUpdated(final InWorldNetworkNodeContainer container, + @Nullable final Level level) { + if (level == null || level.isClientSide() || container.getNode().getNetwork() == null) { + return; + } + final ConnectionProviderImpl connectionProvider = new ConnectionProviderImpl(level); + networkBuilder.update(container, connectionProvider); + } + + @Override + public GridInsertionStrategy createGridInsertionStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + return new CompositeGridInsertionStrategy( + Platform.INSTANCE.getDefaultGridInsertionStrategyFactory().create( + containerMenu, + player, + grid + ), + gridInsertionStrategyFactories.stream().map(f -> f.create( + containerMenu, + player, + grid + )).toList() + ); + } + + @Override + public void addGridInsertionStrategyFactory(final GridInsertionStrategyFactory insertionStrategyFactory) { + gridInsertionStrategyFactories.add(insertionStrategyFactory); + } + + @Override + public void addAlternativeGridInsertionHint(final GridInsertionHint hint) { + gridInsertionHints.addAlternativeHint(hint); + } + + @Override + public GridInsertionHints getGridInsertionHints() { + return gridInsertionHints; + } + + @Override + public GridExtractionStrategy createGridExtractionStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + final List strategies = gridExtractionStrategyFactories + .stream() + .map(f -> f.create(containerMenu, player, grid)) + .toList(); + return new CompositeGridExtractionStrategy(strategies); + } + + @Override + public void addGridExtractionStrategyFactory(final GridExtractionStrategyFactory extractionStrategyFactory) { + gridExtractionStrategyFactories.add(extractionStrategyFactory); + } + + @Override + public GridScrollingStrategy createGridScrollingStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + final List strategies = gridScrollingStrategyFactories + .stream() + .map(f -> f.create(containerMenu, player, grid)) + .toList(); + return new CompositeGridScrollingStrategy(strategies); + } + + @Override + public void addGridScrollingStrategyFactory(final GridScrollingStrategyFactory scrollingStrategyFactory) { + gridScrollingStrategyFactories.add(scrollingStrategyFactory); + } + + @Override + public void addResourceFactory(final ResourceFactory factory) { + resourceFactories.add(factory); + } + + @Override + public ResourceFactory getItemResourceFactory() { + return itemResourceFactory; + } + + @Override + public StorageType getItemStorageType() { + return StorageTypes.ITEM; + } + + @Override + public ResourceFactory getFluidResourceFactory() { + return fluidResourceFactory; + } + + @Override + public StorageType getFluidStorageType() { + return StorageTypes.FLUID; + } + + @Override + public Set getAlternativeResourceFactories() { + return resourceFactories; + } + + @Override + public void registerResourceRendering(final Class resourceClass, + final ResourceRendering rendering) { + resourceRenderingMap.put(resourceClass, rendering); + } + + @Override + public ResourceRendering getResourceRendering(final ResourceKey resource) { + return resourceRenderingMap.get(resource.getClass()); + } + + @Override + public void addIngredientConverter(final RecipeModIngredientConverter converter) { + ingredientConverter.addConverter(converter); + } + + @Override + public RecipeModIngredientConverter getIngredientConverter() { + return ingredientConverter; + } + + @Override + public void addWirelessTransmitterRangeModifier(final WirelessTransmitterRangeModifier rangeModifier) { + wirelessTransmitterRangeModifier.addModifier(rangeModifier); + } + + @Override + public WirelessTransmitterRangeModifier getWirelessTransmitterRangeModifier() { + return wirelessTransmitterRangeModifier; + } + + @Override + public Optional getEnergyStorage(final ItemStack stack) { + return Platform.INSTANCE.getEnergyStorage(stack); + } + + @Override + public EnergyItemHelper getEnergyItemHelper() { + return energyItemHelper; + } + + @Override + public EnergyStorage asItemEnergyStorage(final EnergyStorage energyStorage, + final ItemStack stack) { + return new ItemEnergyStorage(stack, energyStorage); + } + + @Override + public EnergyStorage asBlockItemEnergyStorage(final EnergyStorage energyStorage, + final ItemStack stack, + final BlockEntityType blockEntityType) { + return new ItemBlockEnergyStorage(energyStorage, stack, blockEntityType); + } + + @Override + public NetworkBoundItemHelper getNetworkBoundItemHelper() { + return networkBoundItemHelper; + } + + @Override + public PlatformRegistry getSlotReferenceFactoryRegistry() { + return slotReferenceFactoryRegistry; + } + + @Override + public void addSlotReferenceProvider(final SlotReferenceProvider provider) { + slotReferenceProvider.addProvider(provider); + } + + @Override + public SlotReference createInventorySlotReference(final Player player, final InteractionHand hand) { + return InventorySlotReference.of(player, hand); + } + + @Override + public void useNetworkBoundItem(final Player player, final Item... items) { + final Set validItems = new HashSet<>(Arrays.asList(items)); + slotReferenceProvider.findForUse(player, items[0], validItems).ifPresent(C2SPackets::sendUseNetworkBoundItem); + } + + @Override + public BuiltinPermissions getBuiltinPermissions() { + return BuiltinPermission.VIEW; + } + + @Override + public PlatformRegistry getPermissionRegistry() { + return permissionRegistry; + } + + @Override + public SecurityPolicy createDefaultSecurityPolicy() { + return new SecurityPolicy(permissionRegistry.getAll() + .stream() + .filter(PlatformPermission::isAllowedByDefault) + .collect(Collectors.toSet())); + } + + @Override + public void sendNoPermissionToOpenMessage(final ServerPlayer player, final Component target) { + sendNoPermissionMessage(player, createTranslation("misc", "no_permission.open", target)); + } + + @Override + public void sendNoPermissionMessage(final ServerPlayer player, final Component message) { + S2CPackets.sendNoPermission(player, message); + } + + @Override + public boolean canPlaceNetworkNode(final ServerPlayer player, + final Level level, + final BlockPos pos, + final BlockState state) { + for (final Direction direction : Direction.values()) { + final BlockPos adjacentPos = pos.relative(direction); + final BlockEntity adjacentBlockEntity = level.getBlockEntity(adjacentPos); + if (!(adjacentBlockEntity instanceof NetworkNodeContainerBlockEntity adjacentContainerBlockEntity)) { + continue; + } + if (!adjacentContainerBlockEntity.canBuild(player)) { + PlatformApi.INSTANCE.sendNoPermissionMessage( + player, + createTranslation("misc", "no_permission.build.place", state.getBlock().getName()) + ); + return false; + } + } + return true; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformProxy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformProxy.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java index 844b1d4b0..8c246f989 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformProxy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/PlatformProxy.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +package com.refinedmods.refinedstorage.platform.common; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.List; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java index a98f98010..4cf94ebaa 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItem.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.configurationcard; +package com.refinedmods.refinedstorage.platform.common.configurationcard; -import com.refinedmods.refinedstorage2.platform.api.configurationcard.ConfigurationCardTarget; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.platform.api.configurationcard.ConfigurationCardTarget; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.content.DataComponents; import java.util.List; import java.util.Optional; @@ -28,7 +28,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class ConfigurationCardItem extends Item { private static final Component EMPTY_HELP = createTranslation("item", "configuration_card.empty_help"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java index 3f1e46bcb..f1a7e3e40 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardItemPropertyFunction.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.configurationcard; +package com.refinedmods.refinedstorage.platform.common.configurationcard; import javax.annotation.Nullable; @@ -8,7 +8,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class ConfigurationCardItemPropertyFunction implements ClampedItemPropertyFunction { public static final ResourceLocation NAME = createIdentifier("configuration_card_active"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardState.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardState.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardState.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardState.java index 58fbc7dcc..974d2cc57 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/ConfigurationCardState.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/ConfigurationCardState.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.configurationcard; +package com.refinedmods.refinedstorage.platform.common.configurationcard; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/package-info.java new file mode 100644 index 000000000..1bd7a4c31 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/configurationcard/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.configurationcard; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java index 3e29246be..37d2cd2b2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractConstructorDestructorBlock.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalCableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.DirectionalCableBlockShapes; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalCableBlock; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.platform.common.support.DirectionalCableBlockShapes; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/AbstractItemConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/AbstractItemConstructorStrategy.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java index fd1086858..30d356e43 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/AbstractItemConstructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/AbstractItemConstructorStrategy.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategy.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategy.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategy.java index 923363145..ced1d2bd1 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategy.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.List; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java index 5177cf9d8..33c67f04a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/BlockBreakDestructorStrategyFactory.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeItem; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeItem; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.common.content.Items; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeConstructorStrategy.java new file mode 100644 index 000000000..f8bac9b87 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeConstructorStrategy.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; + +import java.util.Collections; +import java.util.List; + +import net.minecraft.world.entity.player.Player; + +class CompositeConstructorStrategy implements ConstructorStrategy { + private final List strategies; + + CompositeConstructorStrategy(final List strategies) { + this.strategies = Collections.unmodifiableList(strategies); + } + + @Override + public boolean apply(final ResourceKey resource, + final Actor actor, + final Player actingPlayer, + final Network network) { + for (final ConstructorStrategy strategy : strategies) { + if (strategy.apply(resource, actor, actingPlayer, network)) { + return true; + } + } + return false; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeDestructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeDestructorStrategy.java new file mode 100644 index 000000000..76fc966c0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/CompositeDestructorStrategy.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; + +import java.util.Collections; +import java.util.List; +import java.util.function.Supplier; + +import net.minecraft.world.entity.player.Player; + +class CompositeDestructorStrategy implements DestructorStrategy { + private final List strategies; + + CompositeDestructorStrategy(final List strategies) { + this.strategies = Collections.unmodifiableList(strategies); + } + + @Override + public boolean apply(final Filter filter, + final Actor actor, + final Supplier networkSupplier, + final Player actingPlayer) { + for (final DestructorStrategy strategy : strategies) { + if (strategy.apply(filter, actor, networkSupplier, actingPlayer)) { + return true; + } + } + return false; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlock.java new file mode 100644 index 000000000..99658bcaf --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlock.java @@ -0,0 +1,49 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ConstructorBlock extends AbstractConstructorDestructorBlock< + ConstructorBlock, ConstructorBlockEntity, BaseBlockItem + > implements BlockItemProvider { + private static final Component HELP = createTranslation("item", "constructor.help"); + + public ConstructorBlock(final DyeColor color, final MutableComponent name) { + super(color, name, new NetworkNodeBlockEntityTicker<>( + BlockEntities.INSTANCE::getConstructor, + ACTIVE + )); + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getConstructor(); + } + + @Nullable + @Override + public BlockEntity newBlockEntity(final BlockPos blockPos, final BlockState blockState) { + return new ConstructorBlockEntity(blockPos, blockState); + } + + @Override + public BaseBlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlockEntity.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlockEntity.java index 27e12c396..5a35a2bfc 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorBlockEntity.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNodeActor; -import com.refinedmods.refinedstorage2.api.network.node.task.Task; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategy; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.NetworkNodeActor; +import com.refinedmods.refinedstorage.api.network.node.task.Task; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; import java.util.ArrayList; import java.util.Collection; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorContainerMenu.java new file mode 100644 index 000000000..4406b8c09 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorContainerMenu.java @@ -0,0 +1,65 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSchedulingContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; + +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ConstructorContainerMenu extends AbstractSchedulingContainerMenu { + private static final MutableComponent FILTER_HELP = createTranslation("gui", "constructor.filter_help"); + + public ConstructorContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { + super( + Menus.INSTANCE.getConstructor(), + syncId, + playerInventory.player, + resourceContainerData, + UpgradeDestinations.CONSTRUCTOR, + FILTER_HELP + ); + } + + ConstructorContainerMenu(final int syncId, + final Player player, + final ConstructorBlockEntity constructor, + final ResourceContainer resourceContainer, + final UpgradeContainer upgradeContainer) { + super( + Menus.INSTANCE.getConstructor(), + syncId, + player, + resourceContainer, + upgradeContainer, + constructor, + FILTER_HELP + ); + } + + @Override + protected void registerClientProperties() { + super.registerClientProperties(); + registerProperty(new ClientProperty<>(ConstructorDestructorPropertyTypes.DROP_ITEMS, false)); + } + + @Override + protected void registerServerProperties(final ConstructorBlockEntity blockEntity) { + super.registerServerProperties(blockEntity); + registerProperty(new ServerProperty<>( + ConstructorDestructorPropertyTypes.DROP_ITEMS, + blockEntity::isDropItems, + blockEntity::setDropItems + )); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java new file mode 100644 index 000000000..f81b1cd8a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +final class ConstructorDestructorPropertyTypes { + static final PropertyType PICKUP_ITEMS = PropertyTypes.createBooleanProperty( + createIdentifier("pickup_items") + ); + static final PropertyType DROP_ITEMS = PropertyTypes.createBooleanProperty( + createIdentifier("drop_items") + ); + + private ConstructorDestructorPropertyTypes() { + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java new file mode 100644 index 000000000..a9b5917c5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java @@ -0,0 +1,22 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +class ConstructorDropItemsSideButtonWidget extends AbstractYesNoSideButtonWidget { + ConstructorDropItemsSideButtonWidget(final ClientProperty property) { + super(property, createTranslation("gui", "constructor.drop_items")); + } + + @Override + protected int getXTexture() { + return Boolean.TRUE.equals(property.getValue()) ? 80 : 64; + } + + @Override + protected int getYTexture() { + return 16; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorScreen.java new file mode 100644 index 000000000..6ed01109e --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorScreen.java @@ -0,0 +1,30 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.widget.SchedulingModeSideButtonWidget; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; + +public class ConstructorScreen extends AbstractFilterScreen { + public ConstructorScreen(final ConstructorContainerMenu menu, + final Inventory playerInventory, + final Component text) { + super(menu, playerInventory, text); + } + + @Override + protected void init() { + super.init(); + addSideButton(new FuzzyModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FUZZY_MODE), + () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK + )); + addSideButton(new SchedulingModeSideButtonWidget(getMenu().getProperty(PropertyTypes.SCHEDULING_MODE))); + addSideButton(new ConstructorDropItemsSideButtonWidget( + getMenu().getProperty(ConstructorDestructorPropertyTypes.DROP_ITEMS) + )); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlock.java new file mode 100644 index 000000000..d8bcf6cf0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlock.java @@ -0,0 +1,49 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class DestructorBlock extends AbstractConstructorDestructorBlock< + DestructorBlock, DestructorBlockEntity, BaseBlockItem + > implements BlockItemProvider { + private static final Component HELP = createTranslation("item", "destructor.help"); + + public DestructorBlock(final DyeColor color, final MutableComponent name) { + super(color, name, new NetworkNodeBlockEntityTicker<>( + BlockEntities.INSTANCE::getDestructor, + ACTIVE + )); + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getDestructor(); + } + + @Nullable + @Override + public BlockEntity newBlockEntity(final BlockPos blockPos, final BlockState blockState) { + return new DestructorBlockEntity(blockPos, blockState); + } + + @Override + public BaseBlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlockEntity.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlockEntity.java index 7a72a8546..205cdebe9 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorBlockEntity.java @@ -1,24 +1,24 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNodeActor; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.NetworkNodeActor; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorContainerMenu.java new file mode 100644 index 000000000..73a3452da --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorContainerMenu.java @@ -0,0 +1,78 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSimpleFilterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; + +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class DestructorContainerMenu extends AbstractSimpleFilterContainerMenu { + private static final MutableComponent FILTER_HELP = createTranslation("gui", "destructor.filter_help"); + + public DestructorContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { + super( + Menus.INSTANCE.getDestructor(), + syncId, + playerInventory.player, + resourceContainerData, + UpgradeDestinations.DESTRUCTOR, + FILTER_HELP + ); + } + + DestructorContainerMenu(final int syncId, + final Player player, + final DestructorBlockEntity destructor, + final ResourceContainer resourceContainer, + final UpgradeContainer upgradeContainer) { + super( + Menus.INSTANCE.getDestructor(), + syncId, + player, + resourceContainer, + upgradeContainer, + destructor, + FILTER_HELP + ); + } + + @Override + protected void registerClientProperties() { + registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); + registerProperty(new ClientProperty<>(PropertyTypes.FILTER_MODE, FilterMode.BLOCK)); + registerProperty(new ClientProperty<>(ConstructorDestructorPropertyTypes.PICKUP_ITEMS, false)); + } + + @Override + protected void registerServerProperties(final DestructorBlockEntity blockEntity) { + registerProperty(new ServerProperty<>( + PropertyTypes.REDSTONE_MODE, + blockEntity::getRedstoneMode, + blockEntity::setRedstoneMode + )); + registerProperty(new ServerProperty<>( + PropertyTypes.FILTER_MODE, + blockEntity::getFilterMode, + blockEntity::setFilterMode + )); + registerProperty(new ServerProperty<>( + ConstructorDestructorPropertyTypes.PICKUP_ITEMS, + blockEntity::isPickupItems, + blockEntity::setPickupItems + )); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java new file mode 100644 index 000000000..ab3af7fe7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java @@ -0,0 +1,22 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +class DestructorPickupItemsSideButtonWidget extends AbstractYesNoSideButtonWidget { + DestructorPickupItemsSideButtonWidget(final ClientProperty property) { + super(property, createTranslation("gui", "destructor.pickup_items")); + } + + @Override + protected int getXTexture() { + return Boolean.TRUE.equals(property.getValue()) ? 64 : 80; + } + + @Override + protected int getYTexture() { + return 0; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorScreen.java new file mode 100644 index 000000000..b1137fc1d --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorScreen.java @@ -0,0 +1,29 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.common.storage.FilterModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class DestructorScreen extends AbstractFilterScreen { + public DestructorScreen(final DestructorContainerMenu menu, final Inventory playerInventory, final Component text) { + super(menu, playerInventory, text); + } + + @Override + protected void init() { + super.init(); + addSideButton(new FilterModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FILTER_MODE), + createTranslation("gui", "destructor.filter_mode.allow.help"), + createTranslation("gui", "destructor.filter_mode.block.help") + )); + addSideButton(new DestructorPickupItemsSideButtonWidget( + getMenu().getProperty(ConstructorDestructorPropertyTypes.PICKUP_ITEMS) + )); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategy.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategy.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategy.java index f3aabbc0c..efee55964 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategy.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java new file mode 100644 index 000000000..c4b3a49c5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java @@ -0,0 +1,22 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; + +import java.util.Optional; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class FluidBreakDestructorStrategyFactory implements DestructorStrategyFactory { + @Override + public Optional create(final ServerLevel level, + final BlockPos pos, + final Direction direction, + final UpgradeState upgradeState, + final boolean pickupItems) { + return Optional.of(new FluidBreakDestructorStrategy(level, pos)); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemDropConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemDropConstructorStrategy.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java index 8f7d46595..5d531c896 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemDropConstructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategy.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java new file mode 100644 index 000000000..ee9b0b2fc --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java @@ -0,0 +1,36 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.common.content.Items; + +import java.util.Optional; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class ItemDropConstructorStrategyFactory implements ConstructorStrategyFactory { + @Override + public Optional create(final ServerLevel level, + final BlockPos pos, + final Direction direction, + final UpgradeState upgradeState, + final boolean dropItems) { + if (!dropItems) { + return Optional.empty(); + } + return Optional.of(new ItemDropConstructorStrategy( + level, + pos, + direction, + upgradeState.has(Items.INSTANCE.getStackUpgrade()) + )); + } + + @Override + public int getPriority() { + return -1; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemPickupDestructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategy.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemPickupDestructorStrategy.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategy.java index 43c6a13e8..483ee6164 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemPickupDestructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategy.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.filter.Filter; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.List; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java new file mode 100644 index 000000000..58b2d98d1 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java @@ -0,0 +1,30 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategy; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.DestructorStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; + +import java.util.Optional; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class ItemPickupDestructorStrategyFactory implements DestructorStrategyFactory { + @Override + public Optional create(final ServerLevel level, + final BlockPos pos, + final Direction direction, + final UpgradeState upgradeState, + final boolean pickupItems) { + if (!pickupItems) { + return Optional.empty(); + } + return Optional.of(new ItemPickupDestructorStrategy(level, pos)); + } + + @Override + public int getPriority() { + return -1; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java index 9a6820ead..fc9a8800c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceBlockConstructorStrategy.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java index 7033f24be..52477ba8d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFireworksConstructorStrategy.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java new file mode 100644 index 000000000..4b8cfe1dd --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java @@ -0,0 +1,59 @@ +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.constructordestructor.ConstructorStrategy; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.player.Player; + +public class PlaceFluidConstructorStrategy implements ConstructorStrategy { + protected final ServerLevel level; + protected final BlockPos pos; + protected final Direction direction; + + public PlaceFluidConstructorStrategy(final ServerLevel level, final BlockPos pos, final Direction direction) { + this.level = level; + this.pos = pos; + this.direction = direction; + } + + @Override + public boolean apply( + final ResourceKey resource, + final Actor actor, + final Player actingPlayer, + final Network network + ) { + if (!level.isLoaded(pos)) { + return false; + } + if (!(resource instanceof FluidResource fluidResource)) { + return false; + } + final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); + final long bucketAmount = Platform.INSTANCE.getBucketAmount(); + final long extractedAmount = storageChannel.extract( + fluidResource, + bucketAmount, + Action.SIMULATE, + actor + ); + if (bucketAmount != extractedAmount) { + return false; + } + final boolean success = Platform.INSTANCE.placeFluid(level, pos, direction, actingPlayer, fluidResource); + if (success) { + storageChannel.extract(fluidResource, bucketAmount, Action.EXECUTE, actor); + } + return success; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/package-info.java new file mode 100644 index 000000000..e56d19073 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.constructordestructor; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockColorMap.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockColorMap.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockColorMap.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockColorMap.java index 3732ec934..78903ff2d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockColorMap.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockColorMap.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; import java.util.Objects; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockConstants.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockConstants.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockConstants.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockConstants.java index 8a5daa3aa..06eb6bead 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockConstants.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockConstants.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntities.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntities.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java index 15e2938c6..668b65a4d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntities.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntities.java @@ -1,30 +1,30 @@ -package com.refinedmods.refinedstorage2.platform.common.content; - -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.DestructorBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.detector.DetectorBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.exporter.ExporterBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.grid.GridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.importer.ImporterBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.networking.RelayBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterBlockEntity; +package com.refinedmods.refinedstorage.platform.common.content; + +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorBlockEntity; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorBlockEntity; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.detector.DetectorBlockEntity; +import com.refinedmods.refinedstorage.platform.common.exporter.ExporterBlockEntity; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.grid.GridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.importer.ImporterBlockEntity; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlockEntity; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlockEntity; +import com.refinedmods.refinedstorage.platform.common.networking.RelayBlockEntity; +import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterBlockEntity; import java.util.EnumMap; import java.util.Map; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntityTypeFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntityTypeFactory.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntityTypeFactory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntityTypeFactory.java index 79b72267e..215520e30 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntityTypeFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockEntityTypeFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.Block; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockFactory.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockFactory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockFactory.java index fc9361097..b5db3628c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/BlockFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java index 893e9cf95..b81e21c95 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Blocks.java @@ -1,37 +1,37 @@ -package com.refinedmods.refinedstorage2.platform.common.content; - -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorBlock; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.DestructorBlock; -import com.refinedmods.refinedstorage2.platform.common.controller.AbstractControllerBlock; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerBlock; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerBlockItem; -import com.refinedmods.refinedstorage2.platform.common.controller.CreativeControllerBlock; -import com.refinedmods.refinedstorage2.platform.common.controller.CreativeControllerBlockItem; -import com.refinedmods.refinedstorage2.platform.common.detector.DetectorBlock; -import com.refinedmods.refinedstorage2.platform.common.exporter.ExporterBlock; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridBlock; -import com.refinedmods.refinedstorage2.platform.common.grid.GridBlock; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceBlock; -import com.refinedmods.refinedstorage2.platform.common.importer.ImporterBlock; -import com.refinedmods.refinedstorage2.platform.common.networking.CableBlock; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverBlock; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterBlock; -import com.refinedmods.refinedstorage2.platform.common.networking.RelayBlock; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlock; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.SimpleBlock; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterBlock; +package com.refinedmods.refinedstorage.platform.common.content; + +import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorBlock; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorBlock; +import com.refinedmods.refinedstorage.platform.common.controller.AbstractControllerBlock; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlock; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockItem; +import com.refinedmods.refinedstorage.platform.common.controller.CreativeControllerBlock; +import com.refinedmods.refinedstorage.platform.common.controller.CreativeControllerBlockItem; +import com.refinedmods.refinedstorage.platform.common.detector.DetectorBlock; +import com.refinedmods.refinedstorage.platform.common.exporter.ExporterBlock; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridBlock; +import com.refinedmods.refinedstorage.platform.common.grid.GridBlock; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlock; +import com.refinedmods.refinedstorage.platform.common.importer.ImporterBlock; +import com.refinedmods.refinedstorage.platform.common.networking.CableBlock; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlock; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlock; +import com.refinedmods.refinedstorage.platform.common.networking.RelayBlock; +import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlock; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceBlock; +import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageBlock; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlock; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlock; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlock; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlock; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.SimpleBlock; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterBlock; import java.util.EnumMap; import java.util.Map; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ColorMap.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ColorMap.java similarity index 97% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ColorMap.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ColorMap.java index 484101f96..f003f4160 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ColorMap.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ColorMap.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import java.util.Collection; import java.util.Comparator; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java index 9e344f9bd..74091a182 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentIds.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; -import com.refinedmods.refinedstorage2.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public final class ContentIds { public static final ResourceLocation DISK_DRIVE = createIdentifier("disk_drive"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentNames.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentNames.java index 8f9247f13..e4ed7de26 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentNames.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ContentNames.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public final class ContentNames { public static final String MOD_TRANSLATION_KEY = "mod." + MOD_ID; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java similarity index 95% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java index 5594bd87c..23d829a47 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/CreativeModeTabItems.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; -import com.refinedmods.refinedstorage2.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; import java.util.Arrays; import java.util.function.Consumer; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DataComponents.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DataComponents.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DataComponents.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DataComponents.java index e59fa268c..ba8107a77 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DataComponents.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DataComponents.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; -import com.refinedmods.refinedstorage2.platform.common.configurationcard.ConfigurationCardState; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardBoundPlayer; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardPermissions; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeState; +import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardState; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardBoundPlayer; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardPermissions; +import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeState; import java.util.UUID; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DefaultEnergyUsage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DefaultEnergyUsage.java similarity index 97% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DefaultEnergyUsage.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DefaultEnergyUsage.java index 1e0b6c8a1..be4e752ad 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DefaultEnergyUsage.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DefaultEnergyUsage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; public final class DefaultEnergyUsage { public static final long CABLE = 0; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DirectRegistryCallback.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DirectRegistryCallback.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DirectRegistryCallback.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DirectRegistryCallback.java index d80815598..a8b3dbe03 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/DirectRegistryCallback.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/DirectRegistryCallback.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ExtendedMenuTypeFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ExtendedMenuTypeFactory.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ExtendedMenuTypeFactory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ExtendedMenuTypeFactory.java index 16918adeb..e1175e812 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ExtendedMenuTypeFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/ExtendedMenuTypeFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java index 98cfbeeff..df4f724a3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Items.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Items.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.platform.common.content; - -import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerBlockItem; -import com.refinedmods.refinedstorage2.platform.common.controller.CreativeControllerBlockItem; -import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridItem; -import com.refinedmods.refinedstorage2.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage2.platform.common.security.FallbackSecurityCardItem; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardItem; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; +package com.refinedmods.refinedstorage.platform.common.content; + +import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerBlockItem; +import com.refinedmods.refinedstorage.platform.common.controller.CreativeControllerBlockItem; +import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridItem; +import com.refinedmods.refinedstorage.platform.common.misc.ProcessorItem; +import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardItem; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItem; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; import java.util.ArrayList; import java.util.Collections; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/KeyMappings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/KeyMappings.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/KeyMappings.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/KeyMappings.java index 4da7ced0e..e4235a948 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/KeyMappings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/KeyMappings.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import java.util.Objects; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/LootFunctions.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/LootFunctions.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/LootFunctions.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/LootFunctions.java index b019d788f..e31dba985 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/LootFunctions.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/LootFunctions.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridLootItemFunction; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.StorageBlockLootItemFunction; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyLootItemFunction; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridLootItemFunction; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.StorageBlockLootItemFunction; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyLootItemFunction; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/MenuTypeFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/MenuTypeFactory.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/MenuTypeFactory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/MenuTypeFactory.java index 244565804..ec3e58f6a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/MenuTypeFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/MenuTypeFactory.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Menus.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Menus.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Menus.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Menus.java index 4faa928f5..c8c132c8f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Menus.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Menus.java @@ -1,30 +1,30 @@ -package com.refinedmods.refinedstorage2.platform.common.content; - -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.DestructorContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.detector.DetectorContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.exporter.ExporterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.GridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.importer.ImporterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.networking.RelayContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.security.FallbackSecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridItemContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; +package com.refinedmods.refinedstorage.platform.common.content; + +import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorContainerMenu; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorContainerMenu; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerContainerMenu; +import com.refinedmods.refinedstorage.platform.common.detector.DetectorContainerMenu; +import com.refinedmods.refinedstorage.platform.common.exporter.ExporterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.GridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.importer.ImporterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.networking.RelayContainerMenu; +import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardContainerMenu; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardContainerMenu; +import com.refinedmods.refinedstorage.platform.common.security.SecurityManagerContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridItemContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.FluidStorageBlockContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.storageblock.ItemStorageBlockContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorContainerMenu; +import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeContainerMenu; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/RegistryCallback.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/RegistryCallback.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/RegistryCallback.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/RegistryCallback.java index 62370b488..abc5a4d5b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/RegistryCallback.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/RegistryCallback.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Sounds.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Sounds.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Sounds.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Sounds.java index 148896013..93e32482c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Sounds.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Sounds.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import java.util.Objects; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Tags.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Tags.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Tags.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Tags.java index 4c8dd0fd6..7181bd4ab 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Tags.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/Tags.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.content; +package com.refinedmods.refinedstorage.platform.common.content; import net.minecraft.core.registries.Registries; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public final class Tags { public static final TagKey CABLES = createTag("cables"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/package-info.java new file mode 100644 index 000000000..98aa40e05 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/content/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.content; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/AbstractControllerBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/AbstractControllerBlock.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/AbstractControllerBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/AbstractControllerBlock.java index 0619f81fe..f3f2cf266 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/AbstractControllerBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/AbstractControllerBlock.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; +package com.refinedmods.refinedstorage.platform.common.controller; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.MutableComponent; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlock.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlock.java index 1359ff2dc..4dc5b63bb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlock.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; +package com.refinedmods.refinedstorage.platform.common.controller; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntity.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntity.java index 7eddb3e08..f2949e14e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntity.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.support.energy.TransferableBlockEntityEnergy; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.energy.BlockEntityEnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.support.energy.CreativeEnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.support.energy.ItemBlockEnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +package com.refinedmods.refinedstorage.platform.common.controller; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; +import com.refinedmods.refinedstorage.platform.api.support.energy.TransferableBlockEntityEnergy; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.energy.BlockEntityEnergyStorage; +import com.refinedmods.refinedstorage.platform.common.support.energy.CreativeEnergyStorage; +import com.refinedmods.refinedstorage.platform.common.support.energy.ItemBlockEnergyStorage; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; import com.google.common.util.concurrent.RateLimiter; import net.minecraft.core.BlockPos; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntityTicker.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntityTicker.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntityTicker.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntityTicker.java index dfdba5164..301b0a961 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntityTicker.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockEntityTicker.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; +package com.refinedmods.refinedstorage.platform.common.controller; -import com.refinedmods.refinedstorage2.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerNetworkNode; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockItem.java new file mode 100644 index 000000000..b4c5c3887 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerBlockItem.java @@ -0,0 +1,66 @@ +package com.refinedmods.refinedstorage.platform.common.controller; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.support.energy.AbstractEnergyBlockItem; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; + +import java.util.Optional; + +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ControllerBlockItem extends AbstractEnergyBlockItem { + private final Block block; + + ControllerBlockItem(final Block block) { + super(block, new Item.Properties().stacksTo(1), PlatformApi.INSTANCE.getEnergyItemHelper()); + this.block = block; + } + + @Override + public Component getDescription() { + return block.getName(); + } + + @Override + public Component getName(final ItemStack stack) { + return block.getName(); + } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(createTranslation("item", "controller.help"))); + } + + public EnergyStorage createEnergyStorage(final ItemStack stack) { + final EnergyStorage energyStorage = new EnergyStorageImpl( + Platform.INSTANCE.getConfig().getController().getEnergyCapacity() + ); + return PlatformApi.INSTANCE.asBlockItemEnergyStorage( + energyStorage, + stack, + BlockEntities.INSTANCE.getController() + ); + } + + @Override + protected boolean placeBlock(final BlockPlaceContext ctx, final BlockState state) { + if (ctx.getPlayer() instanceof ServerPlayer serverPlayer + && !(PlatformApi.INSTANCE.canPlaceNetworkNode(serverPlayer, ctx.getLevel(), ctx.getClickedPos(), state))) { + return false; + } + return super.placeBlock(ctx, state); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerContainerMenu.java new file mode 100644 index 000000000..0147027fd --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerContainerMenu.java @@ -0,0 +1,59 @@ +package com.refinedmods.refinedstorage.platform.common.controller; + +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyInfo; + +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +public class ControllerContainerMenu extends AbstractBaseContainerMenu implements EnergyContainerMenu { + private final EnergyInfo energyInfo; + + public ControllerContainerMenu(final int syncId, + final Inventory playerInventory, + final ControllerData controllerData) { + super(Menus.INSTANCE.getController(), syncId); + addPlayerInventory(playerInventory, 8, 107); + this.energyInfo = EnergyInfo.forClient( + playerInventory.player, + controllerData.stored(), + controllerData.capacity() + ); + registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); + } + + ControllerContainerMenu(final int syncId, + final Inventory playerInventory, + final ControllerBlockEntity controller, + final Player player) { + super(Menus.INSTANCE.getController(), syncId); + this.energyInfo = EnergyInfo.forServer( + player, + controller::getActualStored, + controller::getActualCapacity + ); + addPlayerInventory(playerInventory, 8, 107); + registerProperty(new ServerProperty<>( + PropertyTypes.REDSTONE_MODE, + controller::getRedstoneMode, + controller::setRedstoneMode + )); + } + + @Override + public void broadcastChanges() { + super.broadcastChanges(); + energyInfo.detectChanges(); + } + + @Override + public EnergyInfo getEnergyInfo() { + return energyInfo; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerData.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerData.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerData.java index 91d795d3a..6ef5837bb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerData.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerData.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; +package com.refinedmods.refinedstorage.platform.common.controller; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerEnergyType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerEnergyType.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerEnergyType.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerEnergyType.java index bf11163a6..b42670671 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerEnergyType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerEnergyType.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; +package com.refinedmods.refinedstorage.platform.common.controller; -import com.refinedmods.refinedstorage2.api.network.impl.node.controller.ControllerEnergyState; +import com.refinedmods.refinedstorage.api.network.impl.node.controller.ControllerEnergyState; import net.minecraft.util.StringRepresentable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerItemPropertyFunction.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerItemPropertyFunction.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerItemPropertyFunction.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerItemPropertyFunction.java index 98b9f66e4..846fafaca 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerItemPropertyFunction.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerItemPropertyFunction.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; +package com.refinedmods.refinedstorage.platform.common.controller; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerScreen.java new file mode 100644 index 000000000..7565b4535 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerScreen.java @@ -0,0 +1,57 @@ +package com.refinedmods.refinedstorage.platform.common.controller; + +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.ProgressWidget; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; + +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ControllerScreen extends AbstractBaseScreen { + private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/controller.png"); + + @Nullable + private ProgressWidget progressWidget; + + public ControllerScreen(final ControllerContainerMenu menu, final Inventory playerInventory, final Component text) { + super(menu, playerInventory, text); + this.inventoryLabelY = 94; + this.imageWidth = 176; + this.imageHeight = 189; + } + + @Override + protected void init() { + super.init(); + addSideButton(new RedstoneModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.REDSTONE_MODE), + createTranslation("gui", "controller.redstone_mode_help") + )); + if (progressWidget == null) { + progressWidget = new ProgressWidget( + leftPos + 80, + topPos + 20, + 16, + 70, + getMenu().getEnergyInfo()::getPercentageFull, + getMenu().getEnergyInfo()::createTooltip + ); + } else { + progressWidget.setX(leftPos + 80); + progressWidget.setY(topPos + 20); + } + addRenderableWidget(progressWidget); + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerType.java new file mode 100644 index 000000000..b3dcad21d --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/ControllerType.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.platform.common.controller; + +public enum ControllerType { + NORMAL, + CREATIVE +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/CreativeControllerBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlock.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/CreativeControllerBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlock.java index 24df80bb6..ed951bb4d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/CreativeControllerBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlock.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; +package com.refinedmods.refinedstorage.platform.common.controller; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlockItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlockItem.java new file mode 100644 index 000000000..85d33b3a3 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/CreativeControllerBlockItem.java @@ -0,0 +1,17 @@ +package com.refinedmods.refinedstorage.platform.common.controller; + +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; + +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class CreativeControllerBlockItem extends NetworkNodeBlockItem { + private static final MutableComponent HELP = createTranslation("item", "creative_controller.help"); + + CreativeControllerBlockItem(final Block block) { + super(block, new Item.Properties().stacksTo(1), HELP); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/package-info.java new file mode 100644 index 000000000..23195fa3e --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/controller/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.controller; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java index 24de98829..c6869cef2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlock.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage2.platform.common.detector; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; +package com.refinedmods.refinedstorage.platform.common.detector; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -33,7 +33,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class DetectorBlock extends AbstractDirectionalBlock implements ColorableBlock, SimpleWaterloggedBlock, EntityBlock, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java index 2f387d376..2e2a5bdf8 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorBlockEntity.java @@ -1,22 +1,22 @@ -package com.refinedmods.refinedstorage2.platform.common.detector; - -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorAmountStrategy; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorAmountStrategyImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorMode; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +package com.refinedmods.refinedstorage.platform.common.detector; + +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorAmountStrategy; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorAmountStrategyImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorNetworkNode; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorContainerMenu.java new file mode 100644 index 000000000..f086add1b --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorContainerMenu.java @@ -0,0 +1,59 @@ +package com.refinedmods.refinedstorage.platform.common.detector; + +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; + +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class DetectorContainerMenu extends AbstractSingleAmountContainerMenu { + private static final Component FILTER_HELP = createTranslation("gui", "detector.filter_help"); + + @Nullable + private DetectorBlockEntity detector; + + public DetectorContainerMenu(final int syncId, + final Inventory playerInventory, + final SingleAmountData singleAmountData) { + super(Menus.INSTANCE.getDetector(), syncId, playerInventory, singleAmountData, FILTER_HELP); + registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); + registerProperty(new ClientProperty<>(DetectorPropertyTypes.MODE, DetectorMode.EQUAL)); + } + + DetectorContainerMenu(final int syncId, + final Player player, + final DetectorBlockEntity detector, + final ResourceContainer resourceContainer) { + super(Menus.INSTANCE.getDetector(), syncId, player, resourceContainer, FILTER_HELP, null); + this.detector = detector; + registerProperty(new ServerProperty<>( + PropertyTypes.FUZZY_MODE, + detector::isFuzzyMode, + detector::setFuzzyMode + )); + registerProperty(new ServerProperty<>( + DetectorPropertyTypes.MODE, + detector::getMode, + detector::setMode + )); + } + + @Override + public void changeAmountOnServer(final double newAmount) { + if (detector == null) { + return; + } + detector.setAmount(newAmount); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorModeSettings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorModeSettings.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java index 424d61285..6fe841c54 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorModeSettings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSettings.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.detector; +package com.refinedmods.refinedstorage.platform.common.detector; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorMode; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; final class DetectorModeSettings { private static final int UNDER = 0; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorModeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSideButtonWidget.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorModeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSideButtonWidget.java index d2dd7292f..b53e05f63 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorModeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorModeSideButtonWidget.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.detector; +package com.refinedmods.refinedstorage.platform.common.detector; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; class DetectorModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "detector.mode"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorPropertyTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorPropertyTypes.java new file mode 100644 index 000000000..1bf75cfd7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorPropertyTypes.java @@ -0,0 +1,17 @@ +package com.refinedmods.refinedstorage.platform.common.detector; + +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +final class DetectorPropertyTypes { + static final PropertyType MODE = new PropertyType<>( + createIdentifier("detector_mode"), + DetectorModeSettings::getDetectorMode, + DetectorModeSettings::getDetectorMode + ); + + private DetectorPropertyTypes() { + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorScreen.java new file mode 100644 index 000000000..7525f0d98 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/DetectorScreen.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.platform.common.detector; + +import com.refinedmods.refinedstorage.platform.common.support.amount.AbstractSingleAmountScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; + +public class DetectorScreen extends AbstractSingleAmountScreen { + public DetectorScreen(final DetectorContainerMenu menu, final Inventory playerInventory, final Component text) { + super(menu, playerInventory, text, menu.getAmount(), 0); + } + + @Override + protected void init() { + super.init(); + addSideButton(new FuzzyModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FUZZY_MODE), + () -> FuzzyModeSideButtonWidget.Type.GENERIC + )); + addSideButton(new DetectorModeSideButtonWidget(getMenu().getProperty(DetectorPropertyTypes.MODE))); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/FuzzyDetectorAmountStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/FuzzyDetectorAmountStrategy.java new file mode 100644 index 000000000..54264ddb0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/FuzzyDetectorAmountStrategy.java @@ -0,0 +1,29 @@ +package com.refinedmods.refinedstorage.platform.common.detector; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.AbstractDetectorAmountStrategy; +import com.refinedmods.refinedstorage.api.network.impl.node.detector.DetectorAmountStrategy; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; + +class FuzzyDetectorAmountStrategy extends AbstractDetectorAmountStrategy { + private final DetectorAmountStrategy fallback; + + FuzzyDetectorAmountStrategy(final DetectorAmountStrategy fallback) { + this.fallback = fallback; + } + + @Override + public long getAmount(final Network network, final ResourceKey configuredResource) { + final StorageChannel storageChannel = getStorageChannel(network); + if (!(storageChannel instanceof FuzzyStorageChannel fuzzyStorageChannel)) { + return fallback.getAmount(network, configuredResource); + } + return fuzzyStorageChannel.getFuzzy(configuredResource) + .stream() + .mapToLong(ResourceAmount::getAmount) + .sum(); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/package-info.java new file mode 100644 index 000000000..23dd8bd2c --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/detector/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.detector; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlock.java new file mode 100644 index 000000000..e25dd9983 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlock.java @@ -0,0 +1,93 @@ +package com.refinedmods.refinedstorage.platform.common.exporter; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalCableBlock; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.platform.common.support.DirectionalCableBlockShapes; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import java.util.HashMap; +import java.util.Map; +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.shapes.VoxelShape; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ExporterBlock extends AbstractDirectionalCableBlock + implements ColorableBlock, EntityBlock, BlockItemProvider { + private static final Component HELP = createTranslation("item", "exporter.help"); + private static final Map SHAPE_CACHE = new HashMap<>(); + private static final AbstractBlockEntityTicker TICKER = + new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getExporter); + private final DyeColor color; + private final MutableComponent name; + + public ExporterBlock(final DyeColor color, final MutableComponent name) { + super(SHAPE_CACHE); + this.color = color; + this.name = name; + } + + @Override + public DyeColor getColor() { + return color; + } + + @Override + public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { + return new ExporterBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(final Level level, + final BlockState blockState, + final BlockEntityType type) { + return TICKER.get(level, type); + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getExporter(); + } + + @Override + protected VoxelShape getExtensionShape(final Direction direction) { + return switch (direction) { + case NORTH -> DirectionalCableBlockShapes.EXPORTER_NORTH; + case EAST -> DirectionalCableBlockShapes.EXPORTER_EAST; + case SOUTH -> DirectionalCableBlockShapes.EXPORTER_SOUTH; + case WEST -> DirectionalCableBlockShapes.EXPORTER_WEST; + case UP -> DirectionalCableBlockShapes.EXPORTER_UP; + case DOWN -> DirectionalCableBlockShapes.EXPORTER_DOWN; + }; + } + + @Override + public MutableComponent getName() { + return name; + } + + @Override + public BaseBlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlockEntity.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlockEntity.java index 5ea3d2f31..9b7a162d3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterBlockEntity.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage2.platform.common.exporter; +package com.refinedmods.refinedstorage.platform.common.exporter; -import com.refinedmods.refinedstorage2.api.network.impl.node.exporter.CompositeExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.impl.node.exporter.ExporterNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.api.network.impl.node.exporter.CompositeExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; import java.util.List; import java.util.function.LongSupplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterContainerMenu.java new file mode 100644 index 000000000..ddd61753a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterContainerMenu.java @@ -0,0 +1,47 @@ +package com.refinedmods.refinedstorage.platform.common.exporter; + +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSchedulingContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; + +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ExporterContainerMenu extends AbstractSchedulingContainerMenu { + private static final MutableComponent FILTER_HELP = createTranslation("gui", "exporter.filter_help"); + + public ExporterContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { + super( + Menus.INSTANCE.getExporter(), + syncId, + playerInventory.player, + resourceContainerData, + UpgradeDestinations.EXPORTER, + FILTER_HELP + ); + } + + ExporterContainerMenu(final int syncId, + final Player player, + final ExporterBlockEntity exporter, + final ResourceContainer resourceContainer, + final UpgradeContainer upgradeContainer) { + super( + Menus.INSTANCE.getExporter(), + syncId, + player, + resourceContainer, + upgradeContainer, + exporter, + FILTER_HELP + ); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterScreen.java new file mode 100644 index 000000000..63cfb4fe4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterScreen.java @@ -0,0 +1,25 @@ +package com.refinedmods.refinedstorage.platform.common.exporter; + +import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.widget.SchedulingModeSideButtonWidget; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; + +public class ExporterScreen extends AbstractFilterScreen { + public ExporterScreen(final ExporterContainerMenu menu, final Inventory playerInventory, final Component text) { + super(menu, playerInventory, text); + } + + @Override + protected void init() { + super.init(); + addSideButton(new FuzzyModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FUZZY_MODE), + () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK + )); + addSideButton(new SchedulingModeSideButtonWidget(getMenu().getProperty(PropertyTypes.SCHEDULING_MODE))); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/FuzzyExporterTransferStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/FuzzyExporterTransferStrategy.java new file mode 100644 index 000000000..c7a17f0ed --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/FuzzyExporterTransferStrategy.java @@ -0,0 +1,29 @@ +package com.refinedmods.refinedstorage.platform.common.exporter; + +import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; + +import java.util.Collection; +import java.util.stream.Collectors; + +public class FuzzyExporterTransferStrategy extends ExporterTransferStrategyImpl { + public FuzzyExporterTransferStrategy(final InsertableStorage destination, final long transferQuota) { + super(destination, transferQuota); + } + + @Override + protected Collection expand(final ResourceKey resource, final StorageChannel storageChannel) { + if (storageChannel instanceof FuzzyStorageChannel fuzzyStorageChannel) { + return fuzzyStorageChannel + .getFuzzy(resource) + .stream() + .map(ResourceAmount::getResource) + .collect(Collectors.toSet()); + } + return super.expand(resource, storageChannel); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/package-info.java new file mode 100644 index 000000000..ae767a442 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlock.java new file mode 100644 index 000000000..fb3bc9b7b --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlock.java @@ -0,0 +1,30 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; + +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.block.EntityBlock; + +public abstract class AbstractGridBlock & BlockItemProvider, I extends BlockItem> + extends AbstractActiveColoredDirectionalBlock implements EntityBlock { + protected AbstractGridBlock(final MutableComponent name, final DyeColor color) { + super(BlockConstants.PROPERTIES, color, name); + } + + @Override + protected DirectionType getDirectionType() { + return BiDirectionType.INSTANCE; + } + + @Override + public boolean canAlwaysConnect() { + return true; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlockEntity.java new file mode 100644 index 000000000..999e66c44 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridBlockEntity.java @@ -0,0 +1,107 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.container.NetworkNodeContainerPriorities; +import com.refinedmods.refinedstorage.api.network.impl.node.grid.GridNetworkNode; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; + +import java.util.List; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamEncoder; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +import static java.util.Objects.requireNonNull; + +public abstract class AbstractGridBlockEntity + extends AbstractRedstoneModeNetworkNodeContainerBlockEntity + implements Grid, NetworkNodeExtendedMenuProvider { + protected AbstractGridBlockEntity(final BlockEntityType type, + final BlockPos pos, + final BlockState state, + final long energyUsage) { + super(type, pos, state, new GridNetworkNode(energyUsage)); + } + + @Override + protected InWorldNetworkNodeContainer createMainContainer(final GridNetworkNode node) { + return PlatformApi.INSTANCE.createInWorldNetworkNodeContainer( + this, + node, + MAIN_CONTAINER_NAME, + NetworkNodeContainerPriorities.GRID, + this, + null + ); + } + + @Override + public GridData getMenuData() { + return GridData.of(this); + } + + @Override + public StreamEncoder getMenuCodec() { + return GridData.STREAM_CODEC; + } + + @Override + public List getResources(final Class actorType) { + return requireNonNull(mainNode.getNetwork()) + .getComponent(StorageNetworkComponent.class) + .getResources(actorType); + } + + @Override + public GridOperations createOperations(final ResourceType resourceType, final ServerPlayer player) { + final Network network = requireNonNull(mainNode.getNetwork()); + final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); + final PlatformSecurityNetworkComponent security = network.getComponent(PlatformSecurityNetworkComponent.class); + final GridOperations operations = resourceType.createGridOperations(storageChannel, new PlayerActor(player)); + return new SecuredGridOperations(player, security, operations); + } + + @Override + public boolean isGridActive() { + return mainNode.isActive(); + } + + @Override + public Storage getItemStorage() { + return requireNonNull(mainNode.getNetwork()).getComponent(StorageNetworkComponent.class); + } + + @Override + public void addWatcher(final GridWatcher watcher, final Class actorType) { + mainNode.addWatcher(watcher, actorType); + } + + @Override + public void removeWatcher(final GridWatcher watcher) { + mainNode.removeWatcher(watcher); + } + + @Override + protected boolean doesBlockStateChangeWarrantNetworkNodeUpdate(final BlockState oldBlockState, + final BlockState newBlockState) { + return AbstractDirectionalBlock.doesBlockStateChangeWarrantNetworkNodeUpdate(oldBlockState, newBlockState); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java index 92acdb5d2..01493deeb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridContainerMenu.java @@ -1,41 +1,41 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.query.GridQueryParserException; -import com.refinedmods.refinedstorage2.api.grid.query.GridQueryParserImpl; -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage2.api.grid.view.GridView; -import com.refinedmods.refinedstorage2.api.grid.view.GridViewBuilder; -import com.refinedmods.refinedstorage2.api.grid.view.GridViewBuilderImpl; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.GridResourceAttributeKeys; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.Config; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.grid.strategy.ClientGridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.common.grid.strategy.ClientGridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.grid.strategy.ClientGridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.common.grid.view.CompositeGridResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage2.platform.common.support.stretching.ScreenSizeListener; -import com.refinedmods.refinedstorage2.query.lexer.LexerTokenMappings; -import com.refinedmods.refinedstorage2.query.parser.ParserOperatorMappings; +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.query.GridQueryParserException; +import com.refinedmods.refinedstorage.api.grid.query.GridQueryParserImpl; +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; +import com.refinedmods.refinedstorage.api.grid.view.GridView; +import com.refinedmods.refinedstorage.api.grid.view.GridViewBuilder; +import com.refinedmods.refinedstorage.api.grid.view.GridViewBuilderImpl; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.GridResourceAttributeKeys; +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.platform.common.Config; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.grid.strategy.ClientGridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.common.grid.strategy.ClientGridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.grid.strategy.ClientGridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.common.grid.view.CompositeGridResourceFactory; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSizeListener; +import com.refinedmods.refinedstorage.query.lexer.LexerTokenMappings; +import com.refinedmods.refinedstorage.query.parser.ParserOperatorMappings; import java.util.Map; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridSynchronizer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridSynchronizer.java new file mode 100644 index 000000000..5a9834382 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/AbstractGridSynchronizer.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.platform.api.grid.GridSynchronizer; +import com.refinedmods.refinedstorage.platform.common.support.TextureIds; + +import net.minecraft.resources.ResourceLocation; + +public abstract class AbstractGridSynchronizer implements GridSynchronizer { + @Override + public ResourceLocation getTextureIdentifier() { + return TextureIds.ICONS; + } + + @Override + public int getYTexture() { + return 96; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/ClientCraftingGridSource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/ClientCraftingGridSource.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/ClientCraftingGridSource.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/ClientCraftingGridSource.java index 82963ea0d..c059a4652 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/ClientCraftingGridSource.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/ClientCraftingGridSource.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlock.java new file mode 100644 index 000000000..e0bccbbe9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlock.java @@ -0,0 +1,61 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class CraftingGridBlock extends AbstractGridBlock + implements BlockItemProvider { + private static final Component HELP = createTranslation("item", "crafting_grid.help"); + private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>( + BlockEntities.INSTANCE::getCraftingGrid, + ACTIVE + ); + + public CraftingGridBlock(final DyeColor color, final MutableComponent name) { + super(name, color); + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getCraftingGrid(); + } + + @Nullable + @Override + public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { + return new CraftingGridBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(final Level level, + final BlockState blockState, + final BlockEntityType type) { + return TICKER.get(level, type); + } + + @Override + public BaseBlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlockEntity.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlockEntity.java index 25da456ed..49e5f2cfe 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridBlockEntity.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil; +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java index c413f60df..cc6e73b46 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridContainerMenu.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.grid.view.ItemGridResource; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.grid.view.ItemGridResource; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.ArrayList; import java.util.HashSet; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridMatrixCloseBehavior.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridMatrixCloseBehavior.java new file mode 100644 index 000000000..fa99129c0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridMatrixCloseBehavior.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +public enum CraftingGridMatrixCloseBehavior { + NONE, + CLEAR_TO_NETWORK, + CLEAR_TO_INVENTORY +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContext.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContext.java new file mode 100644 index 000000000..036f76b57 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContext.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; + +import net.minecraft.world.entity.player.Player; + +interface CraftingGridRefillContext extends AutoCloseable { + boolean extract(ItemResource resource, Player player); + + @Override + void close(); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridRefillContextImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContextImpl.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridRefillContextImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContextImpl.java index 2f71301fb..aa8461f6c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridRefillContextImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridRefillContextImpl.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridResultSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java similarity index 95% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridResultSlot.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java index a7b5d4a10..db7c3bb30 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridResultSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridResultSlot.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSource.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSource.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSource.java index 6d4e147be..dba56eda7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSource.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSource.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSourceImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSourceImpl.java similarity index 92% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSourceImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSourceImpl.java index 9a64e5646..29cc2c3db 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridSourceImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingGridSourceImpl.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.Comparator; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingMatrix.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrix.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingMatrix.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrix.java index c314072f2..5ef6b3344 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingMatrix.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrix.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingMatrixContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrixContainerMenu.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingMatrixContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrixContainerMenu.java index ee2f926d1..b8ffb621a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingMatrixContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/CraftingMatrixContainerMenu.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlock.java new file mode 100644 index 000000000..e3e6ab612 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlock.java @@ -0,0 +1,61 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class GridBlock extends AbstractGridBlock + implements BlockItemProvider { + private static final Component HELP = createTranslation("item", "grid.help"); + private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>( + BlockEntities.INSTANCE::getGrid, + ACTIVE + ); + + public GridBlock(final DyeColor color, final MutableComponent name) { + super(name, color); + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getGrid(); + } + + @Nullable + @Override + public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { + return new GridBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(final Level level, + final BlockState blockState, + final BlockEntityType type) { + return TICKER.get(level, type); + } + + @Override + public BaseBlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlockEntity.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlockEntity.java index 4f51fb385..567277aa9 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridBlockEntity.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridContainerMenu.java new file mode 100644 index 000000000..79b214719 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridContainerMenu.java @@ -0,0 +1,27 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; + +import net.minecraft.world.entity.player.Inventory; + +public class GridContainerMenu extends AbstractGridContainerMenu { + public GridContainerMenu(final int syncId, final Inventory playerInventory, final GridData gridData) { + super(Menus.INSTANCE.getGrid(), syncId, playerInventory, gridData); + onScreenReady(0); + registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); + } + + GridContainerMenu(final int syncId, final Inventory playerInventory, final GridBlockEntity grid) { + super(Menus.INSTANCE.getGrid(), syncId, playerInventory, grid); + onScreenReady(0); + registerProperty(new ServerProperty<>( + PropertyTypes.REDSTONE_MODE, + grid::getRedstoneMode, + grid::setRedstoneMode + )); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridData.java new file mode 100644 index 000000000..1c1489b2d --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridData.java @@ -0,0 +1,45 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.common.storage.StorageCodecs; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record GridData(boolean active, List resources) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.BOOL, GridData::active, + ByteBufCodecs.collection(ArrayList::new, StreamCodec.composite( + ResourceCodecs.AMOUNT_STREAM_CODEC, GridResource::resourceAmount, + StorageCodecs.TRACKED_RESOURCE_OPTIONAL_STREAM_CODEC, GridResource::trackedResource, + GridResource::new + )), GridData::resources, + GridData::new + ); + + public static GridData of(final Grid grid) { + return new GridData( + grid.isGridActive(), + grid.getResources(PlayerActor.class).stream().map(GridResource::of).toList() + ); + } + + public record GridResource(ResourceAmount resourceAmount, Optional trackedResource) { + static GridResource of(final TrackedResourceAmount trackedResourceAmount) { + return new GridResource( + trackedResourceAmount.resourceAmount(), + Optional.ofNullable(trackedResourceAmount.trackedResource()) + ); + } + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSearchBox.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSearchBox.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSearchBox.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSearchBox.java index b056cd3be..8f7f7360c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSearchBox.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSearchBox.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; import java.util.function.Consumer; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypes.java new file mode 100644 index 000000000..fa7201503 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypes.java @@ -0,0 +1,37 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.grid.view.GridSortingType; +import com.refinedmods.refinedstorage.api.grid.view.GridView; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.platform.api.grid.view.PlatformGridResource; + +import java.util.Comparator; +import java.util.function.Function; + +public enum GridSortingTypes implements GridSortingType { + QUANTITY(view -> Comparator.comparingLong(GridResource::getAmount)), + NAME(view -> Comparator.comparing(GridResource::getName)), + ID(view -> (a, b) -> { + if (a instanceof PlatformGridResource aa && b instanceof PlatformGridResource bb) { + return Integer.compare(aa.getRegistryId(), bb.getRegistryId()); + } + return 0; + }), + LAST_MODIFIED(view -> (a, b) -> { + final long lastModifiedA = a.getTrackedResource(view).map(TrackedResource::getTime).orElse(0L); + final long lastModifiedB = b.getTrackedResource(view).map(TrackedResource::getTime).orElse(0L); + return Long.compare(lastModifiedA, lastModifiedB); + }); + + private final Function> comparator; + + GridSortingTypes(final Function> comparator) { + this.comparator = comparator; + } + + @Override + public Comparator apply(final GridView view) { + return comparator.apply(view); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/NoopGridSynchronizer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/NoopGridSynchronizer.java similarity index 85% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/NoopGridSynchronizer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/NoopGridSynchronizer.java index e69cd08ff..6dcd2f096 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/NoopGridSynchronizer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/NoopGridSynchronizer.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class NoopGridSynchronizer extends AbstractGridSynchronizer { public static final NoopGridSynchronizer INSTANCE = new NoopGridSynchronizer(); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/PortableGridData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/PortableGridData.java new file mode 100644 index 000000000..eaf7de47b --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/PortableGridData.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; + +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record PortableGridData(GridData gridData, long stored, long capacity, Optional slotReference) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + GridData.STREAM_CODEC, PortableGridData::gridData, + ByteBufCodecs.VAR_LONG, PortableGridData::stored, + ByteBufCodecs.VAR_LONG, PortableGridData::capacity, + ByteBufCodecs.optional(SlotReferenceFactory.STREAM_CODEC), PortableGridData::slotReference, + PortableGridData::new + ); +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SecuredGridOperations.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SecuredGridOperations.java new file mode 100644 index 000000000..9f89b1324 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SecuredGridOperations.java @@ -0,0 +1,54 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; +import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; + +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.server.level.ServerPlayer; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class SecuredGridOperations implements GridOperations { + private static final MutableComponent CANNOT_EXTRACT_MESSAGE = createTranslation("misc", "no_permission.extract"); + private static final MutableComponent CANNOT_INSERT_MESSAGE = createTranslation("misc", "no_permission.insert"); + + private final ServerPlayer player; + private final PlatformSecurityNetworkComponent securityNetworkComponent; + private final GridOperations delegate; + + public SecuredGridOperations(final ServerPlayer player, + final PlatformSecurityNetworkComponent securityNetworkComponent, + final GridOperations delegate) { + this.player = player; + this.securityNetworkComponent = securityNetworkComponent; + this.delegate = delegate; + } + + @Override + public boolean extract(final ResourceKey resource, + final GridExtractMode extractMode, + final InsertableStorage destination) { + if (!securityNetworkComponent.isAllowed(BuiltinPermission.EXTRACT, player)) { + PlatformApi.INSTANCE.sendNoPermissionMessage(player, CANNOT_EXTRACT_MESSAGE); + return false; + } + return delegate.extract(resource, extractMode, destination); + } + + @Override + public boolean insert(final ResourceKey resource, final GridInsertMode insertMode, + final ExtractableStorage source) { + if (!securityNetworkComponent.isAllowed(BuiltinPermission.INSERT, player)) { + PlatformApi.INSTANCE.sendNoPermissionMessage(player, CANNOT_INSERT_MESSAGE); + return false; + } + return delegate.insert(resource, insertMode, source); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/SnapshotCraftingGridRefillContext.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SnapshotCraftingGridRefillContext.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/SnapshotCraftingGridRefillContext.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SnapshotCraftingGridRefillContext.java index be6b8ac63..9e4d2e98b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/SnapshotCraftingGridRefillContext.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/SnapshotCraftingGridRefillContext.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGrid.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGrid.java new file mode 100644 index 000000000..66498bbf4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGrid.java @@ -0,0 +1,96 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.grid.operations.NoopGridOperations; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcherManager; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcherManagerImpl; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.NoopStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.platform.common.Platform; + +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +import net.minecraft.server.level.ServerPlayer; + +class WirelessGrid implements Grid { + private final NetworkBoundItemSession session; + private final GridWatcherManager watchers = new GridWatcherManagerImpl(); + + WirelessGrid(final NetworkBoundItemSession session) { + this.session = session; + } + + private Optional getStorage() { + return session.resolveNetwork().map(network -> network.getComponent(StorageNetworkComponent.class)); + } + + private Optional getSecurity() { + return session.resolveNetwork().map(network -> network.getComponent(PlatformSecurityNetworkComponent.class)); + } + + @Override + public void addWatcher(final GridWatcher watcher, final Class actorType) { + session.drainEnergy(Platform.INSTANCE.getConfig().getWirelessGrid().getOpenEnergyUsage()); + session.resolveNetwork().ifPresent(network -> watchers.addWatcher( + watcher, + actorType, + network.getComponent(StorageNetworkComponent.class) + )); + } + + @Override + public void removeWatcher(final GridWatcher watcher) { + session.resolveNetwork().ifPresent(network -> watchers.removeWatcher( + watcher, + network.getComponent(StorageNetworkComponent.class) + )); + } + + @Override + public Storage getItemStorage() { + return getStorage().map(Storage.class::cast).orElseGet(NoopStorage::new); + } + + @Override + public boolean isGridActive() { + final boolean networkActive = session.resolveNetwork().map( + network -> network.getComponent(EnergyNetworkComponent.class).getStored() > 0 + ).orElse(false); + return networkActive && session.isActive(); + } + + @Override + public List getResources(final Class actorType) { + return getStorage().map(storage -> storage.getResources(actorType)).orElse(Collections.emptyList()); + } + + @Override + public GridOperations createOperations(final ResourceType resourceType, final ServerPlayer player) { + return getStorage() + .flatMap(storageChannel -> + getSecurity().map(security -> createGridOperations(resourceType, player, storageChannel, security))) + .map(gridOperations -> (GridOperations) new WirelessGridOperations(gridOperations, session, watchers)) + .orElseGet(NoopGridOperations::new); + } + + private GridOperations createGridOperations(final ResourceType resourceType, + final ServerPlayer player, + final StorageNetworkComponent storageChannel, + final PlatformSecurityNetworkComponent securityNetworkComponent) { + final PlayerActor playerActor = new PlayerActor(player); + final GridOperations operations = resourceType.createGridOperations(storageChannel, playerActor); + return new SecuredGridOperations(player, securityNetworkComponent, operations); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridContainerMenu.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridContainerMenu.java index a92fe6bc2..845ab69c5 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridContainerMenu.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.content.Menus; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridData.java new file mode 100644 index 000000000..60c17531f --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridData.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; + +public record WirelessGridData(GridData gridData, SlotReference slotReference) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + GridData.STREAM_CODEC, WirelessGridData::gridData, + SlotReferenceFactory.STREAM_CODEC, WirelessGridData::slotReference, + WirelessGridData::new + ); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridExtendedMenuProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridExtendedMenuProvider.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridExtendedMenuProvider.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridExtendedMenuProvider.java index 44e18b89a..90e3fa1b0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridExtendedMenuProvider.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridExtendedMenuProvider.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; +package com.refinedmods.refinedstorage.platform.common.grid; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridItem.java new file mode 100644 index 000000000..5fcdd9351 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridItem.java @@ -0,0 +1,49 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.security.SecurityHelper; +import com.refinedmods.refinedstorage.platform.api.support.energy.AbstractNetworkBoundEnergyItem; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; + +public class WirelessGridItem extends AbstractNetworkBoundEnergyItem { + public WirelessGridItem() { + super( + new Item.Properties().stacksTo(1), + PlatformApi.INSTANCE.getEnergyItemHelper(), + PlatformApi.INSTANCE.getNetworkBoundItemHelper() + ); + } + + public EnergyStorage createEnergyStorage(final ItemStack stack) { + final EnergyStorage energyStorage = new EnergyStorageImpl( + Platform.INSTANCE.getConfig().getWirelessGrid().getEnergyCapacity() + ); + return PlatformApi.INSTANCE.asItemEnergyStorage(energyStorage, stack); + } + + @Override + public void use(final ServerPlayer player, + final SlotReference slotReference, + final NetworkBoundItemSession session) { + final boolean isAllowed = session.resolveNetwork() + .map(network -> SecurityHelper.isAllowed(player, BuiltinPermission.OPEN, network)) + .orElse(true); // if the network can't be resolved that will be apparent later in the UI. + if (!isAllowed) { + PlatformApi.INSTANCE.sendNoPermissionToOpenMessage(player, ContentNames.WIRELESS_GRID); + return; + } + final Grid grid = new WirelessGrid(session); + Platform.INSTANCE.getMenuOpener().openMenu(player, new WirelessGridExtendedMenuProvider(grid, slotReference)); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridOperations.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridOperations.java new file mode 100644 index 000000000..4e7c4f533 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/WirelessGridOperations.java @@ -0,0 +1,56 @@ +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcherManager; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.platform.common.Platform; + +class WirelessGridOperations implements GridOperations { + private final GridOperations delegate; + private final NetworkBoundItemSession session; + private final GridWatcherManager watchers; + + WirelessGridOperations(final GridOperations delegate, + final NetworkBoundItemSession session, + final GridWatcherManager watchers) { + this.delegate = delegate; + this.session = session; + this.watchers = watchers; + } + + @Override + public boolean extract(final ResourceKey resource, + final GridExtractMode extractMode, + final InsertableStorage destination) { + final boolean success = delegate.extract(resource, extractMode, destination); + if (success) { + drain(Platform.INSTANCE.getConfig().getWirelessGrid().getExtractEnergyUsage()); + } + return success; + } + + @Override + public boolean insert(final ResourceKey resource, + final GridInsertMode insertMode, + final ExtractableStorage source) { + final boolean success = delegate.insert(resource, insertMode, source); + if (success) { + drain(Platform.INSTANCE.getConfig().getWirelessGrid().getInsertEnergyUsage()); + } + return success; + } + + private void drain(final long amount) { + final boolean wasActive = session.isActive(); + session.drainEnergy(amount); + final boolean isActive = session.isActive(); + if (wasActive != isActive) { + watchers.activeChanged(isActive); + } + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/package-info.java new file mode 100644 index 000000000..9d81fbf36 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/AbstractGridScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/AbstractGridScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java index cdd03593e..ccecea0d8 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/AbstractGridScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AbstractGridScreen.java @@ -1,27 +1,27 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.grid.view.GridView; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.view.PlatformGridResource; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.NoopGridSynchronizer; -import com.refinedmods.refinedstorage2.platform.common.grid.view.ItemGridResource; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.DisabledSlot; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.stretching.AbstractStretchingScreen; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.SmallTextClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.widget.History; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; -import com.refinedmods.refinedstorage2.query.lexer.SyntaxHighlighter; -import com.refinedmods.refinedstorage2.query.lexer.SyntaxHighlighterColors; +package com.refinedmods.refinedstorage.platform.common.grid.screen; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.grid.view.GridView; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.view.PlatformGridResource; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.NoopGridSynchronizer; +import com.refinedmods.refinedstorage.platform.common.grid.view.ItemGridResource; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.DisabledSlot; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.stretching.AbstractStretchingScreen; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.SmallTextClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.widget.History; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.query.lexer.SyntaxHighlighter; +import com.refinedmods.refinedstorage.query.lexer.SyntaxHighlighterColors; import java.util.ArrayList; import java.util.List; @@ -39,7 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; import static java.util.Objects.requireNonNullElse; public abstract class AbstractGridScreen extends AbstractStretchingScreen { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AutoSelectedSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AutoSelectedSideButtonWidget.java new file mode 100644 index 000000000..e63560600 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/AutoSelectedSideButtonWidget.java @@ -0,0 +1,52 @@ +package com.refinedmods.refinedstorage.platform.common.grid.screen; + +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.NO; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.YES; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +class AutoSelectedSideButtonWidget extends AbstractSideButtonWidget { + private static final MutableComponent TITLE = createTranslation("gui", "grid.auto_selected"); + private static final Component HELP = createTranslation("gui", "grid.auto_selected.help"); + + private final AbstractGridContainerMenu menu; + + AutoSelectedSideButtonWidget(final AbstractGridContainerMenu menu) { + super(createPressAction(menu)); + this.menu = menu; + } + + private static OnPress createPressAction(final AbstractGridContainerMenu menu) { + return btn -> menu.setAutoSelected(!menu.isAutoSelected()); + } + + @Override + protected int getXTexture() { + return menu.isAutoSelected() ? 16 : 0; + } + + @Override + protected int getYTexture() { + return 96; + } + + @Override + protected MutableComponent getTitle() { + return TITLE; + } + + @Override + protected MutableComponent getSubText() { + return menu.isAutoSelected() ? YES : NO; + } + + @Override + protected Component getHelpText() { + return HELP; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/CraftingGridScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/CraftingGridScreen.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/CraftingGridScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/CraftingGridScreen.java index 5627f5f0b..6e0a34a76 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/CraftingGridScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/CraftingGridScreen.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; +package com.refinedmods.refinedstorage.platform.common.grid.screen; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.KeyMappings; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridMatrixCloseBehavior; -import com.refinedmods.refinedstorage2.platform.common.support.widget.HoveredImageButton; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridMatrixCloseBehavior; +import com.refinedmods.refinedstorage.platform.common.support.widget.HoveredImageButton; import javax.annotation.Nullable; @@ -21,7 +21,8 @@ import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.inventory.Slot; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class CraftingGridScreen extends AbstractGridScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/crafting_grid.png"); @@ -118,8 +119,9 @@ private void setClearToNetworkButtonActive(final boolean active) { } private ImageButton createClearButton(final int x, final int y, final boolean toPlayerInventory) { - final MutableComponent text = Component.translatable( - "gui.refinedstorage2.crafting_grid.move." + (toPlayerInventory ? "inventory" : "network") + final MutableComponent text = createTranslation( + "gui", + "crafting_grid.move." + (toPlayerInventory ? "inventory" : "network") ); final KeyMapping keyMapping = getClearButtonKeyMapping(toPlayerInventory); if (keyMapping != null) { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridScreen.java new file mode 100644 index 000000000..d9c181d29 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridScreen.java @@ -0,0 +1,25 @@ +package com.refinedmods.refinedstorage.platform.common.grid.screen; + +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; + +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public class GridScreen extends AbstractGridScreen { + private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/grid.png"); + + public GridScreen(final T menu, final Inventory inventory, final Component title) { + super(menu, inventory, title, 99); + this.inventoryLabelY = 75; + this.imageWidth = 193; + this.imageHeight = 176; + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/GridSearchBoxWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridSearchBoxWidget.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/GridSearchBoxWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridSearchBoxWidget.java index 2cc65805c..996556dad 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/GridSearchBoxWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/GridSearchBoxWidget.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; +package com.refinedmods.refinedstorage.platform.common.grid.screen; -import com.refinedmods.refinedstorage2.platform.common.grid.GridSearchBox; -import com.refinedmods.refinedstorage2.platform.common.support.widget.History; -import com.refinedmods.refinedstorage2.platform.common.support.widget.SearchFieldWidget; -import com.refinedmods.refinedstorage2.query.lexer.Lexer; -import com.refinedmods.refinedstorage2.query.lexer.LexerException; -import com.refinedmods.refinedstorage2.query.lexer.LexerTokenMappings; -import com.refinedmods.refinedstorage2.query.lexer.Source; -import com.refinedmods.refinedstorage2.query.lexer.SyntaxHighlightedCharacter; -import com.refinedmods.refinedstorage2.query.lexer.SyntaxHighlighter; +import com.refinedmods.refinedstorage.platform.common.grid.GridSearchBox; +import com.refinedmods.refinedstorage.platform.common.support.widget.History; +import com.refinedmods.refinedstorage.platform.common.support.widget.SearchFieldWidget; +import com.refinedmods.refinedstorage.query.lexer.Lexer; +import com.refinedmods.refinedstorage.query.lexer.LexerException; +import com.refinedmods.refinedstorage.query.lexer.LexerTokenMappings; +import com.refinedmods.refinedstorage.query.lexer.Source; +import com.refinedmods.refinedstorage.query.lexer.SyntaxHighlightedCharacter; +import com.refinedmods.refinedstorage.query.lexer.SyntaxHighlighter; import java.util.HashSet; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/LastModified.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModified.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/LastModified.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModified.java index 21f7f5e54..f6a27b200 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/LastModified.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModified.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; +package com.refinedmods.refinedstorage.platform.common.grid.screen; record LastModified(Type type, long amount) { private static final long SECOND = 1000; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/ResourceTypeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/ResourceTypeSideButtonWidget.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/ResourceTypeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/ResourceTypeSideButtonWidget.java index bfa23ab2a..7075678c0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/ResourceTypeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/ResourceTypeSideButtonWidget.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; +package com.refinedmods.refinedstorage.platform.common.grid.screen; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; class ResourceTypeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "grid.resource_type"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/SortingDirectionSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingDirectionSideButtonWidget.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/SortingDirectionSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingDirectionSideButtonWidget.java index 64f266587..1bdbec690 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/SortingDirectionSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingDirectionSideButtonWidget.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; +package com.refinedmods.refinedstorage.platform.common.grid.screen; -import com.refinedmods.refinedstorage2.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; class SortingDirectionSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "grid.sorting.direction"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/SortingTypeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingTypeSideButtonWidget.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/SortingTypeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingTypeSideButtonWidget.java index 6a033271a..dd8401fea 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/SortingTypeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SortingTypeSideButtonWidget.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; +package com.refinedmods.refinedstorage.platform.common.grid.screen; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.GridSortingTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.GridSortingTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; class SortingTypeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "grid.sorting.type"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/SynchronizationSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SynchronizationSideButtonWidget.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/SynchronizationSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SynchronizationSideButtonWidget.java index 08fb36f9b..22e750947 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/SynchronizationSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/SynchronizationSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; +package com.refinedmods.refinedstorage.platform.common.grid.screen; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; class SynchronizationSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "grid.synchronizer"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java new file mode 100644 index 000000000..d267e4777 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/FluidGridInsertionHint.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; + +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; + +import java.util.Optional; + +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.world.item.ItemStack; + +public class FluidGridInsertionHint implements GridInsertionHint { + @Override + public Optional getHint(final ItemStack carried) { + return Platform.INSTANCE.getContainedFluid(carried).map(this::createComponent); + } + + private MouseWithIconClientTooltipComponent createComponent(final Platform.ContainedFluid result) { + return new MouseWithIconClientTooltipComponent( + MouseWithIconClientTooltipComponent.Type.RIGHT, + (graphics, x, y) -> Platform.INSTANCE.getFluidRenderer().render( + graphics.pose(), + x, + y, + result.fluid() + ), + result.amount() == Platform.INSTANCE.getBucketAmount() + ? null + : FluidResourceRendering.format(result.amount()) + ); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/GridInsertionHintsImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/GridInsertionHintsImpl.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/GridInsertionHintsImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/GridInsertionHintsImpl.java index c4b258e3b..6f40c722b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/GridInsertionHintsImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/GridInsertionHintsImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen.hint; +package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHints; +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHints; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java new file mode 100644 index 000000000..6ea5d5c47 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/ItemGridInsertionHint.java @@ -0,0 +1,21 @@ +package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; + +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; + +import java.util.Optional; + +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.world.item.ItemStack; + +public class ItemGridInsertionHint implements GridInsertionHint { + @Override + public Optional getHint(final ItemStack carried) { + return Optional.of(new MouseWithIconClientTooltipComponent( + MouseWithIconClientTooltipComponent.Type.LEFT, + (graphics, x, y) -> graphics.renderItem(carried, x, y), + carried.getCount() == 1 ? null : AmountFormatting.format(carried.getCount()) + )); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java new file mode 100644 index 000000000..1268a1ae3 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; + +import com.refinedmods.refinedstorage.platform.api.grid.GridInsertionHint; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; + +import java.util.Optional; + +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.world.item.ItemStack; + +public class SingleItemGridInsertionHint implements GridInsertionHint { + @Override + public Optional getHint(final ItemStack carried) { + return Optional.of(new MouseWithIconClientTooltipComponent( + MouseWithIconClientTooltipComponent.Type.RIGHT, + (graphics, x, y) -> graphics.renderItem(carried, x, y), + null + )); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/package-info.java new file mode 100644 index 000000000..9045ae5be --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/hint/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.grid.screen.hint; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/package-info.java new file mode 100644 index 000000000..9ce18ebcd --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/screen/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.grid.screen; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridExtractionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridExtractionStrategy.java new file mode 100644 index 000000000..0bab9aa80 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridExtractionStrategy.java @@ -0,0 +1,16 @@ +package com.refinedmods.refinedstorage.platform.common.grid.strategy; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; + +public class ClientGridExtractionStrategy implements GridExtractionStrategy { + @Override + public boolean onExtract(final PlatformResourceKey resource, + final GridExtractMode extractMode, + final boolean cursor) { + C2SPackets.sendGridExtract(resource, extractMode, cursor); + return true; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridInsertionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridInsertionStrategy.java new file mode 100644 index 000000000..a09384403 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridInsertionStrategy.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.platform.common.grid.strategy; + +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; + +public class ClientGridInsertionStrategy implements GridInsertionStrategy { + @Override + public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { + C2SPackets.sendGridInsert(insertMode, tryAlternatives); + return true; + } + + @Override + public boolean onTransfer(final int slotIndex) { + throw new UnsupportedOperationException(); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridScrollingStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridScrollingStrategy.java new file mode 100644 index 000000000..cf3eeae92 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/ClientGridScrollingStrategy.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.platform.common.grid.strategy; + +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; + +public class ClientGridScrollingStrategy implements GridScrollingStrategy { + @Override + public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { + C2SPackets.sendGridScroll(resource, scrollMode, slotIndex); + return true; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridExtractionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridExtractionStrategy.java new file mode 100644 index 000000000..7c037c2ed --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridExtractionStrategy.java @@ -0,0 +1,28 @@ +package com.refinedmods.refinedstorage.platform.common.grid.strategy; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; + +import java.util.Collections; +import java.util.List; + +public class CompositeGridExtractionStrategy implements GridExtractionStrategy { + private final List strategies; + + public CompositeGridExtractionStrategy(final List strategies) { + this.strategies = Collections.unmodifiableList(strategies); + } + + @Override + public boolean onExtract(final PlatformResourceKey resource, + final GridExtractMode extractMode, + final boolean cursor) { + for (final GridExtractionStrategy strategy : strategies) { + if (strategy.onExtract(resource, extractMode, cursor)) { + return true; + } + } + return false; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridInsertionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridInsertionStrategy.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridInsertionStrategy.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridInsertionStrategy.java index 4abc1d8c6..3054f689d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridInsertionStrategy.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridInsertionStrategy.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.strategy; +package com.refinedmods.refinedstorage.platform.common.grid.strategy; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridScrollingStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridScrollingStrategy.java new file mode 100644 index 000000000..540144706 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/CompositeGridScrollingStrategy.java @@ -0,0 +1,26 @@ +package com.refinedmods.refinedstorage.platform.common.grid.strategy; + +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; + +import java.util.Collections; +import java.util.List; + +public class CompositeGridScrollingStrategy implements GridScrollingStrategy { + private final List strategies; + + public CompositeGridScrollingStrategy(final List strategies) { + this.strategies = Collections.unmodifiableList(strategies); + } + + @Override + public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { + for (final GridScrollingStrategy strategy : strategies) { + if (strategy.onScroll(resource, scrollMode, slotIndex)) { + return true; + } + } + return false; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/package-info.java new file mode 100644 index 000000000..77d1e27d2 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/strategy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractFluidGridResourceFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractFluidGridResourceFactory.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractFluidGridResourceFactory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractFluidGridResourceFactory.java index d2fde502b..d19faef65 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractFluidGridResourceFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractFluidGridResourceFactory.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.view; +package com.refinedmods.refinedstorage.platform.common.grid.view; -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import java.util.Optional; import java.util.Set; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractItemGridResourceFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractItemGridResourceFactory.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractItemGridResourceFactory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractItemGridResourceFactory.java index 3ea3c8849..70b1347a8 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/AbstractItemGridResourceFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/AbstractItemGridResourceFactory.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.view; +package com.refinedmods.refinedstorage.platform.common.grid.view; -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.Optional; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/CompositeGridResourceFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/CompositeGridResourceFactory.java new file mode 100644 index 000000000..858b7d855 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/CompositeGridResourceFactory.java @@ -0,0 +1,25 @@ +package com.refinedmods.refinedstorage.platform.common.grid.view; + +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; + +import java.util.Optional; + +public class CompositeGridResourceFactory implements GridResourceFactory { + private final PlatformRegistry resourceTypeRegistry; + + public CompositeGridResourceFactory(final PlatformRegistry resourceTypeRegistry) { + this.resourceTypeRegistry = resourceTypeRegistry; + } + + @Override + public Optional apply(final ResourceAmount resourceAmount) { + return resourceTypeRegistry.getAll() + .stream() + .flatMap(type -> type.toGridResource(resourceAmount).stream()) + .findFirst(); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java new file mode 100644 index 000000000..ea8366815 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/FluidGridResource.java @@ -0,0 +1,106 @@ +package com.refinedmods.refinedstorage.platform.common.grid.view; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.grid.GridResourceAttributeKeys; +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.view.AbstractPlatformGridResource; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import javax.annotation.Nullable; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; + +public class FluidGridResource extends AbstractPlatformGridResource { + private final FluidResource fluidResource; + private final int id; + + public FluidGridResource(final ResourceAmount resourceAmount, + final String name, + final String modId, + final String modName, + final Set tags, + final String tooltip) { + super(resourceAmount, name, Map.of( + GridResourceAttributeKeys.MOD_ID, Set.of(modId), + GridResourceAttributeKeys.MOD_NAME, Set.of(modName), + GridResourceAttributeKeys.TAGS, tags, + GridResourceAttributeKeys.TOOLTIP, Set.of(tooltip) + )); + this.fluidResource = (FluidResource) resourceAmount.getResource(); + this.id = BuiltInRegistries.FLUID.getId(fluidResource.fluid()); + } + + @Override + public int getRegistryId() { + return id; + } + + @Override + public List getExtractionHints() { + return Platform.INSTANCE.convertToBucket(fluidResource).map( + bucket -> (ClientTooltipComponent) new MouseWithIconClientTooltipComponent( + MouseWithIconClientTooltipComponent.Type.LEFT, + (graphics, x, y) -> graphics.renderItem(bucket, x, y), + null + ) + ).stream().toList(); + } + + @Nullable + @Override + public PlatformResourceKey getUnderlyingResource() { + return fluidResource; + } + + @Override + public void onExtract(final GridExtractMode extractMode, + final boolean cursor, + final GridExtractionStrategy extractionStrategy) { + extractionStrategy.onExtract(fluidResource, extractMode, cursor); + } + + @Override + public void onScroll(final GridScrollMode scrollMode, final GridScrollingStrategy scrollingStrategy) { + // no-op + } + + @Override + public void render(final GuiGraphics graphics, final int x, final int y) { + Platform.INSTANCE.getFluidRenderer().render(graphics.pose(), x, y, fluidResource); + } + + @Override + public String getDisplayedAmount() { + return FluidResourceRendering.formatWithUnits(getAmount()); + } + + @Override + public String getAmountInTooltip() { + return FluidResourceRendering.format(getAmount()); + } + + @Override + public List getTooltip() { + return Platform.INSTANCE.getFluidRenderer().getTooltip(fluidResource); + } + + @Override + public Optional getTooltipImage() { + return Optional.empty(); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/ItemGridResource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/ItemGridResource.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java index 78b4eab51..95db4aff2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/ItemGridResource.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/ItemGridResource.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.view; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.grid.GridResourceAttributeKeys; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.view.AbstractPlatformGridResource; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; +package com.refinedmods.refinedstorage.platform.common.grid.view; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.grid.GridResourceAttributeKeys; +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.grid.view.AbstractPlatformGridResource; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; import java.util.List; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/package-info.java new file mode 100644 index 000000000..bae0e4c98 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/grid/view/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.grid.view; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/ExportedResourcesContainer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/ExportedResourcesContainer.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/ExportedResourcesContainer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/ExportedResourcesContainer.java index de146ad62..29fa88f85 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/ExportedResourcesContainer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/ExportedResourcesContainer.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.iface; +package com.refinedmods.refinedstorage.platform.common.iface; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceExportState; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.channel.FuzzyStorageChannel; -import com.refinedmods.refinedstorage2.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceExportState; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import java.util.Collection; import java.util.Collections; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlock.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlock.java index 91f870bbe..7b4140f49 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlock.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.iface; +package com.refinedmods.refinedstorage.platform.common.iface; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -22,7 +22,7 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BooleanProperty; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class InterfaceBlock extends AbstractBaseBlock implements EntityBlock { private static final Component HELP = createTranslation("item", "interface.help"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlockEntity.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlockEntity.java index e7923471b..d9b59f72e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceBlockEntity.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage2.platform.common.iface; - -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProvider; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProviderImpl; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +package com.refinedmods.refinedstorage.platform.common.iface; + +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProvider; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProviderImpl; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceContainerMenu.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceContainerMenu.java index 745466840..938a121d2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceContainerMenu.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage2.platform.common.iface; +package com.refinedmods.refinedstorage.platform.common.iface; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; import net.minecraft.network.chat.Component; import net.minecraft.world.Container; @@ -17,7 +17,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class InterfaceContainerMenu extends AbstractResourceContainerMenu { private static final int EXPORT_CONFIG_SLOT_X = 8; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceData.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceData.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceData.java index a41abb0a4..e731c9e58 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceData.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceData.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.iface; +package com.refinedmods.refinedstorage.platform.common.iface; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java index 16969e1a6..f0fd2a288 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfacePlatformExternalStorageProviderFactory.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.iface; +package com.refinedmods.refinedstorage.platform.common.iface; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage2.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; +import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceProxyExternalStorageProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceProxyExternalStorageProvider.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceProxyExternalStorageProvider.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceProxyExternalStorageProvider.java index 4eeaf204f..ba1e7d91d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceProxyExternalStorageProvider.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceProxyExternalStorageProvider.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.iface; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProvider; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; +package com.refinedmods.refinedstorage.platform.common.iface; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.InterfaceNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.iface.externalstorage.InterfaceExternalStorageProvider; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; import java.util.Collections; import java.util.Iterator; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceScreen.java new file mode 100644 index 000000000..2d8ca7b47 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/InterfaceScreen.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage.platform.common.iface; + +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; + +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public class InterfaceScreen extends AbstractBaseScreen { + private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/interface.png"); + + public InterfaceScreen(final InterfaceContainerMenu menu, + final Inventory playerInventory, + final Component text) { + super(menu, playerInventory, text); + this.inventoryLabelY = 88; + this.imageWidth = 176; + this.imageHeight = 182; + } + + @Override + protected void init() { + super.init(); + addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); + addSideButton(new FuzzyModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FUZZY_MODE), + () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK + )); + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/package-info.java new file mode 100644 index 000000000..8b82a4638 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/iface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.iface; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlock.java new file mode 100644 index 000000000..6932cff56 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlock.java @@ -0,0 +1,93 @@ +package com.refinedmods.refinedstorage.platform.common.importer; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalCableBlock; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.platform.common.support.DirectionalCableBlockShapes; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import java.util.HashMap; +import java.util.Map; +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.shapes.VoxelShape; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ImporterBlock extends AbstractDirectionalCableBlock implements + ColorableBlock, EntityBlock, BlockItemProvider { + private static final Component HELP = createTranslation("item", "importer.help"); + private static final Map SHAPE_CACHE = new HashMap<>(); + private static final AbstractBlockEntityTicker TICKER = + new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getImporter); + private final DyeColor color; + private final MutableComponent name; + + public ImporterBlock(final DyeColor color, final MutableComponent name) { + super(SHAPE_CACHE); + this.color = color; + this.name = name; + } + + @Override + public DyeColor getColor() { + return color; + } + + @Override + public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { + return new ImporterBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(final Level level, + final BlockState blockState, + final BlockEntityType type) { + return TICKER.get(level, type); + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getImporter(); + } + + @Override + protected VoxelShape getExtensionShape(final Direction direction) { + return switch (direction) { + case NORTH -> DirectionalCableBlockShapes.IMPORTER_NORTH; + case EAST -> DirectionalCableBlockShapes.IMPORTER_EAST; + case SOUTH -> DirectionalCableBlockShapes.IMPORTER_SOUTH; + case WEST -> DirectionalCableBlockShapes.IMPORTER_WEST; + case UP -> DirectionalCableBlockShapes.IMPORTER_UP; + case DOWN -> DirectionalCableBlockShapes.IMPORTER_DOWN; + }; + } + + @Override + public MutableComponent getName() { + return name; + } + + @Override + public BaseBlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlockEntity.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlockEntity.java index 98443f735..eec1924d5 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterBlockEntity.java @@ -1,24 +1,24 @@ -package com.refinedmods.refinedstorage2.platform.common.importer; - -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; +package com.refinedmods.refinedstorage.platform.common.importer; + +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterContainerMenu.java new file mode 100644 index 000000000..3f8c687ff --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterContainerMenu.java @@ -0,0 +1,78 @@ +package com.refinedmods.refinedstorage.platform.common.importer; + +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSimpleFilterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; + +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ImporterContainerMenu extends AbstractSimpleFilterContainerMenu { + private static final MutableComponent FILTER_HELP = createTranslation("gui", "importer.filter_help"); + + public ImporterContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { + super( + Menus.INSTANCE.getImporter(), + syncId, + playerInventory.player, + resourceContainerData, + UpgradeDestinations.IMPORTER, + FILTER_HELP + ); + } + + ImporterContainerMenu(final int syncId, + final Player player, + final ImporterBlockEntity importer, + final ResourceContainer resourceContainer, + final UpgradeContainer upgradeContainer) { + super( + Menus.INSTANCE.getImporter(), + syncId, + player, + resourceContainer, + upgradeContainer, + importer, + FILTER_HELP + ); + } + + @Override + protected void registerClientProperties() { + registerProperty(new ClientProperty<>(PropertyTypes.FILTER_MODE, FilterMode.BLOCK)); + registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); + registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); + } + + @Override + protected void registerServerProperties(final ImporterBlockEntity blockEntity) { + registerProperty(new ServerProperty<>( + PropertyTypes.FILTER_MODE, + blockEntity::getFilterMode, + blockEntity::setFilterMode + )); + registerProperty(new ServerProperty<>( + PropertyTypes.FUZZY_MODE, + blockEntity::isFuzzyMode, + blockEntity::setFuzzyMode + )); + registerProperty(new ServerProperty<>( + PropertyTypes.REDSTONE_MODE, + blockEntity::getRedstoneMode, + blockEntity::setRedstoneMode + )); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterScreen.java new file mode 100644 index 000000000..6527cdcfd --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterScreen.java @@ -0,0 +1,31 @@ +package com.refinedmods.refinedstorage.platform.common.importer; + +import com.refinedmods.refinedstorage.platform.common.storage.FilterModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ImporterScreen extends AbstractFilterScreen { + public ImporterScreen(final ImporterContainerMenu menu, final Inventory playerInventory, final Component text) { + super(menu, playerInventory, text); + } + + @Override + protected void init() { + super.init(); + addSideButton(new FilterModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FILTER_MODE), + createTranslation("gui", "importer.filter_mode.allow.help"), + createTranslation("gui", "importer.filter_mode.block.help") + )); + addSideButton(new FuzzyModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FUZZY_MODE), + () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_SOURCE + )); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/package-info.java new file mode 100644 index 000000000..97bc9c7e3 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/ProcessorItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/ProcessorItem.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/ProcessorItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/ProcessorItem.java index af6e6b2f9..48310f713 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/ProcessorItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/ProcessorItem.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.misc; +package com.refinedmods.refinedstorage.platform.common.misc; import net.minecraft.world.item.Item; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/WrenchItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/WrenchItem.java new file mode 100644 index 000000000..4b2db240a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/WrenchItem.java @@ -0,0 +1,25 @@ +package com.refinedmods.refinedstorage.platform.common.misc; + +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; + +import java.util.Optional; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class WrenchItem extends Item { + private static final Component HELP = createTranslation("item", "wrench.help"); + + public WrenchItem() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(HELP)); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/package-info.java new file mode 100644 index 000000000..8beeae0a5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/misc/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.misc; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/CableBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/CableBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java index 38a566421..7e15780d1 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/CableBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/CableBlock.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractColoredBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.CableBlockSupport; -import com.refinedmods.refinedstorage2.platform.common.support.CableShapeCacheKey; -import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractColoredBlock; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport; +import com.refinedmods.refinedstorage.platform.common.support.CableShapeCacheKey; +import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -42,7 +42,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class CableBlock extends AbstractColoredBlock implements ColorableBlock, SimpleWaterloggedBlock, EntityBlock { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardInventory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardInventory.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardInventory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardInventory.java index c623642b3..3f5ee36ac 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardInventory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardInventory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; -import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItem.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItem.java index 4adc7cd2d..4e464daec 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItem.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.content.DataComponents; import java.util.List; import java.util.Optional; @@ -24,8 +24,8 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverKey.getDimensionName; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverKey.getDimensionName; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class NetworkCardItem extends Item { private static final MutableComponent UNBOUND_HELP = createTranslation("item", "network_card.unbound_help"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItemPropertyFunction.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItemPropertyFunction.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItemPropertyFunction.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItemPropertyFunction.java index 54b3f4338..516aad278 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkCardItemPropertyFunction.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkCardItemPropertyFunction.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; import javax.annotation.Nullable; @@ -8,7 +8,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class NetworkCardItemPropertyFunction implements ClampedItemPropertyFunction { public static final ResourceLocation NAME = createIdentifier("network_card_active"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlock.java new file mode 100644 index 000000000..2db3e34a5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlock.java @@ -0,0 +1,81 @@ +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractColoredBlock; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BooleanProperty; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class NetworkReceiverBlock extends AbstractColoredBlock implements EntityBlock { + public static final BooleanProperty ACTIVE = BooleanProperty.create("active"); + + private static final AbstractBlockEntityTicker TICKER = + new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getNetworkReceiver, ACTIVE); + private static final Component HELP = createTranslation("item", "network_receiver.help"); + + public NetworkReceiverBlock(final DyeColor color, final MutableComponent name) { + super(BlockConstants.PROPERTIES, color, name); + } + + @Override + protected BlockState getDefaultState() { + return super.getDefaultState().setValue(ACTIVE, false); + } + + @Override + protected void createBlockStateDefinition(final StateDefinition.Builder builder) { + super.createBlockStateDefinition(builder); + builder.add(ACTIVE); + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getNetworkReceiver(); + } + + @Nullable + @Override + public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { + return new NetworkReceiverBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(final Level level, + final BlockState blockState, + final BlockEntityType type) { + return TICKER.get(level, type); + } + + @Override + public BaseBlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } + + @Override + public boolean canAlwaysConnect() { + return true; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlockEntity.java new file mode 100644 index 000000000..17d081a53 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverBlockEntity.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; + +public class NetworkReceiverBlockEntity extends BaseNetworkNodeContainerBlockEntity { + public NetworkReceiverBlockEntity(final BlockPos pos, final BlockState state) { + super( + BlockEntities.INSTANCE.getNetworkReceiver(), + pos, + state, + new SimpleNetworkNode(Platform.INSTANCE.getConfig().getNetworkReceiver().getEnergyUsage()) + ); + } + + @Override + protected InWorldNetworkNodeContainer createMainContainer(final SimpleNetworkNode node) { + return PlatformApi.INSTANCE.createInWorldNetworkNodeContainer( + this, + node, + MAIN_CONTAINER_NAME, + 0, + this, + () -> new NetworkReceiverKey(mainContainer.getPosition()) + ); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverKey.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverKey.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverKey.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverKey.java index f13eacf67..285839a48 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverKey.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkReceiverKey.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; import net.minecraft.core.BlockPos; import net.minecraft.core.GlobalPos; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlock.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlock.java index 98f8471b3..f62f18ab1 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlock.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractColoredBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractColoredBlock; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; import javax.annotation.Nullable; @@ -24,7 +24,7 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.EnumProperty; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class NetworkTransmitterBlock extends AbstractColoredBlock implements EntityBlock { public static final EnumProperty STATE = EnumProperty.create( diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntity.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntity.java index 83c66c6ea..f3fd8a91e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntity.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; import javax.annotation.Nullable; @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class NetworkTransmitterBlockEntity extends AbstractRedstoneModeNetworkNodeContainerBlockEntity diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntityTicker.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntityTicker.java new file mode 100644 index 000000000..1aaf07035 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterBlockEntityTicker.java @@ -0,0 +1,25 @@ +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; + +public class NetworkTransmitterBlockEntityTicker + extends NetworkNodeBlockEntityTicker { + NetworkTransmitterBlockEntityTicker() { + super(BlockEntities.INSTANCE::getNetworkTransmitter); + } + + @Override + public void tick(final Level level, + final BlockPos pos, + final BlockState state, + final NetworkTransmitterBlockEntity blockEntity) { + super.tick(level, pos, state, blockEntity); + blockEntity.updateStateInLevel(state); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterContainerMenu.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterContainerMenu.java index b5c8d47d2..efb7ef849 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterContainerMenu.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterData.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterData.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterData.java index a5bd82539..0b9fe6fc8 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterData.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterData.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterScreen.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterScreen.java index b9033acce..4cef74c83 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterScreen.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class NetworkTransmitterScreen extends AbstractBaseScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/network_transmitter.png"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterState.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterState.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterState.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterState.java index f8ce3cc2f..e42adfd79 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterState.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/NetworkTransmitterState.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; import net.minecraft.util.StringRepresentable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlock.java new file mode 100644 index 000000000..d43f51659 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlock.java @@ -0,0 +1,71 @@ +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class RelayBlock extends AbstractActiveColoredDirectionalBlock + implements EntityBlock, BlockItemProvider { + private static final Component HELP = createTranslation("item", "relay.help"); + private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>( + BlockEntities.INSTANCE::getRelay, + ACTIVE + ); + + public RelayBlock(final DyeColor color, final MutableComponent name) { + super(BlockConstants.PROPERTIES, color, name); + } + + @Nullable + @Override + public BlockEntity newBlockEntity(final BlockPos blockPos, final BlockState blockState) { + return new RelayBlockEntity(blockPos, blockState); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(final Level level, + final BlockState blockState, + final BlockEntityType type) { + return TICKER.get(level, type); + } + + @Override + protected DirectionType getDirectionType() { + return DefaultDirectionType.FACE_PLAYER; + } + + @Override + public BaseBlockItem createBlockItem() { + return new BaseBlockItem(this, HELP); + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getRelay(); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlockEntity.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlockEntity.java index 41c0d4397..f29f25142 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayBlockEntity.java @@ -1,23 +1,23 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayComponentType; -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayInputNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayOutputNetworkNode; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.storage.AccessModeSettings; -import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayComponentType; +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayInputNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayOutputNetworkNode; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.storage.AccessModeSettings; +import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import java.util.HashSet; import java.util.Set; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayContainerMenu.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayContainerMenu.java index bfa0d1017..02465c1ab 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayContainerMenu.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.storage.StoragePropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSimpleFilterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.storage.StoragePropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSimpleFilterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; import javax.annotation.Nullable; @@ -18,7 +18,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class RelayContainerMenu extends AbstractSimpleFilterContainerMenu { private static final MutableComponent FILTER_HELP = createTranslation("gui", "relay.filter_help"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayInputNetworkNodeContainer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayInputNetworkNodeContainer.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayInputNetworkNodeContainer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayInputNetworkNodeContainer.java index f20428859..93c70bad6 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayInputNetworkNodeContainer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayInputNetworkNodeContainer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage2.platform.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.platform.common.support.network.InWorldNetworkNodeContainerImpl; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayOutputNetworkNodeContainer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayOutputNetworkNodeContainer.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayOutputNetworkNodeContainer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayOutputNetworkNodeContainer.java index 0d45d4d91..da0ee9be3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayOutputNetworkNodeContainer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayOutputNetworkNodeContainer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayOutputNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage2.platform.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.relay.RelayOutputNetworkNode; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.platform.common.support.network.InWorldNetworkNodeContainerImpl; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassEnergySideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassEnergySideButtonWidget.java new file mode 100644 index 000000000..023e1e6b7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassEnergySideButtonWidget.java @@ -0,0 +1,36 @@ +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; + +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +class RelayPassEnergySideButtonWidget extends AbstractYesNoSideButtonWidget { + private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_energy"); + private static final MutableComponent HELP = createTranslation("gui", "relay.pass_energy.help"); + + RelayPassEnergySideButtonWidget(final ClientProperty property) { + super(property, TITLE); + } + + @Override + protected int getXTexture() { + return Boolean.TRUE.equals(property.getValue()) ? 128 : 144; + } + + @Override + protected int getYTexture() { + return 0; + } + + @Nullable + @Override + protected Component getHelpText() { + return HELP; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassSecuritySideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassSecuritySideButtonWidget.java new file mode 100644 index 000000000..77b236435 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassSecuritySideButtonWidget.java @@ -0,0 +1,36 @@ +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; + +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +class RelayPassSecuritySideButtonWidget extends AbstractYesNoSideButtonWidget { + private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_security"); + private static final MutableComponent HELP = createTranslation("gui", "relay.pass_security.help"); + + RelayPassSecuritySideButtonWidget(final ClientProperty property) { + super(property, TITLE); + } + + @Override + protected int getXTexture() { + return Boolean.TRUE.equals(property.getValue()) ? 128 : 144; + } + + @Override + protected int getYTexture() { + return 32; + } + + @Nullable + @Override + protected Component getHelpText() { + return HELP; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassStorageSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassStorageSideButtonWidget.java new file mode 100644 index 000000000..db2b50904 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassStorageSideButtonWidget.java @@ -0,0 +1,36 @@ +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; + +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +class RelayPassStorageSideButtonWidget extends AbstractYesNoSideButtonWidget { + private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_storage"); + private static final MutableComponent HELP = createTranslation("gui", "relay.pass_storage.help"); + + RelayPassStorageSideButtonWidget(final ClientProperty property) { + super(property, TITLE); + } + + @Override + protected int getXTexture() { + return Boolean.TRUE.equals(property.getValue()) ? 128 : 144; + } + + @Override + protected int getYTexture() { + return 16; + } + + @Nullable + @Override + protected Component getHelpText() { + return HELP; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassThroughSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassThroughSideButtonWidget.java new file mode 100644 index 000000000..da4be54fe --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPassThroughSideButtonWidget.java @@ -0,0 +1,36 @@ +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; + +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +class RelayPassThroughSideButtonWidget extends AbstractYesNoSideButtonWidget { + private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_through"); + private static final MutableComponent HELP = createTranslation("gui", "relay.pass_through.help"); + + RelayPassThroughSideButtonWidget(final ClientProperty property) { + super(property, TITLE); + } + + @Override + protected int getXTexture() { + return Boolean.TRUE.equals(property.getValue()) ? 96 : 112; + } + + @Override + protected int getYTexture() { + return 0; + } + + @Nullable + @Override + protected Component getHelpText() { + return HELP; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPropertyTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPropertyTypes.java new file mode 100644 index 000000000..8fa986184 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayPropertyTypes.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +final class RelayPropertyTypes { + static final PropertyType PASS_THROUGH = PropertyTypes.createBooleanProperty( + createIdentifier("pass_through") + ); + static final PropertyType PASS_ENERGY = PropertyTypes.createBooleanProperty( + createIdentifier("pass_energy") + ); + static final PropertyType PASS_STORAGE = PropertyTypes.createBooleanProperty( + createIdentifier("pass_storage") + ); + static final PropertyType PASS_SECURITY = PropertyTypes.createBooleanProperty( + createIdentifier("pass_security") + ); + + private RelayPropertyTypes() { + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayScreen.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayScreen.java index 9b369e8a1..b88c74bf3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/RelayScreen.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; +package com.refinedmods.refinedstorage.platform.common.networking; -import com.refinedmods.refinedstorage2.platform.common.storage.AccessModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.storage.FilterModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.storage.PrioritySideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.storage.StoragePropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.storage.AccessModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.storage.FilterModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.storage.PrioritySideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.storage.StoragePropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; import javax.annotation.Nullable; @@ -15,7 +15,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class RelayScreen extends AbstractFilterScreen implements RelayContainerMenu.PassThroughListener { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/package-info.java new file mode 100644 index 000000000..d3d6c5954 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/networking/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.networking; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/package-info.java new file mode 100644 index 000000000..1e1668a02 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardContainerMenu.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardContainerMenu.java index 9949ba1bf..3904a8acb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardContainerMenu.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage2.platform.common.support.stretching.ScreenSizeListener; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSizeListener; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java new file mode 100644 index 000000000..7717d2280 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; + +import java.util.List; +import java.util.Set; + +abstract class AbstractSecurityCardExtendedMenuProvider implements ExtendedMenuProvider { + private final SecurityPolicy securityPolicy; + private final Set dirtyPermissions; + + AbstractSecurityCardExtendedMenuProvider(final SecurityPolicy securityPolicy, + final Set dirtyPermissions) { + this.securityPolicy = securityPolicy; + this.dirtyPermissions = dirtyPermissions; + } + + protected final List getDataPermissions() { + return PlatformApi.INSTANCE.getPermissionRegistry().getAll().stream().map(this::toDataPermission).toList(); + } + + private SecurityCardData.Permission toDataPermission(final PlatformPermission permission) { + return new SecurityCardData.Permission( + permission, + securityPolicy.isAllowed(permission), + dirtyPermissions.contains(permission) + ); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardItem.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardItem.java index 201734078..9994efd51 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardItem.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.api.network.security.Permission; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.security.SecurityPolicyContainerItem; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.security.SecurityPolicyContainerItem; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.DataComponents; import java.util.HashSet; import java.util.List; @@ -27,7 +27,7 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; abstract class AbstractSecurityCardItem extends Item implements SecurityPolicyContainerItem { protected AbstractSecurityCardItem(final Properties properties) { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardScreen.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardScreen.java index 308bb2118..98697e556 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/AbstractSecurityCardScreen.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.common.support.stretching.AbstractStretchingScreen; -import com.refinedmods.refinedstorage2.platform.common.support.widget.CustomCheckboxWidget; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.common.support.stretching.AbstractStretchingScreen; +import com.refinedmods.refinedstorage.platform.common.support.widget.CustomCheckboxWidget; import java.util.ArrayList; import java.util.List; @@ -17,8 +17,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public abstract class AbstractSecurityCardScreen extends AbstractStretchingScreen { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/BuiltinPermission.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/BuiltinPermission.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/BuiltinPermission.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/BuiltinPermission.java index f796acbf6..27fa26f1d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/BuiltinPermission.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/BuiltinPermission.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.platform.api.security.BuiltinPermissions; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.api.security.BuiltinPermissions; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public enum BuiltinPermission implements PlatformPermission { /** diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardContainerMenu.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardContainerMenu.java index 0db10591a..f1d57ba2c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardContainerMenu.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.content.Menus; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java index 0947fc515..598eb288a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardExtendedMenuProvider.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; import java.util.Set; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardItem.java new file mode 100644 index 000000000..7034cb6e8 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardItem.java @@ -0,0 +1,53 @@ +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.api.network.security.SecurityActor; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.Platform; + +import java.util.Optional; +import java.util.Set; + +import net.minecraft.network.chat.Component; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class FallbackSecurityCardItem extends AbstractSecurityCardItem { + private static final Component HELP = createTranslation("item", "fallback_security_card.help"); + + public FallbackSecurityCardItem() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + AbstractSecurityCardExtendedMenuProvider createMenuProvider( + final MinecraftServer server, + final SlotReference slotReference, + final SecurityPolicy policy, + final Set dirtyPermissions, + final ItemStack stack + ) { + return new FallbackSecurityCardExtendedMenuProvider(slotReference, policy, dirtyPermissions); + } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(HELP)); + } + + @Override + public Optional getActor(final ItemStack stack) { + return Optional.empty(); + } + + @Override + public long getEnergyUsage() { + return Platform.INSTANCE.getConfig().getFallbackSecurityCard().getEnergyUsage(); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardScreen.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardScreen.java index 3ea220f41..5453190a2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/FallbackSecurityCardScreen.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlatformSecurityNetworkComponentImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlatformSecurityNetworkComponentImpl.java new file mode 100644 index 000000000..9eb55463d --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlatformSecurityNetworkComponentImpl.java @@ -0,0 +1,31 @@ +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.api.network.impl.security.SecurityNetworkComponentImpl; +import com.refinedmods.refinedstorage.api.network.security.Permission; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.platform.api.security.PlatformSecurityNetworkComponent; + +import com.mojang.authlib.GameProfile; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; + +public class PlatformSecurityNetworkComponentImpl extends SecurityNetworkComponentImpl + implements PlatformSecurityNetworkComponent { + public PlatformSecurityNetworkComponentImpl(final SecurityPolicy defaultPolicy) { + super(defaultPolicy); + } + + @Override + public boolean isAllowed(final Permission permission, final ServerPlayer player) { + final MinecraftServer server = player.getServer(); + if (server == null) { + return false; + } + final GameProfile gameProfile = player.getGameProfile(); + if (server.getPlayerList().isOp(gameProfile)) { + return true; + } + final PlayerSecurityActor actor = new PlayerSecurityActor(gameProfile.getId()); + return super.isAllowed(permission, actor); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerBoundSecurityCardData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerBoundSecurityCardData.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerBoundSecurityCardData.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerBoundSecurityCardData.java index a18f25f47..e01a774fb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerBoundSecurityCardData.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerBoundSecurityCardData.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerSecurityActor.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerSecurityActor.java new file mode 100644 index 000000000..57ec3b289 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/PlayerSecurityActor.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.api.network.security.SecurityActor; + +import java.util.UUID; + +public record PlayerSecurityActor(UUID playerId) implements SecurityActor { +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardBoundPlayer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardBoundPlayer.java similarity index 95% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardBoundPlayer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardBoundPlayer.java index dce3c4918..448731dd0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardBoundPlayer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardBoundPlayer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; import java.util.UUID; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardContainerMenu.java similarity index 85% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardContainerMenu.java index 32d6ada0e..438d716a9 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardContainerMenu.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage2.platform.common.support.stretching.ScreenSizeListener; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSizeListener; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardData.java new file mode 100644 index 000000000..f1a5a0a88 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardData.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record SecurityCardData(SlotReference slotReference, List permissions) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + SlotReferenceFactory.STREAM_CODEC, SecurityCardData::slotReference, + ByteBufCodecs.collection( + ArrayList::new, + StreamCodec.composite( + PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), Permission::permission, + ByteBufCodecs.BOOL, Permission::allowed, + ByteBufCodecs.BOOL, Permission::dirty, + Permission::new + ) + ), SecurityCardData::permissions, + SecurityCardData::new + ); + + record Permission(PlatformPermission permission, boolean allowed, boolean dirty) { + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardExtendedMenuProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardExtendedMenuProvider.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardExtendedMenuProvider.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardExtendedMenuProvider.java index e0ca32bc0..54dab1eb5 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardExtendedMenuProvider.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardExtendedMenuProvider.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; import java.util.Set; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItem.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItem.java index d0daa0d97..04574364c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItem.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.api.network.security.SecurityActor; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.api.network.security.SecurityActor; +import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.DataComponents; import java.util.List; import java.util.Optional; @@ -25,7 +25,7 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; import static java.util.Objects.requireNonNull; public class SecurityCardItem extends AbstractSecurityCardItem { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItemPropertyFunction.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItemPropertyFunction.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItemPropertyFunction.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItemPropertyFunction.java index 8b228cf6b..27ed5fe87 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardItemPropertyFunction.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardItemPropertyFunction.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; import javax.annotation.Nullable; @@ -8,7 +8,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class SecurityCardItemPropertyFunction implements ClampedItemPropertyFunction { public static final ResourceLocation NAME = createIdentifier("security_card_active"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardPermissions.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardPermissions.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardPermissions.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardPermissions.java index 5d214cc49..8285fc94f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardPermissions.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardPermissions.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardScreen.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardScreen.java index 42cb63e5c..67ddaf511 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityCardScreen.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.security; +package com.refinedmods.refinedstorage.platform.common.security; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlock.java new file mode 100644 index 000000000..4b1a0a421 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlock.java @@ -0,0 +1,75 @@ +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.HorizontalDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.HorizontalDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class SecurityManagerBlock + extends AbstractActiveColoredDirectionalBlock + implements BlockItemProvider, EntityBlock { + private static final MutableComponent HELP = createTranslation("block", "security_manager.help"); + private static final AbstractBlockEntityTicker TICKER = + new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getSecurityManager, ACTIVE); + + public SecurityManagerBlock(final DyeColor color, final MutableComponent name) { + super(BlockConstants.PROPERTIES, color, name); + } + + @Override + protected DirectionType getDirectionType() { + return HorizontalDirectionType.INSTANCE; + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getSecurityManager(); + } + + @Override + public BaseBlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } + + @Nullable + @Override + public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { + return new SecurityManagerBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(final Level level, + final BlockState blockState, + final BlockEntityType type) { + return TICKER.get(level, type); + } + + @Override + public boolean canAlwaysConnect() { + return true; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlockEntity.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlockEntity.java index f9ad7c507..d12f96dd3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerBlockEntity.java @@ -1,18 +1,18 @@ -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.security.SecurityDecisionProviderImpl; -import com.refinedmods.refinedstorage2.platform.api.security.SecurityHelper; -import com.refinedmods.refinedstorage2.platform.api.security.SecurityPolicyContainerItem; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil; +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.api.network.impl.node.security.SecurityDecisionProviderProxyNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.security.SecurityDecisionProviderImpl; +import com.refinedmods.refinedstorage.platform.api.security.SecurityHelper; +import com.refinedmods.refinedstorage.platform.api.security.SecurityPolicyContainerItem; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerContainerMenu.java new file mode 100644 index 000000000..dafc1f52a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerContainerMenu.java @@ -0,0 +1,72 @@ +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; + +import javax.annotation.Nullable; + +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.Slot; + +import static com.refinedmods.refinedstorage.platform.common.security.SecurityManagerBlockEntity.CARD_AMOUNT; + +public class SecurityManagerContainerMenu extends AbstractBaseContainerMenu { + @Nullable + private Slot fallbackSecurityCardSlot; + + public SecurityManagerContainerMenu(final int syncId, final Inventory playerInventory) { + super(Menus.INSTANCE.getSecurityManager(), syncId); + addSlots( + playerInventory, + new FilteredContainer(CARD_AMOUNT, SecurityManagerBlockEntity::isValidSecurityCard), + new FilteredContainer(1, SecurityManagerBlockEntity::isValidFallbackSecurityCard) + ); + registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); + } + + SecurityManagerContainerMenu(final int syncId, + final Inventory playerInventory, + final SecurityManagerBlockEntity securityManager) { + super(Menus.INSTANCE.getSecurityManager(), syncId); + addSlots(playerInventory, securityManager.getSecurityCards(), securityManager.getFallbackSecurityCard()); + registerProperty(new ServerProperty<>( + PropertyTypes.REDSTONE_MODE, + securityManager::getRedstoneMode, + securityManager::setRedstoneMode + )); + } + + private void addSlots(final Inventory playerInventory, + final FilteredContainer securityCards, + final FilteredContainer fallbackSecurityCard) { + for (int i = 0; i < CARD_AMOUNT; ++i) { + final int column = i % 9; + final int x = 8 + (column * 18); + final int row = i / 9; + final int y = 20 + (row * 18); + addSlot(new ValidatedSlot(securityCards, i, x, y, SecurityManagerBlockEntity::isValidSecurityCard)); + } + fallbackSecurityCardSlot = new ValidatedSlot( + fallbackSecurityCard, + 0, + 174, + 20, + SecurityManagerBlockEntity::isValidFallbackSecurityCard + ); + addSlot(fallbackSecurityCardSlot); + addPlayerInventory(playerInventory, 8, 72); + transferManager.addBiTransfer(playerInventory, securityCards); + transferManager.addBiTransfer(playerInventory, fallbackSecurityCard); + } + + @Nullable + Slot getFallbackSecurityCardSlot() { + return fallbackSecurityCardSlot; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerScreen.java new file mode 100644 index 000000000..5d2aba12b --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/SecurityManagerScreen.java @@ -0,0 +1,61 @@ +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; + +import java.util.List; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class SecurityManagerScreen extends AbstractBaseScreen { + private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/security_manager.png"); + + public SecurityManagerScreen(final SecurityManagerContainerMenu menu, + final Inventory playerInventory, + final Component text) { + super(menu, playerInventory, text); + this.inventoryLabelY = 59; + this.imageWidth = 197; + this.imageHeight = 154; + } + + @Override + protected void init() { + super.init(); + addSideButton(new RedstoneModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.REDSTONE_MODE), + createTranslation("gui", "security_manager.redstone_mode_help") + )); + } + + @Override + protected void renderTooltip(final GuiGraphics graphics, final int x, final int y) { + if (hoveredSlot != null && hoveredSlot == menu.getFallbackSecurityCardSlot() && !hoveredSlot.hasItem()) { + Platform.INSTANCE.renderTooltip(graphics, List.of( + ClientTooltipComponent.create( + createTranslation("gui", "security_manager.fallback_security_card_slot_hint").getVisualOrderText() + ), + HelpClientTooltipComponent.create( + createTranslation("gui", "security_manager.no_fallback_security_card_consequence") + ) + ), x, y); + return; + } + super.renderTooltip(graphics, x, y); + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/package-info.java new file mode 100644 index 000000000..41a347413 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/security/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.security; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractDiskContainerBlockEntity.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractDiskContainerBlockEntity.java index 6aa783e6b..317562c9d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractDiskContainerBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractDiskContainerBlockEntity.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractStorageContainerNetworkNode; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil; +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; import java.util.Set; import java.util.function.UnaryOperator; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractProgressStorageScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractProgressStorageScreen.java similarity index 92% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractProgressStorageScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractProgressStorageScreen.java index 264ef8f7b..27305545f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractProgressStorageScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractProgressStorageScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.platform.common.support.widget.ProgressWidget; +import com.refinedmods.refinedstorage.platform.common.support.widget.ProgressWidget; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageContainerMenu.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageContainerMenu.java index 180984395..9403de774 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageContainerMenu.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageScreen.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageScreen.java index 5c8d5c29c..4e47d7910 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AbstractStorageScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AbstractStorageScreen.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public abstract class AbstractStorageScreen extends AbstractBaseScreen { private static final Component ALLOW_FILTER_MODE_HELP = createTranslation("gui", "storage.filter_mode.allow.help"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AccessModeSettings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSettings.java similarity index 85% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AccessModeSettings.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSettings.java index 200ffa503..bcfcecc41 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AccessModeSettings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSettings.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; public class AccessModeSettings { private static final int INSERT_EXTRACT = 0; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AccessModeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSideButtonWidget.java similarity index 85% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AccessModeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSideButtonWidget.java index 957f45eb2..450550cfd 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/AccessModeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/AccessModeSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class AccessModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "access_mode"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/BucketPlayerInventoryInsertableStorage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/BucketPlayerInventoryInsertableStorage.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java index e4a2fab44..febd4abd6 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/BucketPlayerInventoryInsertableStorage.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/BucketPlayerInventoryInsertableStorage.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepository.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepository.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepository.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepository.java index a59b104e4..9bf3eba78 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepository.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepository.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/Disk.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/Disk.java new file mode 100644 index 000000000..e42f6cab7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/Disk.java @@ -0,0 +1,10 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.storage.StorageState; + +import javax.annotation.Nullable; + +import net.minecraft.world.item.Item; + +public record Disk(@Nullable Item item, StorageState state) { +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskContainerBlockEntityTicker.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskContainerBlockEntityTicker.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskContainerBlockEntityTicker.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskContainerBlockEntityTicker.java index bd72bbf22..afb35e97b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskContainerBlockEntityTicker.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskContainerBlockEntityTicker.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractStorageContainerNetworkNode; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskInventory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskInventory.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskInventory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskInventory.java index 3345e5bad..991515b3f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskInventory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskInventory.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractStorageContainerNetworkNode; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; import java.util.Optional; import java.util.function.IntFunction; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskStateChangeListener.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskStateChangeListener.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskStateChangeListener.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskStateChangeListener.java index b2be6cb39..3e2cc9dc7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/DiskStateChangeListener.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/DiskStateChangeListener.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage; +import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; import com.google.common.util.concurrent.RateLimiter; import net.minecraft.world.level.Level; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FilterModeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FilterModeSideButtonWidget.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FilterModeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FilterModeSideButtonWidget.java index a3f5707b8..b85acaf6e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FilterModeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FilterModeSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class FilterModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "filter_mode"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageType.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageType.java index d9aba1525..e68d49576 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/FluidStorageType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/FluidStorageType.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageType; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageType.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageType.java index 9a5e8705c..a1d8db5c1 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/ItemStorageType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/ItemStorageType.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageType; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorage.java new file mode 100644 index 000000000..f2c6e92b1 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorage.java @@ -0,0 +1,23 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; +import com.refinedmods.refinedstorage.platform.api.storage.StorageType; + +class LimitedPlatformStorage extends PlatformStorage implements LimitedStorage { + private final LimitedStorageImpl limitedStorage; + + LimitedPlatformStorage(final LimitedStorageImpl delegate, + final StorageType type, + final TrackedStorageRepository trackingRepository, + final Runnable listener) { + super(delegate, type, trackingRepository, listener); + this.limitedStorage = delegate; + } + + @Override + public long getCapacity() { + return limitedStorage.getCapacity(); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PlatformStorage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PlatformStorage.java new file mode 100644 index 000000000..380b88bdd --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PlatformStorage.java @@ -0,0 +1,78 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.AbstractProxyStorage; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageType; + +import java.util.Optional; + +class PlatformStorage extends AbstractProxyStorage implements SerializableStorage, TrackedStorage { + private final StorageType type; + private final TrackedStorageRepository trackingRepository; + private final Runnable listener; + + PlatformStorage(final Storage delegate, + final StorageType type, + final TrackedStorageRepository trackingRepository, + final Runnable listener) { + super(delegate); + this.type = type; + this.trackingRepository = trackingRepository; + this.listener = listener; + } + + void load(final StorageCodecs.StorageResource storageResource) { + final ResourceKey resource = storageResource.resource(); + if (!type.isAllowed(resource)) { + return; + } + super.insert(resource, storageResource.amount(), Action.EXECUTE, EmptyActor.INSTANCE); + storageResource.changed().ifPresent( + changed -> trackingRepository.update(resource, new PlayerActor(changed.changedBy()), changed.changedAt()) + ); + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + if (!type.isAllowed(resource)) { + return 0; + } + final long extracted = super.extract(resource, amount, action, actor); + if (extracted > 0 && action == Action.EXECUTE) { + listener.run(); + } + return extracted; + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + if (!type.isAllowed(resource)) { + return 0; + } + final long inserted = super.insert(resource, amount, action, actor); + if (inserted > 0 && action == Action.EXECUTE) { + listener.run(); + } + return inserted; + } + + @Override + public StorageType getType() { + return type; + } + + @Override + public Optional findTrackedResourceByActorType(final ResourceKey resource, + final Class actorType) { + return trackingRepository.findTrackedResourceByActorType(resource, actorType); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PrioritySideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PrioritySideButtonWidget.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PrioritySideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PrioritySideButtonWidget.java index 94fc285af..a6d6ad780 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PrioritySideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/PrioritySideButtonWidget.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.platform.common.support.amount.PriorityScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.amount.PriorityScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; @@ -10,7 +10,7 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class PrioritySideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "priority"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageAccessor.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageAccessor.java new file mode 100644 index 000000000..e75df6a63 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageAccessor.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +public interface StorageAccessor { + long getStored(); + + long getCapacity(); + + double getProgress(); + + boolean hasCapacity(); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageCodecs.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageCodecs.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java index d7151cfb9..217938b6e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageCodecs.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageCodecs.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; import java.util.List; import java.util.Optional; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainer.java new file mode 100644 index 000000000..7abf7a563 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainer.java @@ -0,0 +1,31 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; + +public interface StorageConfigurationContainer { + int getPriority(); + + void setPriority(int priority); + + FilterMode getFilterMode(); + + void setFilterMode(FilterMode filterMode); + + boolean isFuzzyMode(); + + void setFuzzyMode(boolean fuzzyMode); + + AccessMode getAccessMode(); + + void setAccessMode(AccessMode accessMode); + + boolean isVoidExcess(); + + void setVoidExcess(boolean voidExcess); + + RedstoneMode getRedstoneMode(); + + void setRedstoneMode(RedstoneMode redstoneMode); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageConfigurationContainerImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainerImpl.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageConfigurationContainerImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainerImpl.java index 6ba6f56a8..6f3788250 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageConfigurationContainerImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageConfigurationContainerImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.network.impl.storage.StorageConfiguration; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.network.impl.storage.StorageConfiguration; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageContainerItemHelperImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageContainerItemHelperImpl.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageContainerItemHelperImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageContainerItemHelperImpl.java index 3eb060112..a073710b0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageContainerItemHelperImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageContainerItemHelperImpl.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageBlockEntity; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItemHelper; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageBlockEntity; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItemHelper; +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.common.content.DataComponents; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StoragePropertyTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StoragePropertyTypes.java new file mode 100644 index 000000000..2b1bec840 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StoragePropertyTypes.java @@ -0,0 +1,26 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.storage.AccessMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public final class StoragePropertyTypes { + public static final PropertyType PRIORITY = PropertyTypes.createIntegerProperty( + createIdentifier("priority") + ); + + public static final PropertyType ACCESS_MODE = new PropertyType<>( + createIdentifier("access_mode"), + AccessModeSettings::getAccessMode, + AccessModeSettings::getAccessMode + ); + + public static final PropertyType VOID_EXCESS = PropertyTypes.createBooleanProperty( + createIdentifier("void_excess") + ); + + private StoragePropertyTypes() { + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java index 510385255..9cfb1055d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageRepositoryImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractSafeSavedData; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.common.support.AbstractSafeSavedData; import java.util.HashMap; import java.util.Map; @@ -18,7 +18,7 @@ import net.minecraft.nbt.NbtOps; public class StorageRepositoryImpl extends AbstractSafeSavedData implements StorageRepository { - public static final String NAME = "refinedstorage2_storages"; + public static final String NAME = "refinedstorage_storages"; private final Codec> codec = Codec.unboundedMap( UUIDUtil.STRING_CODEC, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTooltipHelper.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTooltipHelper.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTooltipHelper.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTooltipHelper.java index 3b3d562f0..7b7041aef 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTooltipHelper.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTooltipHelper.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; import java.util.List; import java.util.function.LongFunction; @@ -6,7 +6,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; final class StorageTooltipHelper { private StorageTooltipHelper() { diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java new file mode 100644 index 000000000..9dcea3419 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/StorageTypes.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.InMemoryTrackedStorageRepository; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageRepository; +import com.refinedmods.refinedstorage.platform.api.storage.StorageType; + +public final class StorageTypes { + public static final StorageType ITEM = new ItemStorageType(); + public static final StorageType FLUID = new FluidStorageType(); + + private StorageTypes() { + } + + static PlatformStorage createHomogeneousStorage(final StorageType type, + final StorageCodecs.StorageData data, + final Runnable listener) { + final TrackedStorageRepository trackingRepository = new InMemoryTrackedStorageRepository(); + final TrackedStorageImpl tracked = new TrackedStorageImpl( + new InMemoryStorageImpl(), + trackingRepository, + System::currentTimeMillis + ); + final PlatformStorage storage = data.capacity().map(capacity -> { + final LimitedStorageImpl limited = new LimitedStorageImpl(tracked, capacity); + return (PlatformStorage) new LimitedPlatformStorage(limited, type, trackingRepository, listener); + }).orElseGet(() -> new PlatformStorage(tracked, type, trackingRepository, listener)); + data.resources().forEach(storage::load); + return storage; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/VoidExcessSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/VoidExcessSideButtonWidget.java new file mode 100644 index 000000000..cd2583f75 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/VoidExcessSideButtonWidget.java @@ -0,0 +1,46 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractYesNoSideButtonWidget; + +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class VoidExcessSideButtonWidget extends AbstractYesNoSideButtonWidget { + private static final Component HELP = createTranslation("gui", "void_excess.help"); + private static final Component ALLOWLIST_WARNING = createTranslation( + "gui", + "void_excess.allowlist_warning" + ); + + public VoidExcessSideButtonWidget(final ClientProperty property) { + super(property, createTranslation("gui", "void_excess")); + } + + public void setWarningVisible(final boolean visible) { + if (visible) { + setWarning(ALLOWLIST_WARNING); + } else { + setWarning(null); + } + } + + @Override + protected int getXTexture() { + return Boolean.TRUE.equals(property.getValue()) ? 16 : 0; + } + + @Override + protected int getYTexture() { + return 240 - 15; + } + + @Override + @Nullable + protected Component getHelpText() { + return HELP; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java index 4d11acc6b..9a8f940e2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntity.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive; +package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractDiskContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainerImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.storage.AbstractDiskContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainerImpl; import java.util.Set; import java.util.function.UnaryOperator; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java index 620ccc29d..edf5fdb2c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/AbstractDiskDriveBlockEntityRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive; +package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.render.AbstractDiskLedBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.render.AbstractDiskLedBlockEntityRenderer; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveBlock.java new file mode 100644 index 000000000..860a2be16 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveBlock.java @@ -0,0 +1,59 @@ +package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; + +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.storage.DiskContainerBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; + +import java.util.function.BiFunction; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class DiskDriveBlock extends AbstractDirectionalBlock implements EntityBlock { + private static final Component HELP = createTranslation("item", "disk_drive.help"); + private static final DiskContainerBlockEntityTicker TICKER = + new DiskContainerBlockEntityTicker<>(BlockEntities.INSTANCE::getDiskDrive); + + private final BiFunction blockEntityFactory; + + public DiskDriveBlock(final BiFunction blockEntityFactory) { + super(BlockConstants.PROPERTIES); + this.blockEntityFactory = blockEntityFactory; + } + + @Override + protected DirectionType getDirectionType() { + return BiDirectionType.INSTANCE; + } + + @Override + public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { + return blockEntityFactory.apply(pos, state); + } + + @Override + public BlockEntityTicker getTicker(final Level level, + final BlockState state, + final BlockEntityType type) { + return TICKER.get(level, type); + } + + public BlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveContainerMenu.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveContainerMenu.java index bb9c59a6c..f8c7d47e2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveContainerMenu.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractStorageContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageAccessor; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainer; -import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.storage.AbstractStorageContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.StorageAccessor; +import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; +import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import java.util.ArrayList; import java.util.List; @@ -25,7 +25,7 @@ import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class DiskDriveContainerMenu extends AbstractStorageContainerMenu implements StorageAccessor { private static final int DISK_SLOT_X = 61; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveScreen.java new file mode 100644 index 000000000..745da1481 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/DiskDriveScreen.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; + +import com.refinedmods.refinedstorage.platform.common.storage.AbstractProgressStorageScreen; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class DiskDriveScreen extends AbstractProgressStorageScreen { + private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/disk_drive.png"); + private static final MutableComponent DISKS_TEXT = createTranslation("gui", "disk_drive.disks"); + + public DiskDriveScreen(final DiskDriveContainerMenu menu, final Inventory playerInventory, final Component text) { + super(menu, playerInventory, text, 99); + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } + + @Override + protected void renderLabels(final GuiGraphics graphics, final int mouseX, final int mouseY) { + super.renderLabels(graphics, mouseX, mouseY); + graphics.drawString(font, DISKS_TEXT, 60, 42, 4210752, false); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java new file mode 100644 index 000000000..b8ccde194 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; + +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; + +class EmptyStorageDiskInfoAccessor implements StorageDiskInfoAccessor { + @Override + public Optional getInfo(final ItemStack stack) { + return Optional.empty(); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java new file mode 100644 index 000000000..bcfb91fa7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; + +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; + +interface StorageDiskInfoAccessor { + Optional getInfo(ItemStack stack); +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java new file mode 100644 index 000000000..72c37a22a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java @@ -0,0 +1,25 @@ +package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; + +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; + +class StorageDiskInfoAccessorImpl implements StorageDiskInfoAccessor { + private final StorageRepository storageRepository; + + StorageDiskInfoAccessorImpl(final StorageRepository storageRepository) { + this.storageRepository = storageRepository; + } + + @Override + public Optional getInfo(final ItemStack stack) { + if (stack.getItem() instanceof StorageContainerItem storageContainerItem) { + return storageContainerItem.getInfo(storageRepository, stack); + } + return Optional.empty(); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/package-info.java new file mode 100644 index 000000000..5969eb633 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskdrive/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.storage.diskdrive; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java index 1361cb1df..35c061945 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface; - -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferListener; -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractDiskContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; +package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferListener; +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.storage.AbstractDiskContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java index 6dd7acc9b..2c6a45601 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/AbstractDiskInterfaceBlockEntityRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.render.AbstractDiskLedBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.render.AbstractDiskLedBlockEntityRenderer; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceBlock.java new file mode 100644 index 000000000..516bd4498 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceBlock.java @@ -0,0 +1,83 @@ +package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.storage.DiskContainerBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; + +import java.util.function.BiFunction; +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class DiskInterfaceBlock + extends AbstractActiveColoredDirectionalBlock + implements EntityBlock, BlockItemProvider { + private static final Component HELP = createTranslation("item", "disk_interface.help"); + private static final DiskContainerBlockEntityTicker + TICKER = new DiskContainerBlockEntityTicker<>(BlockEntities.INSTANCE::getDiskInterface, ACTIVE); + + private final BiFunction blockEntityFactory; + + public DiskInterfaceBlock(final DyeColor color, + final MutableComponent name, + final BiFunction + blockEntityFactory) { + super(BlockConstants.PROPERTIES, color, name); + this.blockEntityFactory = blockEntityFactory; + } + + @Override + protected DirectionType getDirectionType() { + return BiDirectionType.INSTANCE; + } + + @Nullable + @Override + public BlockEntityTicker getTicker(final Level level, + final BlockState blockState, + final BlockEntityType type) { + return TICKER.get(level, type); + } + + @Nullable + @Override + public BlockEntity newBlockEntity(final BlockPos blockPos, final BlockState blockState) { + return blockEntityFactory.apply(blockPos, blockState); + } + + @Override + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getDiskInterface(); + } + + @Override + public BaseBlockItem createBlockItem() { + return new NetworkNodeBlockItem(this, HELP); + } + + @Override + public boolean canAlwaysConnect() { + return true; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java new file mode 100644 index 000000000..3d72909cb --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java @@ -0,0 +1,128 @@ +package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeSlot; + +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.Slot; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class DiskInterfaceContainerMenu extends AbstractResourceContainerMenu { + private static final int DISK_SLOT_X1 = 44; + private static final int DISK_SLOT_X2 = 116; + private static final int DISK_SLOT_Y = 57; + + private static final int FILTER_SLOT_X = 8; + private static final int FILTER_SLOT_Y = 20; + + DiskInterfaceContainerMenu(final int syncId, + final Player player, + final AbstractDiskInterfaceBlockEntity blockEntity, + final DiskInventory diskInventory, + final ResourceContainer filterContainer, + final UpgradeContainer upgradeContainer) { + super(Menus.INSTANCE.getDiskInterface(), syncId, player); + addSlots(player, diskInventory, filterContainer, upgradeContainer); + registerProperty(new ServerProperty<>( + PropertyTypes.REDSTONE_MODE, + blockEntity::getRedstoneMode, + blockEntity::setRedstoneMode + )); + registerProperty(new ServerProperty<>( + PropertyTypes.FUZZY_MODE, + blockEntity::isFuzzyMode, + blockEntity::setFuzzyMode + )); + registerProperty(new ServerProperty<>( + PropertyTypes.FILTER_MODE, + blockEntity::getFilterMode, + blockEntity::setFilterMode + )); + registerProperty(new ServerProperty<>( + DiskInterfacePropertyTypes.TRANSFER_MODE, + blockEntity::getTransferMode, + blockEntity::setTransferMode + )); + } + + public DiskInterfaceContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { + super(Menus.INSTANCE.getDiskInterface(), syncId); + addSlots( + playerInventory.player, + new FilteredContainer( + AbstractDiskInterfaceBlockEntity.AMOUNT_OF_DISKS, + StorageContainerItem.stackValidator() + ), + ResourceContainerImpl.createForFilter(resourceContainerData), + new UpgradeContainer(UpgradeDestinations.DISK_INTERFACE, PlatformApi.INSTANCE.getUpgradeRegistry()) + ); + registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); + registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); + registerProperty(new ClientProperty<>(PropertyTypes.FILTER_MODE, FilterMode.BLOCK)); + registerProperty(new ClientProperty<>( + DiskInterfacePropertyTypes.TRANSFER_MODE, + StorageTransferMode.INSERT_INTO_NETWORK + )); + } + + private void addSlots(final Player player, + final FilteredContainer diskInventory, + final ResourceContainer filterContainer, + final UpgradeContainer upgradeContainer) { + for (int i = 0; i < diskInventory.getContainerSize(); ++i) { + addSlot(createDiskSlot(diskInventory, i)); + } + for (int i = 0; i < filterContainer.size(); ++i) { + addSlot(createFilterSlot(filterContainer, i)); + } + for (int i = 0; i < upgradeContainer.getContainerSize(); ++i) { + addSlot(new UpgradeSlot(upgradeContainer, i, 187, 6 + (i * 18))); + } + addPlayerInventory(player.getInventory(), 8, 129); + + transferManager.addBiTransfer(player.getInventory(), upgradeContainer); + transferManager.addBiTransfer(player.getInventory(), diskInventory); + transferManager.addFilterTransfer(player.getInventory()); + } + + private Slot createFilterSlot(final ResourceContainer filterContainer, final int i) { + final int x = FILTER_SLOT_X + (18 * i); + return new ResourceSlot( + filterContainer, + i, + createTranslation("gui", "disk_interface.filter_help"), + x, + FILTER_SLOT_Y, + ResourceSlotType.FILTER + ); + } + + private Slot createDiskSlot(final FilteredContainer diskInventory, final int i) { + final int x = i < 3 ? DISK_SLOT_X1 : DISK_SLOT_X2; + final int y = DISK_SLOT_Y + ((i % 3) * 18); + return ValidatedSlot.forStorageContainer(diskInventory, i, x, y); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java new file mode 100644 index 000000000..05e1eed81 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java @@ -0,0 +1,17 @@ +package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +class DiskInterfacePropertyTypes { + public static final PropertyType TRANSFER_MODE = new PropertyType<>( + createIdentifier("transfer_mode"), + TransferModeSettings::getTransferMode, + TransferModeSettings::getTransferMode + ); + + private DiskInterfacePropertyTypes() { + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceScreen.java new file mode 100644 index 000000000..4ee3aa644 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/DiskInterfaceScreen.java @@ -0,0 +1,66 @@ +package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; +import com.refinedmods.refinedstorage.platform.common.storage.FilterModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class DiskInterfaceScreen extends AbstractBaseScreen { + private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/disk_interface.png"); + + private static final MutableComponent IN_TEXT = createTranslation("gui", "disk_interface.in"); + private static final MutableComponent OUT_TEXT = createTranslation("gui", "disk_interface.out"); + + public DiskInterfaceScreen(final DiskInterfaceContainerMenu menu, + final Inventory playerInventory, + final Component text) { + super(menu, playerInventory, text); + this.inventoryLabelY = 117; + this.imageWidth = 211; + this.imageHeight = 211; + } + + @Override + protected void init() { + super.init(); + addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); + addSideButton(new TransferModeSideButtonWidget( + getMenu().getProperty(DiskInterfacePropertyTypes.TRANSFER_MODE) + )); + addSideButton(new FilterModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FILTER_MODE), + createTranslation("gui", "disk_interface.filter_mode.allow.help"), + createTranslation("gui", "disk_interface.filter_mode.block.help") + )); + addSideButton(new FuzzyModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FUZZY_MODE), + () -> getMenu().getProperty(DiskInterfacePropertyTypes.TRANSFER_MODE).getValue() + == StorageTransferMode.EXTRACT_FROM_NETWORK + ? FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK + : FuzzyModeSideButtonWidget.Type.EXTRACTING_SOURCE + )); + } + + @Override + protected void renderLabels(final GuiGraphics graphics, final int x, final int y) { + super.renderLabels(graphics, x, y); + graphics.drawString(font, IN_TEXT, 43, 45, 4210752, false); + graphics.drawString(font, OUT_TEXT, 115, 45, 4210752, false); + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSettings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSettings.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java index c142d7b1d..3f0419cb8 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSettings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSettings.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode; +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; class TransferModeSettings { private static final int INSERT_INTO_NETWORK = 0; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java index bc44cc2bb..35193b01a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/TransferModeSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface; +package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.api.network.impl.node.storagetransfer.StorageTransferMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; class TransferModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "disk_interface.transfer_mode"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/package-info.java new file mode 100644 index 000000000..a7e3a6fd5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/diskinterface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java index f7f0019d8..08b98f9a2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlock.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.externalstorage; +package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalCableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.DirectionalCableBlockShapes; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalCableBlock; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; +import com.refinedmods.refinedstorage.platform.common.support.DirectionalCableBlockShapes; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import java.util.HashMap; import java.util.Map; @@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class ExternalStorageBlock extends AbstractDirectionalCableBlock implements ColorableBlock, EntityBlock, BlockItemProvider { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java index 18e5864dc..40f7fb483 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageBlockEntity.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainerImpl; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainerImpl; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java new file mode 100644 index 000000000..785db57fa --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java @@ -0,0 +1,57 @@ +package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; + +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.storage.AbstractStorageContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; + +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.Slot; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ExternalStorageContainerMenu extends AbstractStorageContainerMenu { + private static final int FILTER_SLOT_X = 8; + private static final int FILTER_SLOT_Y = 20; + + public ExternalStorageContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { + super(Menus.INSTANCE.getExternalStorage(), syncId); + addSlots(playerInventory.player, ResourceContainerImpl.createForFilter(resourceContainerData)); + } + + ExternalStorageContainerMenu(final int syncId, + final Player player, + final ResourceContainer resourceContainer, + final StorageConfigurationContainer configContainer) { + super(Menus.INSTANCE.getExternalStorage(), syncId, player, configContainer); + addSlots(player, resourceContainer); + } + + private void addSlots(final Player player, + final ResourceContainer resourceContainer) { + for (int i = 0; i < resourceContainer.size(); ++i) { + addSlot(createFilterSlot(resourceContainer, i)); + } + addPlayerInventory(player.getInventory(), 8, 55); + transferManager.addFilterTransfer(player.getInventory()); + } + + private Slot createFilterSlot(final ResourceContainer resourceContainer, final int i) { + final int x = FILTER_SLOT_X + (18 * i); + return new ResourceSlot( + resourceContainer, + i, + createTranslation("gui", "storage.filter_help"), + x, + FILTER_SLOT_Y, + ResourceSlotType.FILTER + ); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageScreen.java new file mode 100644 index 000000000..cc24c5c12 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageScreen.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; + +import com.refinedmods.refinedstorage.platform.common.storage.AbstractStorageScreen; +import com.refinedmods.refinedstorage.platform.common.support.AbstractFilterScreen; + +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +public class ExternalStorageScreen extends AbstractStorageScreen { + public ExternalStorageScreen(final ExternalStorageContainerMenu menu, + final Inventory inventory, + final Component title) { + super(menu, inventory, title); + this.inventoryLabelY = 42; + this.imageWidth = 210; + this.imageHeight = 137; + } + + @Override + protected ResourceLocation getTexture() { + return AbstractFilterScreen.TEXTURE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java index 83f0dcfd6..dfd5d593c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageTrackedStorageRepository.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.externalstorage; +package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.tracked.InMemoryTrackedStorageRepository; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; import java.util.Collections; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageWorkRate.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageWorkRate.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageWorkRate.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageWorkRate.java index 9f1f636e3..d57bb780f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageWorkRate.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/ExternalStorageWorkRate.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.externalstorage; +package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; import com.google.common.util.concurrent.RateLimiter; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/package-info.java new file mode 100644 index 000000000..bc6a6ba23 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/package-info.java new file mode 100644 index 000000000..5f48a4196 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java index 220e5e1ed..0ce0e8c66 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntity.java @@ -1,27 +1,27 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.configurationcard.ConfigurationCardTarget; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.support.energy.TransferableBlockEntityEnergy; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.GridData; -import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskStateChangeListener; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneModeSettings; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.energy.BlockEntityEnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.support.energy.CreativeEnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.support.energy.ItemBlockEnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.util.ContainerUtil; +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.configurationcard.ConfigurationCardTarget; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.support.energy.TransferableBlockEntityEnergy; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.GridData; +import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.platform.common.storage.DiskStateChangeListener; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneModeSettings; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.energy.BlockEntityEnergyStorage; +import com.refinedmods.refinedstorage.platform.common.support.energy.CreativeEnergyStorage; +import com.refinedmods.refinedstorage.platform.common.support.energy.ItemBlockEnergyStorage; +import com.refinedmods.refinedstorage.platform.common.util.ContainerUtil; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java index d3b4497c6..2b0a87407 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridBlockEntityRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.render.AbstractDiskLedBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.render.AbstractDiskLedBlockEntityRenderer; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java new file mode 100644 index 000000000..f1d8c93b8 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java @@ -0,0 +1,83 @@ +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.platform.common.support.FilteredContainer; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ValidatedSlot; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyInfo; + +import javax.annotation.Nullable; + +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.inventory.Slot; + +public abstract class AbstractPortableGridContainerMenu extends AbstractGridContainerMenu + implements EnergyContainerMenu { + private final FilteredContainer diskInventory; + private final EnergyInfo energyInfo; + + @Nullable + private Slot diskSlot; + + AbstractPortableGridContainerMenu( + final MenuType menuType, + final int syncId, + final Inventory playerInventory, + final PortableGridData portableGridData + ) { + super(menuType, syncId, playerInventory, portableGridData.gridData()); + this.diskInventory = new FilteredContainer(1, StorageContainerItem.stackValidator()); + this.energyInfo = EnergyInfo.forClient( + playerInventory.player, + portableGridData.stored(), + portableGridData.capacity() + ); + } + + AbstractPortableGridContainerMenu( + final MenuType menuType, + final int syncId, + final Inventory playerInventory, + final DiskInventory diskInventory, + final Grid grid, + final EnergyStorage energyStorage + ) { + super(menuType, syncId, playerInventory, grid); + this.diskInventory = diskInventory; + this.energyInfo = EnergyInfo.forServer( + playerInventory.player, + energyStorage::getStored, + energyStorage::getCapacity + ); + } + + @Override + public void broadcastChanges() { + super.broadcastChanges(); + energyInfo.detectChanges(); + } + + @Override + protected boolean canTransferSlot(final Slot slot) { + return slot != diskSlot; + } + + @Override + public void onScreenReady(final int playerInventoryY) { + super.onScreenReady(playerInventoryY); + diskSlot = ValidatedSlot.forStorageContainer(diskInventory, 0, -19, 8); + addSlot(diskSlot); + transferManager.addBiTransfer(playerInventory, diskInventory); + } + + @Override + public EnergyInfo getEnergyInfo() { + return energyInfo; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/InWorldPortableGrid.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/InWorldPortableGrid.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/InWorldPortableGrid.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/InWorldPortableGrid.java index 8dfffe5ef..b03248594 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/InWorldPortableGrid.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/InWorldPortableGrid.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; +import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGrid.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGrid.java new file mode 100644 index 000000000..b93d7a033 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGrid.java @@ -0,0 +1,122 @@ +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.grid.operations.NoopGridOperations; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcherManager; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcherManagerImpl; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.NoopStorage; +import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.api.storage.TrackedResourceAmount; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; + +import java.util.Collections; +import java.util.List; +import javax.annotation.Nullable; + +import net.minecraft.server.level.ServerPlayer; + +class PortableGrid implements Grid { + private final EnergyStorage energyStorage; + private final DiskInventory diskInventory; + private final GridWatcherManager watchers = new GridWatcherManagerImpl(); + private final StateTrackedStorage.Listener diskListener; + @Nullable + private PortableGridStorage storage; + + PortableGrid(final EnergyStorage energyStorage, + final DiskInventory diskInventory, + final StateTrackedStorage.Listener diskListener) { + this.energyStorage = energyStorage; + this.diskInventory = diskInventory; + this.diskListener = diskListener; + } + + void updateStorage() { + if (storage != null) { + watchers.detachAll(storage.getStorageChannel()); + } + + this.storage = diskInventory.resolve(0) + .map(diskStorage -> new StateTrackedStorage(diskStorage, diskListener)) + .map(PortableGridStorage::new) + .orElse(null); + + watchers.attachAll(getStorageChannel()); + } + + void activeChanged(final boolean active) { + watchers.activeChanged(active); + } + + StorageState getStorageState() { + if (storage == null) { + return StorageState.NONE; + } + if (!isGridActive()) { + return StorageState.INACTIVE; + } + return storage.getState(); + } + + @Override + public void addWatcher(final GridWatcher watcher, final Class actorType) { + energyStorage.extract(Platform.INSTANCE.getConfig().getPortableGrid().getOpenEnergyUsage(), Action.EXECUTE); + watchers.addWatcher(watcher, actorType, getStorageChannel()); + } + + @Override + public void removeWatcher(final GridWatcher watcher) { + watchers.removeWatcher(watcher, getStorageChannel()); + } + + @Nullable + private StorageChannel getStorageChannel() { + return storage != null ? storage.getStorageChannel() : null; + } + + @Override + public Storage getItemStorage() { + if (storage == null) { + return new NoopStorage(); + } + return storage.getStorageChannel(); + } + + @Override + public boolean isGridActive() { + return energyStorage.getStored() > 0 && storage != null; + } + + @Override + public List getResources(final Class actorType) { + if (storage == null) { + return Collections.emptyList(); + } + final StorageChannel storageChannel = storage.getStorageChannel(); + return storageChannel.getAll().stream().map(resource -> new TrackedResourceAmount( + resource, + storageChannel.findTrackedResourceByActorType(resource.getResource(), actorType).orElse(null) + )).toList(); + } + + @Override + public GridOperations createOperations(final ResourceType resourceType, final ServerPlayer player) { + if (storage == null) { + return new NoopGridOperations(); + } + final StorageChannel storageChannel = this.storage.getStorageChannel(); + final GridOperations operations = resourceType.createGridOperations(storageChannel, new PlayerActor(player)); + return new PortableGridOperations(operations, energyStorage); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java index 80d3a0d0b..ff77977c4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlock.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; import java.util.function.BiFunction; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java new file mode 100644 index 000000000..705d9326e --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java @@ -0,0 +1,39 @@ +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; + +import net.minecraft.world.entity.player.Inventory; + +public class PortableGridBlockContainerMenu extends AbstractPortableGridContainerMenu { + public PortableGridBlockContainerMenu(final int syncId, + final Inventory playerInventory, + final PortableGridData portableGridData) { + super(Menus.INSTANCE.getPortableGridBlock(), syncId, playerInventory, portableGridData); + registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); + this.onScreenReady(0); + } + + PortableGridBlockContainerMenu(final int syncId, + final Inventory playerInventory, + final AbstractPortableGridBlockEntity portableGrid) { + super( + Menus.INSTANCE.getPortableGridBlock(), + syncId, + playerInventory, + portableGrid.getDiskInventory(), + portableGrid.getGrid(), + portableGrid.getEnergyStorage() + ); + registerProperty(new ServerProperty<>( + PropertyTypes.REDSTONE_MODE, + portableGrid::getRedstoneMode, + portableGrid::setRedstoneMode + )); + this.onScreenReady(0); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java index c0b0b1390..5c581f95e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockEntityTicker.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItem.java similarity index 85% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItem.java index 0a9bb2ba4..7bd6fe81a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItem.java @@ -1,22 +1,22 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.energy.AbstractProxyEnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.support.energy.AbstractEnergyBlockItem; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage2.platform.common.support.energy.CreativeEnergyStorage; +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.energy.AbstractProxyEnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.energy.EnergyStorageImpl; +import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.support.energy.AbstractEnergyBlockItem; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.platform.common.support.energy.CreativeEnergyStorage; import java.util.Optional; import javax.annotation.Nullable; @@ -36,7 +36,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class PortableGridBlockItem extends AbstractEnergyBlockItem { private static final Component HELP = createTranslation("item", "portable_grid.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java new file mode 100644 index 000000000..622e5ff67 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.platform.common.storage.Disk; + +public record PortableGridBlockItemRenderInfo(boolean active, Disk disk) { +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java new file mode 100644 index 000000000..60870ed25 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java @@ -0,0 +1,38 @@ +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; + +import net.minecraft.world.entity.player.Inventory; + +public class PortableGridItemContainerMenu extends AbstractPortableGridContainerMenu { + public PortableGridItemContainerMenu(final int syncId, + final Inventory playerInventory, + final PortableGridData portableGridData) { + super(Menus.INSTANCE.getPortableGridItem(), syncId, playerInventory, portableGridData); + this.disabledSlot = portableGridData.slotReference().orElse(null); + this.onScreenReady(0); + } + + PortableGridItemContainerMenu(final int syncId, + final Inventory playerInventory, + final DiskInventory diskInventory, + final Grid grid, + final EnergyStorage energyStorage, + final SlotReference slotReference) { + super( + Menus.INSTANCE.getPortableGridItem(), + syncId, + playerInventory, + diskInventory, + grid, + energyStorage + ); + this.disabledSlot = slotReference; + this.onScreenReady(0); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java new file mode 100644 index 000000000..97a2bd0da --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java @@ -0,0 +1,63 @@ +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.grid.GridData; +import com.refinedmods.refinedstorage.platform.common.grid.PortableGridData; +import com.refinedmods.refinedstorage.platform.common.storage.DiskInventory; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; + +import java.util.Optional; +import javax.annotation.Nullable; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.network.codec.StreamEncoder; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; + +class PortableGridItemExtendedMenuProvider implements ExtendedMenuProvider { + private final Grid grid; + private final EnergyStorage energyStorage; + private final DiskInventory diskInventory; + private final SlotReference slotReference; + + PortableGridItemExtendedMenuProvider(final Grid grid, + final EnergyStorage energyStorage, + final DiskInventory diskInventory, + final SlotReference slotReference) { + this.grid = grid; + this.energyStorage = energyStorage; + this.diskInventory = diskInventory; + this.slotReference = slotReference; + } + + @Override + public PortableGridData getMenuData() { + return new PortableGridData( + GridData.of(grid), + energyStorage.getStored(), + energyStorage.getCapacity(), + Optional.of(slotReference) + ); + } + + @Override + public StreamEncoder getMenuCodec() { + return PortableGridData.STREAM_CODEC; + } + + @Override + public Component getDisplayName() { + return ContentNames.PORTABLE_GRID; + } + + @Nullable + @Override + public AbstractContainerMenu createMenu(final int syncId, final Inventory inventory, final Player player) { + return new PortableGridItemContainerMenu(syncId, inventory, diskInventory, grid, energyStorage, slotReference); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridLootItemFunction.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridLootItemFunction.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridLootItemFunction.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridLootItemFunction.java index 809654db5..be3e5310e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridLootItemFunction.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridLootItemFunction.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; -import com.refinedmods.refinedstorage2.platform.common.content.LootFunctions; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyLootItemFunction; +import com.refinedmods.refinedstorage.platform.common.content.LootFunctions; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyLootItemFunction; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridOperations.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridOperations.java new file mode 100644 index 000000000..617de242a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridOperations.java @@ -0,0 +1,49 @@ +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.platform.common.Platform; + +class PortableGridOperations implements GridOperations { + private final GridOperations delegate; + private final EnergyStorage energyStorage; + + PortableGridOperations(final GridOperations delegate, final EnergyStorage energyStorage) { + this.delegate = delegate; + this.energyStorage = energyStorage; + } + + @Override + public boolean extract(final ResourceKey resource, + final GridExtractMode extractMode, + final InsertableStorage destination) { + if (delegate.extract(resource, extractMode, destination)) { + energyStorage.extract( + Platform.INSTANCE.getConfig().getPortableGrid().getExtractEnergyUsage(), + Action.EXECUTE + ); + return true; + } + return false; + } + + @Override + public boolean insert(final ResourceKey resource, + final GridInsertMode insertMode, + final ExtractableStorage source) { + if (delegate.insert(resource, insertMode, source)) { + energyStorage.extract( + Platform.INSTANCE.getConfig().getPortableGrid().getInsertEnergyUsage(), + Action.EXECUTE + ); + return true; + } + return false; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridScreen.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridScreen.java index eab859392..df505d25a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridScreen.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; -import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen; -import com.refinedmods.refinedstorage2.platform.common.support.widget.ProgressWidget; +import com.refinedmods.refinedstorage.platform.common.grid.screen.AbstractGridScreen; +import com.refinedmods.refinedstorage.platform.common.support.widget.ProgressWidget; import javax.annotation.Nullable; @@ -11,7 +11,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class PortableGridScreen extends AbstractGridScreen { private static final int DISK_SLOT_WIDTH = 30; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridStorage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridStorage.java new file mode 100644 index 000000000..4d50d8b66 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridStorage.java @@ -0,0 +1,25 @@ +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.storage.StateTrackedStorage; +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; + +class PortableGridStorage { + private final StorageChannel storageChannel; + private final StateTrackedStorage diskStorage; + + PortableGridStorage(final StateTrackedStorage diskStorage) { + this.storageChannel = new StorageChannelImpl(); + this.diskStorage = diskStorage; + this.storageChannel.addSource(diskStorage); + } + + StorageState getState() { + return diskStorage.getState(); + } + + StorageChannel getStorageChannel() { + return storageChannel; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridType.java new file mode 100644 index 000000000..d918199a9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/PortableGridType.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +public enum PortableGridType { + NORMAL, + CREATIVE +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/package-info.java new file mode 100644 index 000000000..1e9358339 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/portablegrid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlock.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlock.java index 0051252d3..052ec053d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlock.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java index 85ee8c8ef..c8d16fc78 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockBlockEntity.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractStorageContainerNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageBlockEntity; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainerImpl; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractStorageContainerNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageBlockEntity; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainerImpl; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import java.util.Optional; import java.util.UUID; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java new file mode 100644 index 000000000..8391f7b20 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java @@ -0,0 +1,87 @@ +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; + +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.platform.common.storage.AbstractStorageContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.StorageAccessor; +import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; + +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.inventory.Slot; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public abstract class AbstractStorageBlockContainerMenu extends AbstractStorageContainerMenu + implements StorageAccessor { + private static final int FILTER_SLOT_X = 8; + private static final int FILTER_SLOT_Y = 20; + + private long stored; + private long capacity; + + protected AbstractStorageBlockContainerMenu(final MenuType type, + final int syncId, + final Player player, + final StorageBlockData storageBlockData, + final ResourceFactory resourceFactory) { + super(type, syncId); + this.stored = storageBlockData.stored(); + this.capacity = storageBlockData.capacity(); + addSlots( + player, + ResourceContainerImpl.createForFilter(resourceFactory, storageBlockData.resourceContainerData()) + ); + } + + protected AbstractStorageBlockContainerMenu(final MenuType type, + final int syncId, + final Player player, + final ResourceContainer resourceContainer, + final StorageConfigurationContainer configContainer) { + super(type, syncId, player, configContainer); + addSlots(player, resourceContainer); + } + + private void addSlots(final Player player, final ResourceContainer resourceContainer) { + for (int i = 0; i < resourceContainer.size(); ++i) { + addSlot(createFilterSlot(resourceContainer, i)); + } + addPlayerInventory(player.getInventory(), 8, 141); + + transferManager.addFilterTransfer(player.getInventory()); + } + + private Slot createFilterSlot(final ResourceContainer resourceContainer, final int i) { + final int x = FILTER_SLOT_X + (18 * i); + return new ResourceSlot( + resourceContainer, + i, + createTranslation("gui", "storage.filter_help"), + x, + FILTER_SLOT_Y, + ResourceSlotType.FILTER + ); + } + + @Override + public double getProgress() { + if (capacity == 0) { + return 0; + } + return (double) getStored() / (double) getCapacity(); + } + + @Override + public long getCapacity() { + return capacity; + } + + @Override + public long getStored() { + return stored; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockScreen.java new file mode 100644 index 000000000..0dad49c2e --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/AbstractStorageBlockScreen.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; + +import com.refinedmods.refinedstorage.platform.common.storage.AbstractProgressStorageScreen; + +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +abstract class AbstractStorageBlockScreen extends AbstractProgressStorageScreen { + private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/storage.png"); + + protected AbstractStorageBlockScreen(final AbstractStorageBlockContainerMenu menu, + final Inventory inventory, + final Component title) { + super(menu, inventory, title, 80); + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java new file mode 100644 index 000000000..a718fcfab --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlock.java @@ -0,0 +1,27 @@ +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; + +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; + +public class FluidStorageBlock extends AbstractStorageBlock { + private final FluidStorageType.Variant variant; + + public FluidStorageBlock(final FluidStorageType.Variant variant) { + super( + BlockConstants.PROPERTIES, + new NetworkNodeBlockEntityTicker<>(() -> BlockEntities.INSTANCE.getFluidStorageBlock(variant)) + ); + this.variant = variant; + } + + @Override + public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { + return new FluidStorageBlockBlockEntity(pos, state, variant); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java index ac00f09c3..a80ef93d2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockEntity.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -15,7 +15,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class FluidStorageBlockBlockEntity extends AbstractStorageBlockBlockEntity { private final FluidStorageType.Variant variant; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java index eb6055a3e..afb1675c5 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockBlockItem.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.AbstractStorageContainerBlockItem; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.AbstractStorageContainerBlockItem; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; import java.util.Optional; import javax.annotation.Nullable; @@ -21,7 +21,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class FluidStorageBlockBlockItem extends AbstractStorageContainerBlockItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_fluid_storage_block.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java new file mode 100644 index 000000000..288ed0574 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java @@ -0,0 +1,35 @@ +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; + +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +public class FluidStorageBlockContainerMenu extends AbstractStorageBlockContainerMenu { + public FluidStorageBlockContainerMenu(final int syncId, + final Inventory playerInventory, + final StorageBlockData storageBlockData) { + super( + Menus.INSTANCE.getFluidStorage(), + syncId, + playerInventory.player, + storageBlockData, + PlatformApi.INSTANCE.getFluidResourceFactory() + ); + } + + FluidStorageBlockContainerMenu(final int syncId, + final Player player, + final ResourceContainer resourceContainer, + final StorageConfigurationContainer configContainer) { + super(Menus.INSTANCE.getFluidStorage(), syncId, player, resourceContainer, configContainer); + } + + @Override + public boolean hasCapacity() { + return getCapacity() > 0; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockScreen.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockScreen.java index 0b8cd277a..4372a29fe 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/FluidStorageBlockScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceRendering; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java new file mode 100644 index 000000000..a148f9097 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlock.java @@ -0,0 +1,27 @@ +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; + +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; + +public class ItemStorageBlock extends AbstractStorageBlock { + private final ItemStorageType.Variant variant; + + public ItemStorageBlock(final ItemStorageType.Variant variant) { + super( + BlockConstants.PROPERTIES, + new NetworkNodeBlockEntityTicker<>(() -> BlockEntities.INSTANCE.getItemStorageBlock(variant)) + ); + this.variant = variant; + } + + @Override + public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { + return new ItemStorageBlockBlockEntity(pos, state, variant); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java index 2561211da..a687ebfd7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockEntity.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.api.network.impl.node.storage.StorageNetworkNode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -15,7 +15,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class ItemStorageBlockBlockEntity extends AbstractStorageBlockBlockEntity { private final ItemStorageType.Variant variant; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java index f77bb8a28..68b1d48ea 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockBlockItem.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.AbstractStorageContainerBlockItem; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.AbstractStorageContainerBlockItem; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; import java.util.Optional; import javax.annotation.Nullable; @@ -20,7 +20,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class ItemStorageBlockBlockItem extends AbstractStorageContainerBlockItem { private static final Component CREATIVE_HELP = createTranslation("item", "creative_storage_block.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java new file mode 100644 index 000000000..8d1205b1d --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java @@ -0,0 +1,35 @@ +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.storage.StorageConfigurationContainer; + +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +public class ItemStorageBlockContainerMenu extends AbstractStorageBlockContainerMenu { + public ItemStorageBlockContainerMenu(final int syncId, + final Inventory playerInventory, + final StorageBlockData storageBlockData) { + super( + Menus.INSTANCE.getItemStorage(), + syncId, + playerInventory.player, + storageBlockData, + PlatformApi.INSTANCE.getItemResourceFactory() + ); + } + + ItemStorageBlockContainerMenu(final int syncId, + final Player player, + final ResourceContainer resourceContainer, + final StorageConfigurationContainer configContainer) { + super(Menus.INSTANCE.getItemStorage(), syncId, player, resourceContainer, configContainer); + } + + @Override + public boolean hasCapacity() { + return getCapacity() > 0; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockScreen.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockScreen.java index ceaa93a83..408c0e44d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/ItemStorageBlockScreen.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockData.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockData.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockData.java index a8ae6950a..405134f9c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockData.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockData.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockLootItemFunction.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockLootItemFunction.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockLootItemFunction.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockLootItemFunction.java index c4c23903a..465ed152f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/StorageBlockLootItemFunction.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/StorageBlockLootItemFunction.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.content.LootFunctions; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.StorageBlockEntity; +import com.refinedmods.refinedstorage.platform.common.content.LootFunctions; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/package-info.java new file mode 100644 index 000000000..6326547d9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storageblock/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.storage.storageblock; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java new file mode 100644 index 000000000..7edd66afe --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/FluidStorageDiskItem.java @@ -0,0 +1,83 @@ +package com.refinedmods.refinedstorage.platform.common.storage.storagedisk; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.AbstractStorageContainerItem; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResourceRendering; + +import java.util.Optional; +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class FluidStorageDiskItem extends AbstractStorageContainerItem { + private static final Component CREATIVE_HELP = createTranslation("item", "creative_fluid_storage_disk.help"); + + private final FluidStorageType.Variant variant; + private final Component helpText; + + public FluidStorageDiskItem(final FluidStorageType.Variant variant) { + super( + new Item.Properties().stacksTo(1).fireResistant(), + PlatformApi.INSTANCE.getStorageContainerItemHelper() + ); + this.variant = variant; + this.helpText = getHelpText(variant); + } + + private static Component getHelpText(final FluidStorageType.Variant variant) { + if (variant.getCapacityInBuckets() == null) { + return CREATIVE_HELP; + } + return createTranslation( + "item", + "fluid_storage_disk.help", + AmountFormatting.format(variant.getCapacityInBuckets()) + ); + } + + @Override + protected boolean hasCapacity() { + return variant.hasCapacity(); + } + + @Override + protected String formatAmount(final long amount) { + return FluidResourceRendering.format(amount); + } + + @Override + protected SerializableStorage createStorage(final StorageRepository storageRepository) { + return StorageTypes.FLUID.create(variant.getCapacity(), storageRepository::markAsChanged); + } + + @Override + protected ItemStack createPrimaryDisassemblyByproduct(final int count) { + return new ItemStack(Items.INSTANCE.getStorageHousing(), count); + } + + @Override + @Nullable + protected ItemStack createSecondaryDisassemblyByproduct(final int count) { + if (variant == FluidStorageType.Variant.CREATIVE) { + return null; + } + return new ItemStack(Items.INSTANCE.getFluidStoragePart(variant), count); + } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(helpText)); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java new file mode 100644 index 000000000..e4794bad5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/ItemStorageDiskItem.java @@ -0,0 +1,73 @@ +package com.refinedmods.refinedstorage.platform.common.storage.storagedisk; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.AbstractStorageContainerItem; +import com.refinedmods.refinedstorage.platform.api.storage.SerializableStorage; +import com.refinedmods.refinedstorage.platform.api.storage.StorageRepository; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.StorageTypes; + +import java.util.Optional; +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class ItemStorageDiskItem extends AbstractStorageContainerItem { + private static final Component CREATIVE_HELP = createTranslation("item", "creative_storage_disk.help"); + + private final ItemStorageType.Variant variant; + private final Component helpText; + + public ItemStorageDiskItem(final ItemStorageType.Variant variant) { + super( + new Item.Properties().stacksTo(1).fireResistant(), + PlatformApi.INSTANCE.getStorageContainerItemHelper() + ); + this.variant = variant; + this.helpText = variant.getCapacity() == null + ? CREATIVE_HELP + : createTranslation("item", "storage_disk.help", AmountFormatting.format(variant.getCapacity())); + } + + @Override + protected boolean hasCapacity() { + return variant.hasCapacity(); + } + + @Override + protected String formatAmount(final long amount) { + return AmountFormatting.format(amount); + } + + @Override + protected SerializableStorage createStorage(final StorageRepository storageRepository) { + return StorageTypes.ITEM.create(variant.getCapacity(), storageRepository::markAsChanged); + } + + @Override + protected ItemStack createPrimaryDisassemblyByproduct(final int count) { + return new ItemStack(Items.INSTANCE.getStorageHousing(), count); + } + + @Override + @Nullable + protected ItemStack createSecondaryDisassemblyByproduct(final int count) { + if (variant == ItemStorageType.Variant.CREATIVE) { + return null; + } + return new ItemStack(Items.INSTANCE.getItemStoragePart(variant), count); + } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(helpText)); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/package-info.java new file mode 100644 index 000000000..448222b1e --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storage/storagedisk/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.storage.storagedisk; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java new file mode 100644 index 000000000..055531047 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.world.entity.player.Player; + +public class CompositeStorageMonitorExtractionStrategy implements StorageMonitorExtractionStrategy { + private final List strategies = new ArrayList<>(); + + public void addStrategy(final StorageMonitorExtractionStrategy strategy) { + strategies.add(strategy); + } + + @Override + public boolean extract(final ResourceKey resource, + final boolean fullStack, + final Player player, + final Actor actor, + final Network network) { + for (final StorageMonitorExtractionStrategy strategy : strategies) { + if (strategy.extract(resource, fullStack, player, actor, network)) { + return true; + } + } + return false; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java new file mode 100644 index 000000000..64ab92ce9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; + +public class CompositeStorageMonitorInsertionStrategy implements StorageMonitorInsertionStrategy { + private final List strategies = new ArrayList<>(); + + public void addStrategy(final StorageMonitorInsertionStrategy strategy) { + strategies.add(strategy); + } + + @Override + public Optional insert( + final ResourceKey configuredResource, + final ItemStack stack, + final Actor actor, + final Network network + ) { + return strategies.stream() + .flatMap(strategy -> strategy.insert(configuredResource, stack, actor, network).stream()) + .findFirst(); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java new file mode 100644 index 000000000..1db48d11d --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java @@ -0,0 +1,41 @@ +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.TransferHelper; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.storage.BucketPlayerInventoryInsertableStorage; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; + +import net.minecraft.world.entity.player.Player; + +public class FluidStorageMonitorExtractionStrategy implements StorageMonitorExtractionStrategy { + @Override + public boolean extract(final ResourceKey resource, + final boolean fullStack, + final Player player, + final Actor actor, + final Network network) { + if (!(resource instanceof FluidResource fluidResource)) { + return false; + } + final BucketPlayerInventoryInsertableStorage target = new BucketPlayerInventoryInsertableStorage( + player.getInventory(), + network.getComponent(StorageNetworkComponent.class), + true + ); + final StorageChannel source = network.getComponent(StorageNetworkComponent.class); + return TransferHelper.transfer( + fluidResource, + Platform.INSTANCE.getBucketAmount(), + actor, + source, + target, + source + ) > 0; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java new file mode 100644 index 000000000..fb0e66347 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java @@ -0,0 +1,64 @@ +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; + +import java.util.Optional; +import javax.annotation.Nullable; + +import net.minecraft.world.item.ItemStack; + +public class FluidStorageMonitorInsertionStrategy implements StorageMonitorInsertionStrategy { + @Override + public Optional insert( + final ResourceKey configuredResource, + final ItemStack stack, + final Actor actor, + final Network network + ) { + if (!(configuredResource instanceof FluidResource configuredFluidResource)) { + return Optional.empty(); + } + final StorageChannel fluidStorageChannel = network.getComponent(StorageNetworkComponent.class); + return Platform.INSTANCE.getContainedFluid(stack) + .map(extracted -> tryInsert(actor, configuredFluidResource, extracted, fluidStorageChannel)) + .map(extracted -> doInsert(actor, extracted, fluidStorageChannel)); + } + + @Nullable + private Platform.ContainedFluid tryInsert(final Actor actor, + final FluidResource configuredResource, + final Platform.ContainedFluid result, + final StorageChannel storageChannel) { + if (!result.fluid().equals(configuredResource)) { + return null; + } + final long insertedSimulated = storageChannel.insert( + result.fluid(), + result.amount(), + Action.SIMULATE, + actor + ); + final boolean insertedSuccessfully = insertedSimulated == result.amount(); + return insertedSuccessfully ? result : null; + } + + private ItemStack doInsert(final Actor actor, + final Platform.ContainedFluid extracted, + final StorageChannel storageChannel) { + storageChannel.insert( + extracted.fluid(), + extracted.amount(), + Action.EXECUTE, + actor + ); + return extracted.remainderContainer(); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java new file mode 100644 index 000000000..92f42ab05 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorExtractionStrategy; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; + +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; + +public class ItemStorageMonitorExtractionStrategy implements StorageMonitorExtractionStrategy { + @Override + @SuppressWarnings("deprecation") + public boolean extract(final ResourceKey resource, + final boolean fullStack, + final Player player, + final Actor actor, + final Network network) { + if (!(resource instanceof ItemResource itemResource)) { + return false; + } + final long extracted = network.getComponent(StorageNetworkComponent.class).extract( + itemResource, + fullStack ? itemResource.item().getDefaultMaxStackSize() : 1, + Action.EXECUTE, + actor + ); + if (extracted > 0) { + final ItemStack stack = itemResource.toItemStack(extracted); + if (!player.getInventory().add(stack)) { + player.drop(stack, false); + } + return true; + } + return false; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java new file mode 100644 index 000000000..9d85bf6ed --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.api.storagemonitor.StorageMonitorInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; + +public class ItemStorageMonitorInsertionStrategy implements StorageMonitorInsertionStrategy { + @Override + public Optional insert(final ResourceKey configuredResource, + final ItemStack stack, + final Actor actor, + final Network network) { + if (!(configuredResource instanceof ItemResource configuredItemResource)) { + return Optional.empty(); + } + final ItemResource resource = ItemResource.ofItemStack(stack); + if (!configuredItemResource.equals(resource)) { + return Optional.empty(); + } + final long inserted = network.getComponent(StorageNetworkComponent.class).insert( + resource, + stack.getCount(), + Action.EXECUTE, + actor + ); + final long remainder = stack.getCount() - inserted; + if (remainder > 0) { + return Optional.of(resource.toItemStack(remainder)); + } + return Optional.of(ItemStack.EMPTY); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java index 90e48831a..ea1603d7e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlock.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.platform.common.storagemonitor; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -30,7 +30,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class StorageMonitorBlock extends AbstractDirectionalBlock implements EntityBlock { private static final Component HELP = createTranslation("item", "storage_monitor.help"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntity.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntity.java index 6b752af4c..f7a4e2330 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntity.java @@ -1,25 +1,25 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.storage.channel.FuzzyStorageChannel; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.PlayerActor; +import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java index 0a24f4ef0..ad55a397a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorBlockEntityRenderer.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.platform.common.storagemonitor; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorContainerMenu.java new file mode 100644 index 000000000..9794ef467 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorContainerMenu.java @@ -0,0 +1,56 @@ +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlotType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class StorageMonitorContainerMenu extends AbstractResourceContainerMenu { + private static final Component FILTER_HELP = createTranslation("gui", "storage_monitor.filter_help"); + + public StorageMonitorContainerMenu(final int syncId, + final Inventory playerInventory, + final ResourceContainerData resourceContainerData) { + super(Menus.INSTANCE.getStorageMonitor(), syncId); + registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); + registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); + addSlots(playerInventory, ResourceContainerImpl.createForFilter(resourceContainerData)); + } + + StorageMonitorContainerMenu(final int syncId, + final Player player, + final StorageMonitorBlockEntity storageMonitor, + final ResourceContainer resourceContainer) { + super(Menus.INSTANCE.getStorageMonitor(), syncId, player); + registerProperty(new ServerProperty<>( + PropertyTypes.FUZZY_MODE, + storageMonitor::isFuzzyMode, + storageMonitor::setFuzzyMode + )); + registerProperty(new ServerProperty<>( + PropertyTypes.REDSTONE_MODE, + storageMonitor::getRedstoneMode, + storageMonitor::setRedstoneMode + )); + addSlots(player.getInventory(), resourceContainer); + } + + private void addSlots(final Inventory playerInventory, final ResourceContainer resourceContainer) { + addSlot(new ResourceSlot(resourceContainer, 0, FILTER_HELP, 80, 20, ResourceSlotType.FILTER)); + addPlayerInventory(playerInventory, 8, 55); + transferManager.addFilterTransfer(playerInventory); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorInsertTracker.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorInsertTracker.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorInsertTracker.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorInsertTracker.java index 7fa430dfe..2ee78886b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorInsertTracker.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorInsertTracker.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; +package com.refinedmods.refinedstorage.platform.common.storagemonitor; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorScreen.java new file mode 100644 index 000000000..c52c2d38f --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/StorageMonitorScreen.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.FuzzyModeSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; + +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public class StorageMonitorScreen extends AbstractBaseScreen { + private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/storage_monitor.png"); + + public StorageMonitorScreen(final StorageMonitorContainerMenu menu, + final Inventory playerInventory, + final Component text) { + super(menu, playerInventory, text); + this.inventoryLabelY = 43; + this.imageWidth = 211; + this.imageHeight = 137; + } + + @Override + protected void init() { + super.init(); + addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); + addSideButton(new FuzzyModeSideButtonWidget( + getMenu().getProperty(PropertyTypes.FUZZY_MODE), + () -> FuzzyModeSideButtonWidget.Type.GENERIC + )); + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/package-info.java new file mode 100644 index 000000000..defbc00e2 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/storagemonitor/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.storagemonitor; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractActiveColoredDirectionalBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractActiveColoredDirectionalBlock.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractActiveColoredDirectionalBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractActiveColoredDirectionalBlock.java index 7499f91ab..7da5d14da 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractActiveColoredDirectionalBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractActiveColoredDirectionalBlock.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; import net.minecraft.network.chat.MutableComponent; import net.minecraft.util.StringRepresentable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java index fc99345dc..db3599dbd 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseBlock.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.network.NetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.Sounds; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeMenuProvider; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.Sounds; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeMenuProvider; import java.util.Optional; import javax.annotation.Nullable; @@ -36,7 +36,7 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public abstract class AbstractBaseBlock extends Block { private static final TagKey WRENCH_TAG = TagKey.create( diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseContainerMenu.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseContainerMenu.java index 9f2201d17..6f2ccad79 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseContainerMenu.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.DisabledSlot; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.Property; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager; +package com.refinedmods.refinedstorage.platform.common.support; + +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.DisabledSlot; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.Property; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java index b6950210c..1057a1ba4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBaseScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBaseScreen.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeMapping; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.amount.ResourceAmountScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.SmallTextClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeItemClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeSlot; +package com.refinedmods.refinedstorage.platform.common.support; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.amount.ResourceAmountScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.SmallTextClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeItemClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeSlot; import java.util.ArrayList; import java.util.Collections; @@ -35,7 +35,7 @@ import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslationAsHeading; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationAsHeading; import static java.util.Objects.requireNonNullElse; public abstract class AbstractBaseScreen extends AbstractContainerScreen { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBlockEntityTicker.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBlockEntityTicker.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBlockEntityTicker.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBlockEntityTicker.java index 019670400..d51d8b715 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractBlockEntityTicker.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractBlockEntityTicker.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractColoredBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractColoredBlock.java similarity index 92% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractColoredBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractColoredBlock.java index 5c032635e..53881b263 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractColoredBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractColoredBlock.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; import net.minecraft.network.chat.MutableComponent; import net.minecraft.world.item.DyeColor; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalBlock.java similarity index 95% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalBlock.java index b61083c3c..c358b8846 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalBlock.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; import java.util.Objects; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalCableBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalCableBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java index 4df5bd2bc..f35442e7e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractDirectionalCableBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractDirectionalCableBlock.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; import java.util.Map; import java.util.Objects; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractFilterScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractFilterScreen.java new file mode 100644 index 000000000..490e088d3 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractFilterScreen.java @@ -0,0 +1,38 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; + +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public abstract class AbstractFilterScreen extends AbstractBaseScreen { + public static final ResourceLocation TEXTURE = createIdentifier("textures/gui/generic_filter.png"); + + protected AbstractFilterScreen(final T menu, + final Inventory playerInventory, + final Component text) { + super(menu, playerInventory, text); + this.inventoryLabelY = 42; + this.imageWidth = hasUpgrades() ? 210 : 176; + this.imageHeight = 137; + } + + protected boolean hasUpgrades() { + return true; + } + + @Override + protected void init() { + super.init(); + addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractSafeSavedData.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractSafeSavedData.java index 0e3a6b211..d920b5f0d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/AbstractSafeSavedData.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; import java.io.File; import java.io.IOException; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BaseBlockItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BaseBlockItem.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BaseBlockItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BaseBlockItem.java index 15d228129..c9def43b6 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BaseBlockItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BaseBlockItem.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockEntityWithDrops.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockEntityWithDrops.java new file mode 100644 index 000000000..2595dc3cd --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockEntityWithDrops.java @@ -0,0 +1,9 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import net.minecraft.core.NonNullList; +import net.minecraft.world.item.ItemStack; + +@FunctionalInterface +public interface BlockEntityWithDrops { + NonNullList getDrops(); +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockItemProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockItemProvider.java new file mode 100644 index 000000000..520362875 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/BlockItemProvider.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import net.minecraft.world.item.BlockItem; + +@FunctionalInterface +public interface BlockItemProvider { + T createBlockItem(); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/CableBlockSupport.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableBlockSupport.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/CableBlockSupport.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableBlockSupport.java index 0142bc472..4e781e344 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/CableBlockSupport.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableBlockSupport.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.platform.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableShapeCacheKey.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableShapeCacheKey.java new file mode 100644 index 000000000..1b28030d5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/CableShapeCacheKey.java @@ -0,0 +1,23 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import net.minecraft.world.level.block.state.BlockState; + +import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.DOWN; +import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.EAST; +import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.NORTH; +import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.SOUTH; +import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.UP; +import static com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport.WEST; + +public record CableShapeCacheKey(boolean north, boolean east, boolean south, boolean west, boolean up, boolean down) { + public static CableShapeCacheKey of(final BlockState state) { + return new CableShapeCacheKey( + state.getValue(NORTH), + state.getValue(EAST), + state.getValue(SOUTH), + state.getValue(WEST), + state.getValue(UP), + state.getValue(DOWN) + ); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ClientToServerCommunications.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ClientToServerCommunications.java new file mode 100644 index 000000000..e438a253b --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ClientToServerCommunications.java @@ -0,0 +1,45 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; + +import java.util.List; +import java.util.UUID; + +public interface ClientToServerCommunications { + void sendGridExtract(PlatformResourceKey resource, GridExtractMode mode, boolean cursor); + + void sendGridScroll(PlatformResourceKey resource, GridScrollMode mode, int slotIndex); + + void sendGridInsert(GridInsertMode mode, boolean tryAlternatives); + + void sendCraftingGridClear(boolean toPlayerInventory); + + void sendCraftingGridRecipeTransfer(List> recipe); + + void sendPropertyChange(PropertyType type, T value); + + void sendStorageInfoRequest(UUID storageId); + + void sendResourceSlotChange(int slotIndex, boolean tryAlternatives); + + void sendResourceFilterSlotChange(PlatformResourceKey resource, int slotIndex); + + void sendResourceSlotAmountChange(int slotIndex, long amount); + + void sendSingleAmountChange(double amount); + + void sendUseNetworkBoundItem(SlotReference slotReference); + + void sendSecurityCardPermission(PlatformPermission permission, boolean allowed); + + void sendSecurityCardResetPermission(PlatformPermission permission); + + void sendSecurityCardBoundPlayer(UUID playerId); +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ColorableBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ColorableBlock.java new file mode 100644 index 000000000..abe75dbf6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/ColorableBlock.java @@ -0,0 +1,17 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; + +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.level.block.Block; + +public interface ColorableBlock, I extends BlockItem> { + BlockColorMap getBlockColorMap(); + + DyeColor getColor(); + + default boolean canAlwaysConnect() { + return getBlockColorMap().isDefaultColor(getColor()); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/DirectionalCableBlockShapes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/DirectionalCableBlockShapes.java similarity index 98% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/DirectionalCableBlockShapes.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/DirectionalCableBlockShapes.java index a645d5df3..eea87dc4b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/DirectionalCableBlockShapes.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/DirectionalCableBlockShapes.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterModeSettings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterModeSettings.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java index a545b0fcb..91047d61f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterModeSettings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterModeSettings.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; public class FilterModeSettings { private static final int BLOCK = 0; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterWithFuzzyMode.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterWithFuzzyMode.java similarity index 92% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterWithFuzzyMode.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterWithFuzzyMode.java index 88453f9bc..9755f79a7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilterWithFuzzyMode.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilterWithFuzzyMode.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; import java.util.List; import java.util.Set; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilteredContainer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilteredContainer.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilteredContainer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilteredContainer.java index bddb7bb35..6460eae4c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/FilteredContainer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/FilteredContainer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; import java.util.function.Predicate; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/NetworkNodeBlockItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/NetworkNodeBlockItem.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/NetworkNodeBlockItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/NetworkNodeBlockItem.java index 82e9d94de..c7f2a334a 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/NetworkNodeBlockItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/NetworkNodeBlockItem.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/PlayerAwareBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/PlayerAwareBlockEntity.java new file mode 100644 index 000000000..4442c240a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/PlayerAwareBlockEntity.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import java.util.UUID; + +public interface PlayerAwareBlockEntity { + void setPlacedBy(UUID playerId); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/RedstoneMode.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneMode.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/RedstoneMode.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneMode.java index 86568ab54..0ab863e52 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/RedstoneMode.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneMode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; public enum RedstoneMode { IGNORE, diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/RedstoneModeSettings.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/RedstoneModeSettings.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java index a5228c2d4..b54098c8c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/RedstoneModeSettings.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/RedstoneModeSettings.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; public class RedstoneModeSettings { private static final int IGNORE = 0; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SchedulingMode.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingMode.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SchedulingMode.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingMode.java index 0364aac21..1948d9fb9 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SchedulingMode.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingMode.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; import java.util.Collections; import java.util.Random; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SchedulingModeType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingModeType.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SchedulingModeType.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingModeType.java index af4fc46d2..fcddfbe3f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SchedulingModeType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SchedulingModeType.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.support; +package com.refinedmods.refinedstorage.platform.common.support; -import com.refinedmods.refinedstorage2.api.network.impl.node.task.DefaultTaskExecutor; -import com.refinedmods.refinedstorage2.api.network.impl.node.task.RandomTaskExecutor; -import com.refinedmods.refinedstorage2.api.network.impl.node.task.RoundRobinTaskExecutor; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.network.impl.node.task.DefaultTaskExecutor; +import com.refinedmods.refinedstorage.api.network.impl.node.task.RandomTaskExecutor; +import com.refinedmods.refinedstorage.api.network.impl.node.task.RoundRobinTaskExecutor; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; import javax.annotation.Nullable; @@ -11,7 +11,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public enum SchedulingModeType { DEFAULT( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleBlock.java new file mode 100644 index 000000000..412af2fbf --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleBlock.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; + +import net.minecraft.world.level.block.Block; + +public final class SimpleBlock extends Block { + public SimpleBlock() { + super(BlockConstants.PROPERTIES); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleItem.java new file mode 100644 index 000000000..d1cc9f98f --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/SimpleItem.java @@ -0,0 +1,9 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import net.minecraft.world.item.Item; + +public final class SimpleItem extends Item { + public SimpleItem() { + super(new Item.Properties()); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/TextureIds.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/TextureIds.java new file mode 100644 index 000000000..0638b62b7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/TextureIds.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.platform.common.support; + +import net.minecraft.resources.ResourceLocation; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public final class TextureIds { + public static final ResourceLocation ICONS = createIdentifier("textures/icons.png"); + + private TextureIds() { + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractAmountScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractAmountScreen.java similarity index 97% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractAmountScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractAmountScreen.java index 51dcf7d9c..6a2f43bf3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractAmountScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractAmountScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.amount; +package com.refinedmods.refinedstorage.platform.common.support.amount; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; import java.util.Objects; import java.util.Optional; @@ -21,7 +21,7 @@ import org.joml.Vector3f; import org.lwjgl.glfw.GLFW; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public abstract class AbstractAmountScreen extends AbstractBaseScreen { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractSingleAmountScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractSingleAmountScreen.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractSingleAmountScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractSingleAmountScreen.java index c4c00fef9..c11289707 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AbstractSingleAmountScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AbstractSingleAmountScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.amount; +package com.refinedmods.refinedstorage.platform.common.support.amount; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; @@ -8,7 +8,7 @@ import net.minecraft.world.entity.player.Inventory; import org.joml.Vector3f; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public abstract class AbstractSingleAmountScreen extends AbstractAmountScreen { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AmountOperations.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountOperations.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AmountOperations.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountOperations.java index b11be6def..fc65187f0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AmountOperations.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountOperations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.amount; +package com.refinedmods.refinedstorage.platform.common.support.amount; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AmountScreenConfiguration.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountScreenConfiguration.java similarity index 99% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AmountScreenConfiguration.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountScreenConfiguration.java index 949b90420..77ed7fc74 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/AmountScreenConfiguration.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/AmountScreenConfiguration.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.amount; +package com.refinedmods.refinedstorage.platform.common.support.amount; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/DoubleAmountOperations.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/DoubleAmountOperations.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/DoubleAmountOperations.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/DoubleAmountOperations.java index b3ac29150..683eaa9c4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/DoubleAmountOperations.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/DoubleAmountOperations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.amount; +package com.refinedmods.refinedstorage.platform.common.support.amount; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/IntegerAmountOperations.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/IntegerAmountOperations.java similarity index 95% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/IntegerAmountOperations.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/IntegerAmountOperations.java index d55da228f..e3d286e25 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/IntegerAmountOperations.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/IntegerAmountOperations.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.amount; +package com.refinedmods.refinedstorage.platform.common.support.amount; import java.util.Objects; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/LongAmountOperations.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/LongAmountOperations.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/LongAmountOperations.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/LongAmountOperations.java index ce89ca131..af5becc2e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/LongAmountOperations.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/LongAmountOperations.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.amount; +package com.refinedmods.refinedstorage.platform.common.support.amount; -import com.refinedmods.refinedstorage2.platform.common.util.MathUtil; +import com.refinedmods.refinedstorage.platform.common.util.MathUtil; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/PriorityScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/PriorityScreen.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/PriorityScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/PriorityScreen.java index ed19a096d..8991bc0b8 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/PriorityScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/PriorityScreen.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.amount; +package com.refinedmods.refinedstorage.platform.common.support.amount; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.MutableComponent; @@ -8,8 +8,8 @@ import net.minecraft.world.entity.player.Inventory; import org.joml.Vector3f; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class PriorityScreen extends AbstractAmountScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/priority.png"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/ResourceAmountScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/ResourceAmountScreen.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/ResourceAmountScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/ResourceAmountScreen.java index 8ee594dba..487166c2c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/ResourceAmountScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/ResourceAmountScreen.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.amount; +package com.refinedmods.refinedstorage.platform.common.support.amount; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.MutableComponent; @@ -11,8 +11,8 @@ import net.minecraft.world.item.ItemStack; import org.joml.Vector3f; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class ResourceAmountScreen extends AbstractAmountScreen { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/resource_amount.png"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/package-info.java new file mode 100644 index 000000000..6f5b1def1 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/amount/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.amount; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractResourceContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractResourceContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java index 4c1030f16..b6b5cf2a6 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractResourceContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractResourceContainerMenu.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java index 5ccbd32ae..d0e9eba45 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSchedulingContainerMenu.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.SchedulingModeType; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.SchedulingModeType; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java index bfef87943..dbb12d34c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSimpleFilterContainerMenu.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeSlot; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeSlot; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java similarity index 84% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java index 36be68320..4fff5e509 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/AbstractSingleAmountContainerMenu.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ClientProperty.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ClientProperty.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ClientProperty.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ClientProperty.java index 9fd18d0e9..fe54ef52e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ClientProperty.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ClientProperty.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; import net.minecraft.world.inventory.DataSlot; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/DisabledSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/DisabledSlot.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/DisabledSlot.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/DisabledSlot.java index afd7d3925..7cd362c67 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/DisabledSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/DisabledSlot.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; import net.minecraft.world.Container; import net.minecraft.world.inventory.Slot; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ExtendedMenuProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ExtendedMenuProvider.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ExtendedMenuProvider.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ExtendedMenuProvider.java index e95dcba18..0250634dd 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ExtendedMenuProvider.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ExtendedMenuProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamEncoder; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/MenuOpener.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/MenuOpener.java new file mode 100644 index 000000000..d89d2c61e --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/MenuOpener.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.MenuProvider; + +public interface MenuOpener { + void openMenu(ServerPlayer player, MenuProvider menuProvider); +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java new file mode 100644 index 000000000..2c4ef6c1a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java @@ -0,0 +1,4 @@ +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +public interface NetworkNodeExtendedMenuProvider extends ExtendedMenuProvider, NetworkNodeMenuProvider { +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeMenuProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeMenuProvider.java new file mode 100644 index 000000000..88c8cba67 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/NetworkNodeMenuProvider.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +import com.refinedmods.refinedstorage.platform.api.security.SecurityHelper; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.common.security.BuiltinPermission; + +import java.util.Set; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.MenuProvider; + +public interface NetworkNodeMenuProvider extends MenuProvider { + Set getContainers(); + + default boolean canOpen(final ServerPlayer player) { + return SecurityHelper.isAllowed(player, BuiltinPermission.OPEN, getContainers()); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/Property.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/Property.java new file mode 100644 index 000000000..ce8c87035 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/Property.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +import net.minecraft.world.inventory.DataSlot; + +public interface Property { + PropertyType getType(); + + T getValue(); + + DataSlot getDataSlot(); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/PropertyType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyType.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/PropertyType.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyType.java index 0dd483bb8..994f59255 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/PropertyType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; import java.util.function.Function; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyTypes.java new file mode 100644 index 000000000..9f7856eb6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/PropertyTypes.java @@ -0,0 +1,52 @@ +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.platform.common.support.FilterModeSettings; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneModeSettings; +import com.refinedmods.refinedstorage.platform.common.support.SchedulingModeType; + +import net.minecraft.resources.ResourceLocation; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public final class PropertyTypes { + public static final PropertyType REDSTONE_MODE = new PropertyType<>( + createIdentifier("redstone_mode"), + RedstoneModeSettings::getRedstoneMode, + RedstoneModeSettings::getRedstoneMode + ); + + public static final PropertyType FILTER_MODE = new PropertyType<>( + createIdentifier("filter_mode"), + FilterModeSettings::getFilterMode, + FilterModeSettings::getFilterMode + ); + + public static final PropertyType SCHEDULING_MODE = new PropertyType<>( + createIdentifier("scheduling_mode"), + SchedulingModeType::getId, + SchedulingModeType::getById + ); + + public static final PropertyType FUZZY_MODE = createBooleanProperty(createIdentifier("fuzzy_mode")); + + private PropertyTypes() { + } + + public static PropertyType createBooleanProperty(final ResourceLocation id) { + return new PropertyType<>( + id, + value -> Boolean.TRUE.equals(value) ? 1 : 0, + value -> value == 1 + ); + } + + public static PropertyType createIntegerProperty(final ResourceLocation id) { + return new PropertyType<>( + id, + value -> value, + value -> value + ); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceInventoryDestination.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceInventoryDestination.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceInventoryDestination.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceInventoryDestination.java index b56d9a12d..5d8fda070 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceInventoryDestination.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceInventoryDestination.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlot.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java index 7ead68ef6..67bf7ff4f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlot.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; import java.util.Objects; import java.util.Set; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlotType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlotType.java new file mode 100644 index 000000000..b33606224 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ResourceSlotType.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +public enum ResourceSlotType { + FILTER, + FILTER_WITH_AMOUNT, + CONTAINER +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ServerProperty.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ServerProperty.java similarity index 92% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ServerProperty.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ServerProperty.java index 84bfd4a3b..02364e590 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ServerProperty.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ServerProperty.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/SingleAmountData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/SingleAmountData.java new file mode 100644 index 000000000..bd4a34de5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/SingleAmountData.java @@ -0,0 +1,22 @@ +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; + +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record SingleAmountData(Optional slotReference, + double amount, + ResourceContainerData resourceContainerData) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.optional(SlotReferenceFactory.STREAM_CODEC), SingleAmountData::slotReference, + ByteBufCodecs.DOUBLE, SingleAmountData::amount, + ResourceContainerData.STREAM_CODEC, SingleAmountData::resourceContainerData, + SingleAmountData::new + ); +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferDestination.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferDestination.java new file mode 100644 index 000000000..32bc8ce79 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferDestination.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +import javax.annotation.Nullable; + +import net.minecraft.world.item.ItemStack; + +@FunctionalInterface +public interface TransferDestination { + @Nullable + ItemStack transfer(ItemStack stack); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/TransferManager.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferManager.java similarity index 97% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/TransferManager.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferManager.java index e4239721e..ffd6683f4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/TransferManager.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/TransferManager.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; import java.util.HashMap; import java.util.LinkedList; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ValidatedSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ValidatedSlot.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ValidatedSlot.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ValidatedSlot.java index 0b12a637f..9bc6631fe 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ValidatedSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/ValidatedSlot.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; +package com.refinedmods.refinedstorage.platform.common.support.containermenu; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem; +import com.refinedmods.refinedstorage.platform.api.storage.StorageContainerItem; import java.util.function.Predicate; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/package-info.java new file mode 100644 index 000000000..98f7ca00b --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/containermenu/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.containermenu; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/BiDirection.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirection.java similarity index 97% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/BiDirection.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirection.java index 19e1eb8e3..8bb74ce45 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/BiDirection.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirection.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.direction; +package com.refinedmods.refinedstorage.platform.common.support.direction; import java.util.Locale; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/BiDirectionType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirectionType.java similarity index 95% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/BiDirectionType.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirectionType.java index 8faa69294..38f47b242 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/BiDirectionType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/BiDirectionType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.direction; +package com.refinedmods.refinedstorage.platform.common.support.direction; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.EnumProperty; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/DefaultDirectionType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DefaultDirectionType.java similarity index 95% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/DefaultDirectionType.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DefaultDirectionType.java index e2e003aed..05e896dca 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/DefaultDirectionType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DefaultDirectionType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.direction; +package com.refinedmods.refinedstorage.platform.common.support.direction; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.EnumProperty; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/DirectionType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DirectionType.java similarity index 85% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/DirectionType.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DirectionType.java index c22d56efc..b8ac9744c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/DirectionType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/DirectionType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.direction; +package com.refinedmods.refinedstorage.platform.common.support.direction; import net.minecraft.core.Direction; import net.minecraft.util.StringRepresentable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/HorizontalDirection.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirection.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/HorizontalDirection.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirection.java index 36a77b423..d8a6516ee 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/HorizontalDirection.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirection.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.direction; +package com.refinedmods.refinedstorage.platform.common.support.direction; import java.util.Locale; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/HorizontalDirectionType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirectionType.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/HorizontalDirectionType.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirectionType.java index 22116b079..857d50b0c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/HorizontalDirectionType.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/HorizontalDirectionType.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.direction; +package com.refinedmods.refinedstorage.platform.common.support.direction; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.EnumProperty; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/package-info.java new file mode 100644 index 000000000..aa86018fd --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/direction/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.direction; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/BlockEntityEnergyStorage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/BlockEntityEnergyStorage.java new file mode 100644 index 000000000..7fa4654e0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/BlockEntityEnergyStorage.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.common.support.energy; + +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.energy.AbstractListeningEnergyStorage; + +import net.minecraft.world.level.block.entity.BlockEntity; + +public class BlockEntityEnergyStorage extends AbstractListeningEnergyStorage { + private final BlockEntity blockEntity; + + public BlockEntityEnergyStorage(final EnergyStorage delegate, final BlockEntity blockEntity) { + super(delegate); + this.blockEntity = blockEntity; + } + + @Override + protected void onStoredChanged(final long stored) { + blockEntity.setChanged(); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/CreativeEnergyStorage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/CreativeEnergyStorage.java new file mode 100644 index 000000000..1cf2f1f75 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/CreativeEnergyStorage.java @@ -0,0 +1,31 @@ +package com.refinedmods.refinedstorage.platform.common.support.energy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; + +public class CreativeEnergyStorage implements EnergyStorage { + public static final EnergyStorage INSTANCE = new CreativeEnergyStorage(); + + private CreativeEnergyStorage() { + } + + @Override + public long getStored() { + return Long.MAX_VALUE; + } + + @Override + public long getCapacity() { + return Long.MAX_VALUE; + } + + @Override + public long receive(final long amount, final Action action) { + return 0; + } + + @Override + public long extract(final long amount, final Action action) { + return amount; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyContainerMenu.java new file mode 100644 index 000000000..8d0dd9135 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyContainerMenu.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.platform.common.support.energy; + +@FunctionalInterface +public interface EnergyContainerMenu { + EnergyInfo getEnergyInfo(); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyInfo.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyInfo.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyInfo.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyInfo.java index 944dcfaff..ce92b403d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyInfo.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyInfo.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.energy; +package com.refinedmods.refinedstorage.platform.common.support.energy; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; import java.util.Collections; import java.util.List; @@ -11,7 +11,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createStoredWithCapacityTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createStoredWithCapacityTranslation; public class EnergyInfo { private final Player player; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyItemHelperImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyItemHelperImpl.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyItemHelperImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyItemHelperImpl.java index 4e80efdaf..bbcabe45b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyItemHelperImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyItemHelperImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.support.energy; +package com.refinedmods.refinedstorage.platform.common.support.energy; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage2.platform.api.support.energy.TransferableBlockEntityEnergy; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.energy.EnergyItemHelper; +import com.refinedmods.refinedstorage.platform.api.support.energy.TransferableBlockEntityEnergy; import java.util.List; @@ -15,7 +15,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createStoredWithCapacityTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createStoredWithCapacityTranslation; public class EnergyItemHelperImpl implements EnergyItemHelper { @Override diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyLootItemFunction.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyLootItemFunction.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyLootItemFunction.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyLootItemFunction.java index 7aae06d83..4cb1740cc 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyLootItemFunction.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/EnergyLootItemFunction.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.support.energy; +package com.refinedmods.refinedstorage.platform.common.support.energy; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.energy.TransferableBlockEntityEnergy; -import com.refinedmods.refinedstorage2.platform.common.content.LootFunctions; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.energy.TransferableBlockEntityEnergy; +import com.refinedmods.refinedstorage.platform.common.content.LootFunctions; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemBlockEnergyStorage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemBlockEnergyStorage.java similarity index 85% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemBlockEnergyStorage.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemBlockEnergyStorage.java index eed24b2cd..aad8bc36b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemBlockEnergyStorage.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemBlockEnergyStorage.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.support.energy; +package com.refinedmods.refinedstorage.platform.common.support.energy; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.energy.AbstractListeningEnergyStorage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.energy.AbstractListeningEnergyStorage; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemEnergyStorage.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemEnergyStorage.java new file mode 100644 index 000000000..f1b45b9d3 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/ItemEnergyStorage.java @@ -0,0 +1,26 @@ +package com.refinedmods.refinedstorage.platform.common.support.energy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.api.network.impl.energy.AbstractListeningEnergyStorage; +import com.refinedmods.refinedstorage.platform.common.content.DataComponents; + +import net.minecraft.world.item.ItemStack; + +public class ItemEnergyStorage extends AbstractListeningEnergyStorage { + private final ItemStack stack; + + public ItemEnergyStorage(final ItemStack stack, final EnergyStorage delegate) { + super(delegate); + this.stack = stack; + final Long stored = stack.get(DataComponents.INSTANCE.getEnergy()); + if (stored != null && stored > 0) { + delegate.receive(stored, Action.EXECUTE); + } + } + + @Override + protected void onStoredChanged(final long stored) { + stack.set(DataComponents.INSTANCE.getEnergy(), stored); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/package-info.java new file mode 100644 index 000000000..6fb3511ab --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/energy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.energy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java similarity index 92% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java index e3c8f2bc5..16045b705 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractLevelInteractingNetworkNodeContainerBlockEntity.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network; +package com.refinedmods.refinedstorage.platform.common.support.network; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java similarity index 85% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java index 3666e983d..9ad681e76 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractRedstoneModeNetworkNodeContainerBlockEntity.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.configurationcard.ConfigurationCardTarget; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.PlayerAwareBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneModeSettings; +package com.refinedmods.refinedstorage.platform.common.support.network; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.platform.api.configurationcard.ConfigurationCardTarget; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.PlayerAwareBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneModeSettings; import java.util.Objects; import java.util.UUID; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java new file mode 100644 index 000000000..191278a99 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java @@ -0,0 +1,93 @@ +package com.refinedmods.refinedstorage.platform.common.support.network; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.api.network.node.task.TaskExecutor; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.FilterWithFuzzyMode; +import com.refinedmods.refinedstorage.platform.common.support.SchedulingMode; +import com.refinedmods.refinedstorage.platform.common.support.SchedulingModeType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; + +import java.util.List; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.HolderLookup; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamEncoder; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +public abstract class AbstractSchedulingNetworkNodeContainerBlockEntity + extends AbstractUpgradeableNetworkNodeContainerBlockEntity + implements NetworkNodeExtendedMenuProvider { + protected final FilterWithFuzzyMode filter; + private final SchedulingMode schedulingMode; + + protected AbstractSchedulingNetworkNodeContainerBlockEntity( + final BlockEntityType type, + final BlockPos pos, + final BlockState state, + final T node, + final UpgradeDestinations destination + ) { + super(type, pos, state, node, destination); + this.schedulingMode = new SchedulingMode<>(this::setChanged, this::setTaskExecutor); + this.filter = FilterWithFuzzyMode.createAndListenForFilters( + ResourceContainerImpl.createForFilter(), + this::setChanged, + this::setFilters + ); + } + + @Override + public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.writeConfiguration(tag, provider); + schedulingMode.writeToTag(tag); + filter.save(tag, provider); + } + + @Override + public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { + super.readConfiguration(tag, provider); + schedulingMode.load(tag); + filter.load(tag, provider); + } + + public void setSchedulingModeType(final SchedulingModeType type) { + schedulingMode.setType(type); + } + + public SchedulingModeType getSchedulingModeType() { + return schedulingMode.getType(); + } + + public boolean isFuzzyMode() { + return filter.isFuzzyMode(); + } + + public void setFuzzyMode(final boolean fuzzyMode) { + filter.setFuzzyMode(fuzzyMode); + if (level instanceof ServerLevel serverLevel) { + initialize(serverLevel); + } + } + + @Override + public ResourceContainerData getMenuData() { + return ResourceContainerData.of(filter.getFilterContainer()); + } + + @Override + public StreamEncoder getMenuCodec() { + return ResourceContainerData.STREAM_CODEC; + } + + protected abstract void setTaskExecutor(TaskExecutor taskExecutor); + + protected abstract void setFilters(List filters); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java index 1b6c5ff59..c59505b40 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/AbstractUpgradeableNetworkNodeContainerBlockEntity.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.support.BlockEntityWithDrops; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; +package com.refinedmods.refinedstorage.platform.common.support.network; + +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.support.BlockEntityWithDrops; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java index f995dcdb0..45c0967d0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/BaseNetworkNodeContainerBlockEntity.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.support.network.AbstractNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock; +package com.refinedmods.refinedstorage.platform.common.support.network; + +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.energy.EnergyNetworkComponent; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.platform.api.support.network.AbstractNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.ColorableBlock; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/ConnectionProviderImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionProviderImpl.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/ConnectionProviderImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionProviderImpl.java index 0e8f528e9..bb0c8df12 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/ConnectionProviderImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionProviderImpl.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network; +package com.refinedmods.refinedstorage.platform.common.support.network; -import com.refinedmods.refinedstorage2.api.network.ConnectionProvider; -import com.refinedmods.refinedstorage2.api.network.Connections; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.api.network.ConnectionProvider; +import com.refinedmods.refinedstorage.api.network.Connections; +import com.refinedmods.refinedstorage.api.network.node.container.NetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/ConnectionSinkImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionSinkImpl.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/ConnectionSinkImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionSinkImpl.java index e75182f34..b7078256c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/ConnectionSinkImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/ConnectionSinkImpl.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network; +package com.refinedmods.refinedstorage.platform.common.support.network; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; import java.util.HashSet; import java.util.Set; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/InWorldNetworkNodeContainerImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/InWorldNetworkNodeContainerImpl.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/InWorldNetworkNodeContainerImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/InWorldNetworkNodeContainerImpl.java index 7bb7d8d5e..df607d062 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/InWorldNetworkNodeContainerImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/InWorldNetworkNodeContainerImpl.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network; +package com.refinedmods.refinedstorage.platform.common.support.network; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/NetworkNodeBlockEntityTicker.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/NetworkNodeBlockEntityTicker.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/NetworkNodeBlockEntityTicker.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/NetworkNodeBlockEntityTicker.java index 24eaa11d4..448c7df5c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/NetworkNodeBlockEntityTicker.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/NetworkNodeBlockEntityTicker.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network; +package com.refinedmods.refinedstorage.platform.common.support.network; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/CompositeSlotReferenceProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/CompositeSlotReferenceProvider.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/CompositeSlotReferenceProvider.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/CompositeSlotReferenceProvider.java index cce62b3f4..e19b32165 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/CompositeSlotReferenceProvider.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/CompositeSlotReferenceProvider.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceProvider; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceProvider; import java.util.ArrayList; import java.util.List; @@ -12,7 +12,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class CompositeSlotReferenceProvider implements SlotReferenceProvider { private final List providers = new ArrayList<>(List.of( diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReference.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReference.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReference.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReference.java index 18496014e..9ad2f5d61 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReference.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReference.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java index 2173165b9..3e81c6aa0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReferenceFactory.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReferenceProvider.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReferenceProvider.java new file mode 100644 index 000000000..bb7ab5a9a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/InventorySlotReferenceProvider.java @@ -0,0 +1,27 @@ +package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; + +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceProvider; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; + +public class InventorySlotReferenceProvider implements SlotReferenceProvider { + @Override + public List find(final Player player, final Set validItems) { + final List result = new ArrayList<>(); + for (int i = 0; i < player.getInventory().getContainerSize(); ++i) { + final ItemStack slot = player.getInventory().getItem(i); + if (!validItems.contains(slot.getItem())) { + continue; + } + result.add(new InventorySlotReference(i)); + } + return result; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java index 94b3d3f28..a9a9458bc 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemHelperImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemHelper; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.common.content.DataComponents; import java.util.List; import java.util.Optional; @@ -21,7 +21,7 @@ import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.entity.BlockEntity; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class NetworkBoundItemHelperImpl implements NetworkBoundItemHelper { private static final MutableComponent UNBOUND = createTranslation("item", "network_item.unbound") diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java index 311c67550..f0d6d422e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemItemPropertyFunction.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; -import com.refinedmods.refinedstorage2.platform.api.support.energy.AbstractNetworkBoundEnergyItem; +import com.refinedmods.refinedstorage.platform.api.support.energy.AbstractNetworkBoundEnergyItem; import javax.annotation.Nullable; @@ -10,7 +10,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class NetworkBoundItemItemPropertyFunction implements ClampedItemPropertyFunction { public static final ResourceLocation NAME = createIdentifier("network_bound_active"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java index d124dbcc2..b1afe9bb6 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/NetworkBoundItemSessionImpl.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network.bounditem; +package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitter; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.GraphNetworkComponent; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemTargetBlockEntity; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitter; +import com.refinedmods.refinedstorage.platform.common.Platform; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/package-info.java new file mode 100644 index 000000000..b3a507768 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/bounditem/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.network.bounditem; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/PlatformStorageNetworkComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/PlatformStorageNetworkComponent.java new file mode 100644 index 000000000..77a9f3164 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/PlatformStorageNetworkComponent.java @@ -0,0 +1,29 @@ +package com.refinedmods.refinedstorage.platform.common.support.network.component; + +import com.refinedmods.refinedstorage.api.network.impl.storage.StorageNetworkComponentImpl; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.platform.api.storage.channel.FuzzyStorageChannel; +import com.refinedmods.refinedstorage.platform.api.support.resource.list.FuzzyResourceList; +import com.refinedmods.refinedstorage.platform.common.support.resource.list.FuzzyResourceListImpl; + +import java.util.Collection; + +public class PlatformStorageNetworkComponent extends StorageNetworkComponentImpl implements FuzzyStorageChannel { + private final FuzzyResourceList fuzzyResourceList; + + public PlatformStorageNetworkComponent() { + this(new FuzzyResourceListImpl(new ResourceListImpl())); + } + + private PlatformStorageNetworkComponent(final FuzzyResourceList fuzzyResourceList) { + super(fuzzyResourceList); + this.fuzzyResourceList = fuzzyResourceList; + } + + @Override + public Collection getFuzzy(final ResourceKey resource) { + return fuzzyResourceList.getFuzzy(resource); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/package-info.java new file mode 100644 index 000000000..af74c55be --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/component/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.network.component; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/package-info.java new file mode 100644 index 000000000..73a63e93d --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/network/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.network; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/package-info.java new file mode 100644 index 000000000..b8dc97c84 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketContext.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketContext.java new file mode 100644 index 000000000..d6a473b78 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketContext.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet; + +import net.minecraft.world.entity.player.Player; + +@FunctionalInterface +public interface PacketContext { + Player getPlayer(); +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketHandler.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketHandler.java new file mode 100644 index 000000000..b4f7be605 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/PacketHandler.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet; + +@FunctionalInterface +public interface PacketHandler { + void handle(T packet, PacketContext ctx); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/C2SPackets.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/C2SPackets.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java index ecf525671..03dd0d8a2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/C2SPackets.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/C2SPackets.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyType; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.List; import java.util.UUID; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridClearPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridClearPacket.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridClearPacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridClearPacket.java index 8fe45f79d..92707d603 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridClearPacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridClearPacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record CraftingGridClearPacket(boolean toPlayerInventory) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("crafting_grid_clear")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java new file mode 100644 index 000000000..d041788c0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public record CraftingGridRecipeTransferPacket(List> recipe) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("crafting_grid_recipe_transfer") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.collection(ArrayList::new, + ByteBufCodecs.collection(ArrayList::new, ResourceCodecs.ITEM_STREAM_CODEC)), + CraftingGridRecipeTransferPacket::recipe, + CraftingGridRecipeTransferPacket::new + ); + + public static void handle(final CraftingGridRecipeTransferPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof CraftingGridContainerMenu craftingGridContainerMenu) { + craftingGridContainerMenu.transferRecipe(packet.recipe()); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridExtractPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridExtractPacket.java new file mode 100644 index 000000000..340ded865 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridExtractPacket.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.PacketUtil.enumStreamCodec; + +public record GridExtractPacket( + PlatformResourceKey resource, + GridExtractMode mode, + boolean cursor +) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_extract")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ResourceCodecs.STREAM_CODEC, GridExtractPacket::resource, + enumStreamCodec(GridExtractMode.values()), GridExtractPacket::mode, + ByteBufCodecs.BOOL, GridExtractPacket::cursor, + GridExtractPacket::new + ); + + public static void handle(final GridExtractPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof GridExtractionStrategy strategy) { + strategy.onExtract(packet.resource, packet.mode, packet.cursor); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridInsertPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridInsertPacket.java new file mode 100644 index 000000000..3467985bd --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridInsertPacket.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.PacketUtil.enumStreamCodec; + +public record GridInsertPacket(GridInsertMode mode, boolean tryAlternatives) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_insert")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + enumStreamCodec(GridInsertMode.values()), GridInsertPacket::mode, + ByteBufCodecs.BOOL, GridInsertPacket::tryAlternatives, + GridInsertPacket::new + ); + + public static void handle(final GridInsertPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof GridInsertionStrategy strategy) { + strategy.onInsert(packet.mode, packet.tryAlternatives); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridScrollPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridScrollPacket.java new file mode 100644 index 000000000..801e8ba86 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/GridScrollPacket.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.PacketUtil.enumStreamCodec; + +public record GridScrollPacket( + PlatformResourceKey resource, + GridScrollMode mode, + int slotIndex +) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_scroll")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ResourceCodecs.STREAM_CODEC, GridScrollPacket::resource, + enumStreamCodec(GridScrollMode.values()), GridScrollPacket::mode, + ByteBufCodecs.INT, GridScrollPacket::slotIndex, + GridScrollPacket::new + ); + + public static void handle(final GridScrollPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof GridScrollingStrategy strategy) { + strategy.onScroll(packet.resource, packet.mode, packet.slotIndex); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/PropertyChangePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/PropertyChangePacket.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/PropertyChangePacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/PropertyChangePacket.java index 9f4e91d33..ff59652d4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/PropertyChangePacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/PropertyChangePacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -9,7 +9,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record PropertyChangePacket(ResourceLocation propertyId, int value) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("property_change")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java new file mode 100644 index 000000000..9d056c01b --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java @@ -0,0 +1,38 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static java.util.Objects.requireNonNull; + +public record ResourceFilterSlotChangePacket(int slotIndex, PlatformResourceKey resource) + implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("resource_filter_slot_change") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + ByteBufCodecs.INT, ResourceFilterSlotChangePacket::slotIndex, + ResourceCodecs.STREAM_CODEC, ResourceFilterSlotChangePacket::resource, + ResourceFilterSlotChangePacket::new + ); + + public static void handle(final ResourceFilterSlotChangePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractResourceContainerMenu containerMenu) { + containerMenu.handleResourceFilterSlotUpdate(packet.slotIndex, requireNonNull(packet.resource)); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java index 0b585daeb..ab4bb76d4 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotAmountChangePacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record ResourceSlotAmountChangePacket(int slotIndex, long amount) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotChangePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotChangePacket.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotChangePacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotChangePacket.java index f7e40d487..9c6ef003b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceSlotChangePacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/ResourceSlotChangePacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record ResourceSlotChangePacket(int slotIndex, boolean tryAlternatives) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java index ada869f1f..3aab91fd2 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardBoundPlayerPacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; import java.util.UUID; @@ -12,7 +12,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record SecurityCardBoundPlayerPacket(UUID playerId) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java new file mode 100644 index 000000000..6db41c08e --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java @@ -0,0 +1,37 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.common.security.AbstractSecurityCardContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public record SecurityCardPermissionPacket(PlatformPermission permission, boolean allowed) + implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("security_card_permission") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), SecurityCardPermissionPacket::permission, + ByteBufCodecs.BOOL, SecurityCardPermissionPacket::allowed, + SecurityCardPermissionPacket::new + ); + + public static void handle(final SecurityCardPermissionPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { + securityCardContainerMenu.setPermission(packet.permission, packet.allowed); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java new file mode 100644 index 000000000..283a7226e --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.security.PlatformPermission; +import com.refinedmods.refinedstorage.platform.common.security.AbstractSecurityCardContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public record SecurityCardResetPermissionPacket(PlatformPermission permission) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("security_card_reset_permission") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), SecurityCardResetPermissionPacket::permission, + SecurityCardResetPermissionPacket::new + ); + + public static void handle(final SecurityCardResetPermissionPacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { + securityCardContainerMenu.resetPermissionServer(packet.permission); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SingleAmountChangePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SingleAmountChangePacket.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SingleAmountChangePacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SingleAmountChangePacket.java index 5f4646a55..f86447ebc 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SingleAmountChangePacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/SingleAmountChangePacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record SingleAmountChangePacket(double amount) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/StorageInfoRequestPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/StorageInfoRequestPacket.java new file mode 100644 index 000000000..feb69f833 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/StorageInfoRequestPacket.java @@ -0,0 +1,41 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; + +import java.util.UUID; + +import net.minecraft.core.UUIDUtil; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public record StorageInfoRequestPacket(UUID storageId) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("storage_info_request") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + UUIDUtil.STREAM_CODEC, StorageInfoRequestPacket::storageId, + StorageInfoRequestPacket::new + ); + + public static void handle(final StorageInfoRequestPacket packet, final PacketContext ctx) { + final Player player = ctx.getPlayer(); + final StorageInfo info = PlatformApi.INSTANCE + .getStorageRepository(player.getCommandSenderWorld()) + .getInfo(packet.storageId()); + S2CPackets.sendStorageInfoResponse((ServerPlayer) player, packet.storageId, info); + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java new file mode 100644 index 000000000..36cf611cf --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java @@ -0,0 +1,47 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.energy.AbstractNetworkBoundEnergyItem; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.NetworkBoundItemSession; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReferenceFactory; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public record UseNetworkBoundItemPacket(SlotReference slotReference) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("use_network_bound_item") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + SlotReferenceFactory.STREAM_CODEC, UseNetworkBoundItemPacket::slotReference, + UseNetworkBoundItemPacket::new + ); + + public static void handle(final UseNetworkBoundItemPacket packet, final PacketContext ctx) { + final Player player = ctx.getPlayer(); + packet.slotReference.resolve(player).ifPresent(stack -> { + if (!(stack.getItem() instanceof AbstractNetworkBoundEnergyItem networkBoundItem)) { + return; + } + final NetworkBoundItemSession sess = PlatformApi.INSTANCE.getNetworkBoundItemHelper().openSession( + stack, + (ServerPlayer) player, + packet.slotReference + ); + networkBoundItem.use((ServerPlayer) player, packet.slotReference, sess); + }); + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/package-info.java new file mode 100644 index 000000000..03a90e6ba --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/c2s/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/package-info.java new file mode 100644 index 000000000..ee49a1cad --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.packet; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/EnergyInfoPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/EnergyInfoPacket.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/EnergyInfoPacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/EnergyInfoPacket.java index 9239bb930..51bbaa440 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/EnergyInfoPacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/EnergyInfoPacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -9,7 +9,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record EnergyInfoPacket(long stored, long capacity) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("energy_info")); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridActivePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridActivePacket.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridActivePacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridActivePacket.java index 7322730ae..4d6ca3917 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridActivePacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridActivePacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.api.grid.watcher.GridWatcher; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; @@ -9,7 +9,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record GridActivePacket(boolean active) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_active")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridClearPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridClearPacket.java new file mode 100644 index 000000000..c1b69567e --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridClearPacket.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.world.inventory.AbstractContainerMenu; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public class GridClearPacket implements CustomPacketPayload { + public static final GridClearPacket INSTANCE = new GridClearPacket(); + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_clear")); + public static final StreamCodec STREAM_CODEC = StreamCodec.unit(INSTANCE); + + private GridClearPacket() { + } + + public static void handle(final PacketContext ctx) { + final AbstractContainerMenu menu = ctx.getPlayer().containerMenu; + if (menu instanceof AbstractGridContainerMenu grid) { + grid.onClear(); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridUpdatePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridUpdatePacket.java new file mode 100644 index 000000000..1d2ab28a1 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/GridUpdatePacket.java @@ -0,0 +1,42 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridContainerMenu; +import com.refinedmods.refinedstorage.platform.common.storage.StorageCodecs; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; + +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public record GridUpdatePacket( + PlatformResourceKey resource, + long amount, + Optional trackedResource +) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_update")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ResourceCodecs.STREAM_CODEC, GridUpdatePacket::resource, + ByteBufCodecs.VAR_LONG, GridUpdatePacket::amount, + StorageCodecs.TRACKED_RESOURCE_OPTIONAL_STREAM_CODEC, GridUpdatePacket::trackedResource, + GridUpdatePacket::new + ); + + public static void handle(final GridUpdatePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractGridContainerMenu containerMenu) { + containerMenu.onResourceUpdate(packet.resource, packet.amount, packet.trackedResource.orElse(null)); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java index 3d88c4181..3d01be7a7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NetworkTransmitterStatusPacket.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterData; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterData; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -12,7 +12,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.world.inventory.AbstractContainerMenu; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record NetworkTransmitterStatusPacket(boolean error, Component message) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NoPermissionPacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NoPermissionPacket.java similarity index 78% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NoPermissionPacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NoPermissionPacket.java index 54b57af11..08b908dde 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/NoPermissionPacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/NoPermissionPacket.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; -import com.refinedmods.refinedstorage2.platform.common.util.SecurityToastUtil; +import com.refinedmods.refinedstorage.platform.common.util.SecurityToastUtil; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -8,7 +8,7 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record NoPermissionPacket(Component component) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>(createIdentifier("no_permission")); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java new file mode 100644 index 000000000..e2854d146 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java @@ -0,0 +1,41 @@ +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; + +import java.util.Optional; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public record ResourceSlotUpdatePacket( + int slotIndex, + Optional resourceAmount +) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("resource_slot_update") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ByteBufCodecs.INT, ResourceSlotUpdatePacket::slotIndex, + ByteBufCodecs.optional(ResourceCodecs.AMOUNT_STREAM_CODEC), ResourceSlotUpdatePacket::resourceAmount, + ResourceSlotUpdatePacket::new + ); + + public static void handle(final ResourceSlotUpdatePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AbstractResourceContainerMenu containerMenu) { + containerMenu.handleResourceSlotUpdate(packet.slotIndex, packet.resourceAmount.orElse(null)); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/S2CPackets.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/S2CPackets.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/S2CPackets.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/S2CPackets.java index 1edd95a2e..6955bdaac 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/S2CPackets.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/S2CPackets.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterData; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterData; import java.util.Optional; import java.util.UUID; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/StorageInfoResponsePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/StorageInfoResponsePacket.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/StorageInfoResponsePacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/StorageInfoResponsePacket.java index a5d543e77..b335af780 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/StorageInfoResponsePacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/StorageInfoResponsePacket.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.common.storage.ClientStorageRepository; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.common.storage.ClientStorageRepository; import java.util.UUID; @@ -11,7 +11,7 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record StorageInfoResponsePacket(UUID storageId, long stored, long capacity) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java index 25cb9803f..7f35dc0ac 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/WirelessTransmitterRangePacket.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketContext; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public record WirelessTransmitterRangePacket(int range) implements CustomPacketPayload { public static final Type PACKET_TYPE = new Type<>( diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/package-info.java new file mode 100644 index 000000000..7696751fd --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/packet/s2c/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.packet.s2c; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImpl.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImpl.java index d804acfb7..ceee95c25 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.registry; +package com.refinedmods.refinedstorage.platform.common.support.registry; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; import java.util.ArrayList; import java.util.Collections; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/package-info.java new file mode 100644 index 000000000..f1fea47b4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/registry/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.registry; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java index 2dfdb68c1..5099afa6b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractDiskLedBlockEntityRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.support.render; +package com.refinedmods.refinedstorage.platform.common.support.render; -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractFluidRenderer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractFluidRenderer.java similarity index 98% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractFluidRenderer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractFluidRenderer.java index 0fda4fcf3..d9546a411 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/AbstractFluidRenderer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/AbstractFluidRenderer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.render; +package com.refinedmods.refinedstorage.platform.common.support.render; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/CubeBuilder.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/CubeBuilder.java similarity index 98% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/CubeBuilder.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/CubeBuilder.java index 2de51dbdb..f3dc24824 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/CubeBuilder.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/CubeBuilder.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.render; +package com.refinedmods.refinedstorage.platform.common.support.render; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/FluidRenderer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/FluidRenderer.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/FluidRenderer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/FluidRenderer.java index 34773c624..e09304332 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/FluidRenderer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/FluidRenderer.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.render; +package com.refinedmods.refinedstorage.platform.common.support.render; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/package-info.java new file mode 100644 index 000000000..8d1651457 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/render/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.render; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java index b1cc8437f..742e533d0 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/AbstractResourceContainerContainerAdapter.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; +package com.refinedmods.refinedstorage.platform.common.support.resource; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/CompositeRecipeModIngredientConverter.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/CompositeRecipeModIngredientConverter.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/CompositeRecipeModIngredientConverter.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/CompositeRecipeModIngredientConverter.java index cdbd95455..6946f20a8 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/CompositeRecipeModIngredientConverter.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/CompositeRecipeModIngredientConverter.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; +package com.refinedmods.refinedstorage.platform.common.support.resource; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter; import java.util.Collection; import java.util.HashSet; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java new file mode 100644 index 000000000..adae101b7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResource.java @@ -0,0 +1,39 @@ +package com.refinedmods.refinedstorage.platform.common.support.resource; + +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; + +import net.minecraft.core.component.DataComponentPatch; +import net.minecraft.world.level.material.Fluid; +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public record FluidResource(Fluid fluid, DataComponentPatch components) + implements PlatformResourceKey, FuzzyModeNormalizer { + public FluidResource(final Fluid fluid) { + this(fluid, DataComponentPatch.EMPTY); + } + + public FluidResource(final Fluid fluid, final DataComponentPatch components) { + this.fluid = CoreValidations.validateNotNull(fluid, "Fluid must not be null"); + this.components = CoreValidations.validateNotNull(components, "Components must not be null"); + } + + @Override + public ResourceKey normalize() { + return new FluidResource(fluid); + } + + @Override + public long getInterfaceExportLimit() { + return ResourceTypes.FLUID.getInterfaceExportLimit(); + } + + @Override + public ResourceType getResourceType() { + return ResourceTypes.FLUID; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java new file mode 100644 index 000000000..f0ad2b9a3 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceFactory.java @@ -0,0 +1,25 @@ +package com.refinedmods.refinedstorage.platform.common.support.resource; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.platform.common.Platform; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; + +public class FluidResourceFactory implements ResourceFactory { + @Override + public Optional create(final ItemStack stack) { + return Platform.INSTANCE.getContainedFluid(stack).map(result -> new ResourceAmount( + result.fluid(), + Platform.INSTANCE.getBucketAmount() + )); + } + + @Override + public boolean isValid(final ResourceKey resource) { + return resource instanceof FluidResource; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceRendering.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRendering.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceRendering.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRendering.java index 82fb68926..d39a08b71 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceRendering.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRendering.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; +package com.refinedmods.refinedstorage.platform.common.support.resource; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.platform.common.Platform; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java new file mode 100644 index 000000000..089155b26 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceType.java @@ -0,0 +1,87 @@ +package com.refinedmods.refinedstorage.platform.common.support.resource; + +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperationsImpl; +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.support.resource.AbstractResourceType; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.grid.view.FluidGridResource; +import com.refinedmods.refinedstorage.platform.common.support.TextureIds; + +import java.util.Optional; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +class FluidResourceType extends AbstractResourceType { + FluidResourceType() { + super( + "FLUID", + createTranslation("misc", "resource_type.fluid"), + TextureIds.ICONS, + 16, + 128 + ); + } + + @Override + public Optional toGridResource(final ResourceAmount resourceAmount) { + return Platform.INSTANCE.getFluidGridResourceFactory().apply(resourceAmount); + } + + @Override + public boolean isGridResourceBelonging(final GridResource gridResource) { + return gridResource instanceof FluidGridResource; + } + + @Override + public long normalizeAmount(final double amount) { + return (long) (amount * Platform.INSTANCE.getBucketAmount()); + } + + @Override + public double getDisplayAmount(final long amount) { + return amount / (double) Platform.INSTANCE.getBucketAmount(); + } + + @Override + public long getInterfaceExportLimit() { + return Platform.INSTANCE.getBucketAmount() * 16; + } + + @Override + public GridOperations createGridOperations(final StorageChannel storageChannel, final Actor actor) { + return new GridOperationsImpl( + storageChannel, + actor, + fluidResource -> Long.MAX_VALUE, + Platform.INSTANCE.getBucketAmount() + ); + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public MapCodec getMapCodec() { + return (MapCodec) ResourceCodecs.FLUID_MAP_CODEC; + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public Codec getCodec() { + return (Codec) ResourceCodecs.FLUID_CODEC; + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public StreamCodec getStreamCodec() { + return (StreamCodec) ResourceCodecs.FLUID_STREAM_CODEC; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java index 2f3024014..52f987d1f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResource.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResource.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; +package com.refinedmods.refinedstorage.platform.common.support.resource; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; import net.minecraft.core.component.DataComponentPatch; import net.minecraft.world.item.Item; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceFactory.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceFactory.java new file mode 100644 index 000000000..b73422734 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceFactory.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.platform.common.support.resource; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; + +import java.util.Optional; + +import net.minecraft.world.item.ItemStack; + +public class ItemResourceFactory implements ResourceFactory { + @Override + public Optional create(final ItemStack stack) { + if (stack.isEmpty()) { + return Optional.empty(); + } + return Optional.of(new ResourceAmount(ItemResource.ofItemStack(stack), stack.getCount())); + } + + @Override + public boolean isValid(final ResourceKey resource) { + return resource instanceof ItemResource; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceRendering.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceRendering.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceRendering.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceRendering.java index efd8b748e..858cbe0d7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceRendering.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceRendering.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; +package com.refinedmods.refinedstorage.platform.common.support.resource; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java new file mode 100644 index 000000000..88fb86469 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ItemResourceType.java @@ -0,0 +1,89 @@ +package com.refinedmods.refinedstorage.platform.common.support.resource; + +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperationsImpl; +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.platform.api.support.resource.AbstractResourceType; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.grid.view.ItemGridResource; +import com.refinedmods.refinedstorage.platform.common.support.TextureIds; + +import java.util.Optional; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +class ItemResourceType extends AbstractResourceType { + ItemResourceType() { + super( + "ITEM", + createTranslation("misc", "resource_type.item"), + TextureIds.ICONS, + 0, + 128 + ); + } + + @Override + public Optional toGridResource(final ResourceAmount resourceAmount) { + return Platform.INSTANCE.getItemGridResourceFactory().apply(resourceAmount); + } + + @Override + public boolean isGridResourceBelonging(final GridResource gridResource) { + return gridResource instanceof ItemGridResource; + } + + @Override + public long normalizeAmount(final double amount) { + return (long) amount; + } + + @Override + public double getDisplayAmount(final long amount) { + return amount; + } + + @Override + public long getInterfaceExportLimit() { + return 64; + } + + @Override + public GridOperations createGridOperations(final StorageChannel storageChannel, final Actor actor) { + return new GridOperationsImpl( + storageChannel, + actor, + resource -> resource instanceof ItemResource itemResource + ? itemResource.item().getDefaultMaxStackSize() + : 0, + 1 + ); + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public MapCodec getMapCodec() { + return (MapCodec) ResourceCodecs.ITEM_MAP_CODEC; + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public Codec getCodec() { + return (Codec) ResourceCodecs.ITEM_CODEC; + } + + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public StreamCodec getStreamCodec() { + return (StreamCodec) ResourceCodecs.ITEM_STREAM_CODEC; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceCodecs.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceCodecs.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceCodecs.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceCodecs.java index 27c325e8a..bfa0d16f7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceCodecs.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceCodecs.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; +package com.refinedmods.refinedstorage.platform.common.support.resource; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerData.java similarity index 81% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerData.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerData.java index 700324781..899b026d5 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerData.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerData.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; +package com.refinedmods.refinedstorage.platform.common.support.resource; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerImpl.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerImpl.java index 686802eab..a026838a7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerImpl.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.util.MathUtil; +package com.refinedmods.refinedstorage.platform.common.support.resource; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceFactory; +import com.refinedmods.refinedstorage.platform.common.util.MathUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerSlot.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java index fcb7efd05..e7022129b 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceContainerSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceContainerSlot.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; +package com.refinedmods.refinedstorage.platform.common.support.resource; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; import java.util.Objects; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceTypes.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceTypes.java new file mode 100644 index 000000000..6f98902ab --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/ResourceTypes.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.platform.common.support.resource; + +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceType; + +public final class ResourceTypes { + public static final ResourceType ITEM = new ItemResourceType(); + public static final ResourceType FLUID = new FluidResourceType(); + + private ResourceTypes() { + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java index 9d7b71c34..c7f354030 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource.list; +package com.refinedmods.refinedstorage.platform.common.support.resource.list; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.AbstractProxyResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage2.platform.api.support.resource.list.FuzzyResourceList; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.AbstractProxyResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.platform.api.support.resource.FuzzyModeNormalizer; +import com.refinedmods.refinedstorage.platform.api.support.resource.list.FuzzyResourceList; import java.util.Collection; import java.util.Collections; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/package-info.java new file mode 100644 index 000000000..4690dea16 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.resource.list; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/package-info.java new file mode 100644 index 000000000..0c60b6476 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/resource/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.resource; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/AbstractStretchingScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/AbstractStretchingScreen.java similarity index 94% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/AbstractStretchingScreen.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/AbstractStretchingScreen.java index 7bbd61d55..ce271e0fd 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/AbstractStretchingScreen.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/AbstractStretchingScreen.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.support.stretching; +package com.refinedmods.refinedstorage.platform.common.support.stretching; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.widget.ScrollbarWidget; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.widget.ScrollbarWidget; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSize.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSize.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSize.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSize.java index 79efb5b0c..dded9afea 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSize.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSize.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.stretching; +package com.refinedmods.refinedstorage.platform.common.support.stretching; public enum ScreenSize { STRETCH, diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeListener.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeListener.java new file mode 100644 index 000000000..94d7f2330 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeListener.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.platform.common.support.stretching; + +@FunctionalInterface +public interface ScreenSizeListener { + void onScreenReady(int playerInventoryY); +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSizeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeSideButtonWidget.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSizeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeSideButtonWidget.java index e4affb966..5d976b10c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSizeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/ScreenSizeSideButtonWidget.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.support.stretching; +package com.refinedmods.refinedstorage.platform.common.support.stretching; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.support.widget.AbstractSideButtonWidget; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class ScreenSizeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "screen_size"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/package-info.java new file mode 100644 index 000000000..1972d0580 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/stretching/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.stretching; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/CompositeClientTooltipComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/CompositeClientTooltipComponent.java similarity index 95% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/CompositeClientTooltipComponent.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/CompositeClientTooltipComponent.java index 87f8c04dd..26b15e285 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/CompositeClientTooltipComponent.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/CompositeClientTooltipComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.platform.common.support.tooltip; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/HelpClientTooltipComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/HelpClientTooltipComponent.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/HelpClientTooltipComponent.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/HelpClientTooltipComponent.java index 1122cac6c..89df5f0c3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/HelpClientTooltipComponent.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/HelpClientTooltipComponent.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.platform.common.support.tooltip; -import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.platform.common.support.TextureIds; import java.util.List; @@ -15,7 +15,7 @@ import net.minecraft.util.FormattedCharSequence; import org.joml.Matrix4f; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslationAsHeading; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationAsHeading; import static net.minecraft.client.gui.screens.Screen.hasShiftDown; public class HelpClientTooltipComponent implements ClientTooltipComponent { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java index 659e5eb8f..379f8f341 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/MouseWithIconClientTooltipComponent.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.platform.common.support.tooltip; -import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.platform.common.support.TextureIds; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/ResourceClientTooltipComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/ResourceClientTooltipComponent.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/ResourceClientTooltipComponent.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/ResourceClientTooltipComponent.java index 79b983225..253e36839 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/ResourceClientTooltipComponent.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/ResourceClientTooltipComponent.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.platform.common.support.tooltip; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceRendering; import java.util.Objects; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/SmallText.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallText.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/SmallText.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallText.java index 864a1fffa..38a77e65e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/SmallText.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallText.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.platform.common.support.tooltip; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/SmallTextClientTooltipComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallTextClientTooltipComponent.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/SmallTextClientTooltipComponent.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallTextClientTooltipComponent.java index 87465252e..0ac9934eb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/SmallTextClientTooltipComponent.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/SmallTextClientTooltipComponent.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.tooltip; +package com.refinedmods.refinedstorage.platform.common.support.tooltip; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/package-info.java new file mode 100644 index 000000000..cddbc8150 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/tooltip/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.tooltip; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractSideButtonWidget.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractSideButtonWidget.java index 1cbd57728..c9706f073 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractSideButtonWidget.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.SmallTextClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.TextureIds; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.SmallTextClientTooltipComponent; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractYesNoSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractYesNoSideButtonWidget.java new file mode 100644 index 000000000..3e7d4769b --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/AbstractYesNoSideButtonWidget.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.platform.common.support.widget; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; + +import net.minecraft.network.chat.MutableComponent; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.NO; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.YES; + +public abstract class AbstractYesNoSideButtonWidget extends AbstractSideButtonWidget { + protected final ClientProperty property; + private final MutableComponent title; + + protected AbstractYesNoSideButtonWidget(final ClientProperty property, final MutableComponent title) { + super(createPressAction(property)); + this.property = property; + this.title = title; + } + + private static OnPress createPressAction(final ClientProperty property) { + return btn -> property.setValue(!property.getValue()); + } + + @Override + protected MutableComponent getTitle() { + return title; + } + + @Override + protected MutableComponent getSubText() { + return Boolean.TRUE.equals(property.getValue()) ? YES : NO; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/CustomCheckboxWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/CustomCheckboxWidget.java similarity index 98% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/CustomCheckboxWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/CustomCheckboxWidget.java index d06ae0fa9..e090114b7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/CustomCheckboxWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/CustomCheckboxWidget.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/FuzzyModeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/FuzzyModeSideButtonWidget.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/FuzzyModeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/FuzzyModeSideButtonWidget.java index c919fad87..743439dbf 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/FuzzyModeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/FuzzyModeSideButtonWidget.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; import java.util.function.Supplier; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class FuzzyModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "fuzzy_mode"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/History.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/History.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java index bea9f3d1a..1c912088f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/History.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/History.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; import java.util.List; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/HoveredImageButton.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/HoveredImageButton.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/HoveredImageButton.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/HoveredImageButton.java index 9a723d0c4..269f03306 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/HoveredImageButton.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/HoveredImageButton.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.ImageButton; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/ProgressWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ProgressWidget.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/ProgressWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ProgressWidget.java index da5fcf18f..f471c70ed 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/ProgressWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ProgressWidget.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; import java.util.List; import java.util.function.DoubleSupplier; @@ -11,7 +11,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class ProgressWidget extends AbstractWidget { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/widgets.png"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/RedstoneModeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/RedstoneModeSideButtonWidget.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/RedstoneModeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/RedstoneModeSideButtonWidget.java index 6918d79fb..eba1aa4b9 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/RedstoneModeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/RedstoneModeSideButtonWidget.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; import javax.annotation.Nullable; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class RedstoneModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "redstone_mode"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SchedulingModeSideButtonWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SchedulingModeSideButtonWidget.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SchedulingModeSideButtonWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SchedulingModeSideButtonWidget.java index cf0a051d1..b1cd2ab66 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SchedulingModeSideButtonWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SchedulingModeSideButtonWidget.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; -import com.refinedmods.refinedstorage2.platform.common.support.SchedulingModeType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.SchedulingModeType; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class SchedulingModeSideButtonWidget extends AbstractSideButtonWidget { private static final MutableComponent TITLE = createTranslation("gui", "scheduling_mode"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/ScrollbarWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ScrollbarWidget.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/ScrollbarWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ScrollbarWidget.java index 9111b4348..5635167fa 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/ScrollbarWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/ScrollbarWidget.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.Platform; import java.util.function.DoubleConsumer; import javax.annotation.Nullable; @@ -11,7 +11,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class ScrollbarWidget extends AbstractWidget { private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/widgets.png"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SearchFieldWidget.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SearchFieldWidget.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java index b67a008fc..e7c6a7b70 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/SearchFieldWidget.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/SearchFieldWidget.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.KeyMappings; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.EditBox; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/package-info.java new file mode 100644 index 000000000..68c7eb13d --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/support/widget/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.support.widget; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java new file mode 100644 index 000000000..1b1b501e8 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java @@ -0,0 +1,31 @@ +package com.refinedmods.refinedstorage.platform.common.upgrade; + +import com.refinedmods.refinedstorage.platform.api.upgrade.BuiltinUpgradeDestinations; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeDestination; + +public class BuiltinUpgradeDestinationsImpl implements BuiltinUpgradeDestinations { + @Override + public UpgradeDestination getImporter() { + return UpgradeDestinations.IMPORTER; + } + + @Override + public UpgradeDestination getExporter() { + return UpgradeDestinations.EXPORTER; + } + + @Override + public UpgradeDestination getDestructor() { + return UpgradeDestinations.DESTRUCTOR; + } + + @Override + public UpgradeDestination getConstructor() { + return UpgradeDestinations.CONSTRUCTOR; + } + + @Override + public UpgradeDestination getWirelessTransmitter() { + return UpgradeDestinations.WIRELESS_TRANSMITTER; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/FortuneUpgradeItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/FortuneUpgradeItem.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/FortuneUpgradeItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/FortuneUpgradeItem.java index e204a4645..f7a98270f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/FortuneUpgradeItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/FortuneUpgradeItem.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.platform.common.Platform; import java.util.Optional; @@ -12,7 +12,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class FortuneUpgradeItem extends AbstractUpgradeItem { private static final Component HELP = createTranslation("item", "fortune_upgrade.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RangeUpgradeItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RangeUpgradeItem.java new file mode 100644 index 000000000..335344563 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RangeUpgradeItem.java @@ -0,0 +1,40 @@ +package com.refinedmods.refinedstorage.platform.common.upgrade; + +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.platform.common.Platform; + +import java.util.Optional; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class RangeUpgradeItem extends AbstractUpgradeItem { + private static final Component HELP = createTranslation("item", "range_upgrade.help"); + private static final Component CREATIVE_HELP = createTranslation("item", "creative_range_upgrade.help"); + + private final boolean creative; + + public RangeUpgradeItem(final UpgradeRegistry registry, final boolean creative) { + super(new Item.Properties(), registry); + this.creative = creative; + } + + @Override + public long getEnergyUsage() { + if (creative) { + return Platform.INSTANCE.getConfig().getUpgrade().getCreativeRangeUpgradeEnergyUsage(); + } + return Platform.INSTANCE.getConfig().getUpgrade().getRangeUpgradeEnergyUsage(); + } + + @Override + public Optional getTooltipImage(final ItemStack stack) { + return Optional.of(new HelpTooltipComponent(creative ? CREATIVE_HELP : HELP)); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeContainerMenu.java new file mode 100644 index 000000000..66b9eedb6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeContainerMenu.java @@ -0,0 +1,53 @@ +package com.refinedmods.refinedstorage.platform.common.upgrade; + +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; + +import java.util.function.Consumer; +import javax.annotation.Nullable; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class RegulatorUpgradeContainerMenu extends AbstractSingleAmountContainerMenu { + private static final Component FILTER_HELP = createTranslation("gui", "regulator_upgrade.filter_help"); + + @Nullable + private Consumer amountAcceptor; + + public RegulatorUpgradeContainerMenu(final int syncId, + final Inventory playerInventory, + final SingleAmountData singleAmountData) { + super(Menus.INSTANCE.getRegulatorUpgrade(), syncId, playerInventory, singleAmountData, FILTER_HELP); + } + + RegulatorUpgradeContainerMenu(final int syncId, + final Player player, + final ResourceContainer resourceContainer, + final Consumer amountAcceptor, + final SlotReference slotReference) { + super( + Menus.INSTANCE.getRegulatorUpgrade(), + syncId, + player, + resourceContainer, + FILTER_HELP, + slotReference + ); + this.amountAcceptor = amountAcceptor; + } + + @Override + public void changeAmountOnServer(final double newAmount) { + if (amountAcceptor == null) { + return; + } + amountAcceptor.accept(newAmount); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java index 54ae00ca1..cf77de199 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeItem.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; +package com.refinedmods.refinedstorage.platform.common.upgrade; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.network.bounditem.SlotReference; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.content.DataComponents; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.SingleAmountData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerData; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceContainerImpl; import java.util.Optional; import java.util.OptionalLong; @@ -35,7 +35,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class RegulatorUpgradeItem extends AbstractUpgradeItem { private static final Component HELP = createTranslation("item", "regulator_upgrade.help"); diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeScreen.java new file mode 100644 index 000000000..4938bebb2 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeScreen.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.platform.common.upgrade; + +import com.refinedmods.refinedstorage.platform.common.support.amount.AbstractSingleAmountScreen; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; + +public class RegulatorUpgradeScreen extends AbstractSingleAmountScreen { + public RegulatorUpgradeScreen(final RegulatorUpgradeContainerMenu menu, + final Inventory playerInventory, + final Component text) { + super(menu, playerInventory, text, menu.getAmount(), 1); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeState.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeState.java similarity index 86% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeState.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeState.java index 7898651d7..634877135 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeState.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/RegulatorUpgradeState.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceCodecs; import java.util.Optional; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/SimpleUpgradeItem.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/SimpleUpgradeItem.java similarity index 80% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/SimpleUpgradeItem.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/SimpleUpgradeItem.java index d1a8a0b7d..dbfb81b64 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/SimpleUpgradeItem.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/SimpleUpgradeItem.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage2.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.platform.common.Platform; import java.util.Optional; import java.util.function.LongSupplier; @@ -14,7 +14,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public final class SimpleUpgradeItem extends AbstractUpgradeItem { private final LongSupplier energyUsageResolver; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeContainer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeContainer.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeContainer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeContainer.java index aa2a8b37e..945ca75f5 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeContainer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeContainer.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeDestination; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeItem; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeMapping; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; +package com.refinedmods.refinedstorage.platform.common.upgrade; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeDestination; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeItem; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; import java.util.OptionalLong; import java.util.Set; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java similarity index 93% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java index 50171bab5..9e80c74d3 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinationClientTooltipComponent.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; import java.util.Objects; import java.util.Set; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinations.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java similarity index 83% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinations.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java index 644af5af3..c33b15098 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeDestinations.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeDestinations.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeDestination; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeDestination; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.content.Items; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeItemClientTooltipComponent.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeItemClientTooltipComponent.java similarity index 89% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeItemClientTooltipComponent.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeItemClientTooltipComponent.java index 3bd99a92b..20d1cfeac 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeItemClientTooltipComponent.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeItemClientTooltipComponent.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; import java.util.Objects; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeRegistryImpl.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeRegistryImpl.java similarity index 88% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeRegistryImpl.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeRegistryImpl.java index a45db1f9a..70c36641f 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeRegistryImpl.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeRegistryImpl.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeDestination; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeMapping; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeDestination; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeRegistry; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeSlot.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeSlot.java similarity index 82% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeSlot.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeSlot.java index 745daab62..173aea0bb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeSlot.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeSlot.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeMapping; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeMapping; import java.util.Set; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java index 1a79b670b..c20e64926 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipe.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; -import com.refinedmods.refinedstorage2.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.content.Items; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java index dffbc973b..8c77f7986 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/UpgradeWithEnchantedBookRecipeSerializer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; +package com.refinedmods.refinedstorage.platform.common.upgrade; import com.mojang.serialization.MapCodec; import net.minecraft.network.RegistryFriendlyByteBuf; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/package-info.java new file mode 100644 index 000000000..96d9a930a --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/upgrade/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.upgrade; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ContainerUtil.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ContainerUtil.java similarity index 96% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ContainerUtil.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ContainerUtil.java index f95ef26ce..822d91892 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ContainerUtil.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ContainerUtil.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.util; +package com.refinedmods.refinedstorage.platform.common.util; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/CustomBlockPlaceContext.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/CustomBlockPlaceContext.java similarity index 92% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/CustomBlockPlaceContext.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/CustomBlockPlaceContext.java index 09b416c97..c6181be73 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/CustomBlockPlaceContext.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/CustomBlockPlaceContext.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.util; +package com.refinedmods.refinedstorage.platform.common.util; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/IdentifierUtil.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/IdentifierUtil.java similarity index 91% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/IdentifierUtil.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/IdentifierUtil.java index 0719a3045..16c23aff7 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/IdentifierUtil.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/IdentifierUtil.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.util; +package com.refinedmods.refinedstorage.platform.common.util; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; +import com.refinedmods.refinedstorage.platform.api.support.AmountFormatting; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; @@ -8,7 +8,7 @@ import net.minecraft.resources.ResourceLocation; public final class IdentifierUtil { - public static final String MOD_ID = "refinedstorage2"; + public static final String MOD_ID = "refinedstorage"; public static final MutableComponent YES = Component.translatable("gui.yes"); public static final MutableComponent NO = Component.translatable("gui.no"); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/MathUtil.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/MathUtil.java similarity index 76% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/MathUtil.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/MathUtil.java index 86094c3b6..6f1a8bceb 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/MathUtil.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/MathUtil.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.util; +package com.refinedmods.refinedstorage.platform.common.util; public final class MathUtil { private MathUtil() { diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/PacketUtil.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/PacketUtil.java similarity index 87% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/PacketUtil.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/PacketUtil.java index 7bbb9ba11..3f053ec5e 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/PacketUtil.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/PacketUtil.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.util; +package com.refinedmods.refinedstorage.platform.common.util; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/SecurityToastUtil.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/SecurityToastUtil.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/SecurityToastUtil.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/SecurityToastUtil.java index 5249f3635..68d4f833c 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/SecurityToastUtil.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/SecurityToastUtil.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.util; +package com.refinedmods.refinedstorage.platform.common.util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.toasts.SystemToast; import net.minecraft.network.chat.Component; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public final class SecurityToastUtil { private static final SystemToast.SystemToastId NO_PERMISSION_TOAST_ID = new SystemToast.SystemToastId(); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ServerEventQueue.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ServerEventQueue.java similarity index 90% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ServerEventQueue.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ServerEventQueue.java index bcee12c97..7f4cb03cf 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/ServerEventQueue.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/ServerEventQueue.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.util; +package com.refinedmods.refinedstorage.platform.common.util; import java.util.ArrayDeque; import java.util.Deque; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/package-info.java new file mode 100644 index 000000000..24a9fbff9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/util/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.util; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java new file mode 100644 index 000000000..2929a9f7f --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; + +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.platform.common.Platform; + +public class BaseWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { + @Override + public int modifyRange(final UpgradeState upgradeState, final int range) { + return Platform.INSTANCE.getConfig().getWirelessTransmitter().getBaseRange() + range; + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java index 9e5ca5785..ec97eb5fa 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CompositeWirelessTransmitterRangeModifier.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; import java.util.Comparator; import java.util.PriorityQueue; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java new file mode 100644 index 000000000..baf975b88 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; + +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.platform.common.content.Items; + +public class CreativeRangeUpgradeWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { + @Override + public int modifyRange(final UpgradeState upgradeState, final int range) { + if (upgradeState.has(Items.INSTANCE.getCreativeRangeUpgrade())) { + return Integer.MAX_VALUE; + } + return range; + } + + @Override + public int getPriority() { + return Integer.MAX_VALUE; + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java new file mode 100644 index 000000000..5d10ac039 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; + +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.Items; + +public class RangeUpgradeWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { + @Override + public int modifyRange(final UpgradeState upgradeState, final int range) { + final int amountOfRangeUpgrades = upgradeState.getAmount(Items.INSTANCE.getRangeUpgrade()); + final int rangePerUpgrade = Platform.INSTANCE.getConfig().getUpgrade().getRangeUpgradeRange(); + return range + (amountOfRangeUpgrades * rangePerUpgrade); + } +} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java index a9ccf755a..551b26f1d 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlock.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockConstants; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBlockEntityTicker; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.BlockItemProvider; +import com.refinedmods.refinedstorage.platform.common.support.NetworkNodeBlockItem; +import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DirectionType; +import com.refinedmods.refinedstorage.platform.common.support.network.NetworkNodeBlockEntityTicker; import javax.annotation.Nullable; @@ -31,7 +31,7 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class WirelessTransmitterBlock extends AbstractActiveColoredDirectionalBlock diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java similarity index 79% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java index 554419806..72ab2a1d1 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterBlockEntity.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; - -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionSink; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; + +import com.refinedmods.refinedstorage.api.network.impl.node.SimpleNetworkNode; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionSink; +import com.refinedmods.refinedstorage.platform.api.support.network.InWorldNetworkNodeContainer; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.support.AbstractDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java similarity index 75% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java index 4291509a5..e96ddf832 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterContainerMenu.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeSlot; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.common.content.Menus; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseContainerMenu; +import com.refinedmods.refinedstorage.platform.common.support.RedstoneMode; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ClientProperty; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ServerProperty; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.S2CPackets; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeContainer; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinations; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeSlot; import javax.annotation.Nullable; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterData.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterData.java similarity index 85% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterData.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterData.java index bc6d2f85d..8fc7e5aad 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterData.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterData.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java similarity index 77% rename from refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java rename to refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java index dc65fa1e1..596d66651 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterNetworkNodeContainer.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitter; -import com.refinedmods.refinedstorage2.platform.common.support.network.InWorldNetworkNodeContainerImpl; +import com.refinedmods.refinedstorage.api.network.impl.node.AbstractNetworkNode; +import com.refinedmods.refinedstorage.platform.api.support.network.ConnectionLogic; +import com.refinedmods.refinedstorage.platform.api.wirelesstransmitter.WirelessTransmitter; +import com.refinedmods.refinedstorage.platform.common.support.network.InWorldNetworkNodeContainerImpl; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceKey; diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java new file mode 100644 index 000000000..63fef0c3f --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java @@ -0,0 +1,50 @@ +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; + +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.PropertyTypes; +import com.refinedmods.refinedstorage.platform.common.support.widget.RedstoneModeSideButtonWidget; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; + +public class WirelessTransmitterScreen extends AbstractBaseScreen { + private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/wireless_transmitter.png"); + + public WirelessTransmitterScreen(final WirelessTransmitterContainerMenu containerMenu, + final Inventory inventory, + final Component title) { + super(containerMenu, inventory, title); + this.inventoryLabelY = 43; + this.imageWidth = 211; + this.imageHeight = 137; + } + + @Override + protected void init() { + super.init(); + addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); + } + + @Override + protected ResourceLocation getTexture() { + return TEXTURE; + } + + @Override + protected void renderLabels(final GuiGraphics graphics, final int mouseX, final int mouseY) { + super.renderLabels(graphics, mouseX, mouseY); + graphics.drawString( + font, + createTranslation("gui", "wireless_transmitter.distance", getMenu().getRange()), + 28, + 25, + 4210752, + false + ); + } +} diff --git a/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/package-info.java b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/package-info.java new file mode 100644 index 000000000..6b102d3f7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/java/com/refinedmods/refinedstorage/platform/common/wirelesstransmitter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.common.wirelesstransmitter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1024b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1024b_fluid_storage_block.json new file mode 100644 index 000000000..a147e643b --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1024b_fluid_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/1024b_fluid_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json new file mode 100644 index 000000000..7967a932f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/16k_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/16k_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json new file mode 100644 index 000000000..430f83b4e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/1k_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/1k_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/256b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/256b_fluid_storage_block.json new file mode 100644 index 000000000..ae067a9de --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/256b_fluid_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/256b_fluid_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4096b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4096b_fluid_storage_block.json new file mode 100644 index 000000000..d07dd17da --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4096b_fluid_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/4096b_fluid_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json new file mode 100644 index 000000000..3cfe4713d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/4k_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/4k_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64b_fluid_storage_block.json new file mode 100644 index 000000000..c6f574510 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64b_fluid_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/64b_fluid_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json new file mode 100644 index 000000000..3763d6800 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/64k_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/64k_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_fluid_storage_block.json new file mode 100644 index 000000000..6aca18ec0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_fluid_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/creative_fluid_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_portable_grid.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_portable_grid.json new file mode 100644 index 000000000..b5bdb86fa --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_portable_grid.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/portable_grid" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json new file mode 100644 index 000000000..3ba311ae0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/creative_storage_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/creative_storage_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json new file mode 100644 index 000000000..3b85a0955 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/disk_drive" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/interface.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/interface.json new file mode 100644 index 000000000..7af334631 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/interface.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=true": { + "model": "refinedstorage:block/interface_active" + }, + "active=false": { + "model": "refinedstorage:block/interface_inactive" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json new file mode 100644 index 000000000..04d09312e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/machine_casing" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json new file mode 100644 index 000000000..b5bdb86fa --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/portable_grid.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/portable_grid" + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json new file mode 100644 index 000000000..79ec69bbc --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_copper_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/quartz_enriched_copper_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json new file mode 100644 index 000000000..b27fd75da --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "refinedstorage:block/quartz_enriched_iron_block" + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json new file mode 100644 index 000000000..a425e8f1c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json @@ -0,0 +1,57 @@ +{ + "variants": { + "direction=down_east": { + "model": "refinedstorage:block/storage_monitor", + "x": 90, + "y": -90 + }, + "direction=down_north": { + "model": "refinedstorage:block/storage_monitor", + "x": 90 + }, + "direction=down_south": { + "model": "refinedstorage:block/storage_monitor", + "x": 90, + "y": 180 + }, + "direction=down_west": { + "model": "refinedstorage:block/storage_monitor", + "x": 90, + "y": 90 + }, + "direction=east": { + "model": "refinedstorage:block/storage_monitor", + "y": 90 + }, + "direction=north": { + "model": "refinedstorage:block/storage_monitor" + }, + "direction=south": { + "model": "refinedstorage:block/storage_monitor", + "y": 180 + }, + "direction=up_east": { + "model": "refinedstorage:block/storage_monitor", + "x": -90, + "y": -90 + }, + "direction=up_north": { + "model": "refinedstorage:block/storage_monitor", + "x": -90, + "y": 180 + }, + "direction=up_south": { + "model": "refinedstorage:block/storage_monitor", + "x": -90 + }, + "direction=up_west": { + "model": "refinedstorage:block/storage_monitor", + "x": -90, + "y": 90 + }, + "direction=west": { + "model": "refinedstorage:block/storage_monitor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/icon.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/icon.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/icon.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/icon.png diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json new file mode 100644 index 000000000..1e6a8542a --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/de_de.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Kabel", + "block.refinedstorage.quartz_enriched_iron_block": "Quarz angereichertes Eisenblock", + "block.refinedstorage.disk_drive": "Laufwerk", + "block.refinedstorage.machine_casing": "Maschinengehäuse", + "block.refinedstorage.grid": "Konsole", + "block.refinedstorage.crafting_grid": "Herstellungskonsole", + "block.refinedstorage.controller": "Kontrollblock", + "block.refinedstorage.creative_controller": "Kreativer Kontrollblock", + "block.refinedstorage.1k_storage_block": "1k Speicherblock", + "block.refinedstorage.4k_storage_block": "4k Speicherblock", + "block.refinedstorage.16k_storage_block": "16k Speicherblock", + "block.refinedstorage.64k_storage_block": "64k Speicherblock", + "block.refinedstorage.creative_storage_block": "Kreativer Speicherblock", + "block.refinedstorage.64b_fluid_storage_block": "64B Flüssigspeicherblock", + "block.refinedstorage.256b_fluid_storage_block": "256B Flüssigspeicherblock", + "block.refinedstorage.1024b_fluid_storage_block": "1024B Flüssigspeicherblock", + "block.refinedstorage.4096b_fluid_storage_block": "4096B Flüssigspeicherblock", + "block.refinedstorage.creative_fluid_storage_block": "Kreativer Flüssigspeicherblock", + "block.refinedstorage.importer": "Importierer", + "block.refinedstorage.exporter": "Exportierer", + "block.refinedstorage.interface": "Schnittstelle", + "block.refinedstorage.external_storage": "Externer Speicher", + "block.refinedstorage.detector": "Detektor", + "block.refinedstorage.constructor": "Konstruktor", + "block.refinedstorage.destructor": "Destruktor", + "block.refinedstorage.wireless_transmitter": "Funksender", + "block.refinedstorage.storage_monitor": "Speichermonitor", + "block.refinedstorage.network_receiver": "Netzwerkempfänger", + "block.refinedstorage.network_transmitter": "Netzwerksender", + "block.refinedstorage.portable_grid": "Mobile Konsole", + "block.refinedstorage.creative_portable_grid": "Mobile Kreative Konsole", + "block.refinedstorage.security_manager": "Sicherheits-Manager", + "block.refinedstorage.security_manager.help": "Während aktivem Betrieb ist das Netzwerk geschützt und es werden alle Zugriffe blockiert. Füge Sicherheits-Karten hinzu, um spezifische Zugriffe für Spieler zuzulassen.", + "block.refinedstorage.relay": "Relais", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "Falls dieses Gerät inaktiv ist, kann das Speichernetzwerk dieses Gerät nicht als Energiequelle nutzen.", + "gui.refinedstorage.disk_drive.disks": "Speicherplatten", + "gui.refinedstorage.storage.redstone_mode_help": "Falls dieses Gerät inaktiv ist, ist der enthaltene Speicher nicht mehr über das Speichernetzwerk zugänglich.", + "gui.refinedstorage.storage.filter_help": "Die Ressourcen, die in diesem Speicher erlaubt sind oder nicht, je nachdem, ob sich das Gerät in der Erlaubnisliste oder in der Sperrliste befindet.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Ohne konfigurierte Filter werden keine Ressourcen in diesem Speicher akzeptiert.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Erlaube nur Ressourcen in diesen Speicher, die in den Filtern konfiguriert sind.", + "gui.refinedstorage.storage.filter_mode.block.help": "Erlaube nur Ressourcen in diesen Speicher, die in den Filtern konfiguriert sind.", + "gui.refinedstorage.grid.sorting.direction": "Sortierrichtung", + "gui.refinedstorage.grid.sorting.direction.ascending": "Aufsteigend", + "gui.refinedstorage.grid.sorting.direction.descending": "Absteigend", + "gui.refinedstorage.grid.sorting.type": "Sortierart", + "gui.refinedstorage.grid.sorting.type.quantity": "Quantität", + "gui.refinedstorage.grid.sorting.type.name": "Name", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Zuletzt geändert", + "gui.refinedstorage.grid.auto_selected": "Automatisch ausgewählt", + "gui.refinedstorage.grid.auto_selected.help": "Gibt an, ob das Suchfeld beim Öffnen der Konsole automatisch ausgewählt werden soll.", + "gui.refinedstorage.grid.synchronizer": "Synchronisierungsmodus", + "gui.refinedstorage.grid.synchronizer.off": "Aus", + "gui.refinedstorage.grid.synchronizer.off.help": "Suchfeldtext nicht synchronisieren.", + "gui.refinedstorage.grid.resource_type": "Ressourcentyp", + "gui.refinedstorage.grid.resource_type.all": "Alle", + "gui.refinedstorage.grid.resource_type.help": "Spezifische Ressourcentypen filtern.", + "gui.refinedstorage.crafting_grid.move.network": "Items ins Netzwerk verschieben", + "gui.refinedstorage.crafting_grid.move.inventory": "Items ins Inventar verschieben", + "gui.refinedstorage.screen_size": "Bildschirmgröße", + "gui.refinedstorage.screen_size.stretch": "Strecken", + "gui.refinedstorage.screen_size.small": "Klein", + "gui.refinedstorage.screen_size.medium": "Normal", + "gui.refinedstorage.screen_size.large": "Groß", + "gui.refinedstorage.screen_size.extra_large": "Sehr groß", + "gui.refinedstorage.detector.mode": "Modus", + "gui.refinedstorage.detector.mode.under": "Redstone-Signal ausgeben, falls unter der Menge", + "gui.refinedstorage.detector.mode.equal": "Redstone-Signal ausgeben, falls auf der Menge", + "gui.refinedstorage.detector.mode.above": "Redstone-Signal ausgeben, falls über der Menge", + "gui.refinedstorage.detector.filter_help": "Die Ressource, die im Speichernetzwerk erkannt werden sollte.", + "gui.refinedstorage.destructor.pickup_items": "Items aufheben, statt abzubauen", + "gui.refinedstorage.destructor.filter_help": "Die Blöcke, die in diesem Speicher zerstört werden sollen oder nicht, je nachdem, ob sich das Gerät in der Erlaubnisliste oder in der Sperrliste befindet.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Erlaube nur Blöcke in das Speichernetzwerk, die in den Filtern konfiguriert sind.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Erlaube keine Blöcke in das Speichernetzwerk, die in den Filtern konfiguriert sind.", + "gui.refinedstorage.constructor.drop_items": "Items fallenlassen, anstatt Blöcke zu platzieren", + "gui.refinedstorage.constructor.filter_help": "Die Ressourcen, die ins Speichernetzwerk platziert werden sollen.", + "gui.refinedstorage.interface.filter_help": "Die Ressourcen, die ins Speichernetzwerk exportiert werden sollen.", + "gui.refinedstorage.exporter.filter_help": "Die Ressourcen, die vom Speichernetzwerk exportiert werden sollen.", + "gui.refinedstorage.importer.filter_help": "Die Ressourcen, die aus dem Zielinventar importiert werden können.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Erlaube nur Ressourcen in das Speichernetzwerk, die in den Filtern konfiguriert sind.", + "gui.refinedstorage.importer.filter_mode.block.help": "Erlaube keine Ressourcen in das Speichernetzwerk, die in den Filtern konfiguriert sind.", + "gui.refinedstorage.wireless_transmitter.distance": "%d Block(s)", + "gui.refinedstorage.storage_monitor.filter_help": "Die anzuzeigende Ressource.", + "gui.refinedstorage.redstone_mode": "Redstone-Modus", + "gui.refinedstorage.redstone_mode.ignore": "Ignorieren", + "gui.refinedstorage.redstone_mode.ignore.help": "Dieses Gerät ist immer aktiv, unabhängig von Redstone-Signal.", + "gui.refinedstorage.redstone_mode.high": "Hoch", + "gui.refinedstorage.redstone_mode.high.help": "Dieses Gerät ist nur mit einem Redstone-Signal aktiv.", + "gui.refinedstorage.redstone_mode.low": "Niedrig", + "gui.refinedstorage.redstone_mode.low.help": "Dieses Gerät ist nur ohne Redstone-Signal aktiv.", + "gui.refinedstorage.scheduling_mode": "Planungsmodus", + "gui.refinedstorage.scheduling_mode.default": "Standard", + "gui.refinedstorage.scheduling_mode.default.help": "Den ersten verfügbaren Filter verwenden.", + "gui.refinedstorage.scheduling_mode.round_robin": "Rundlaufverfahren", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Verwenden Sie jeden Filter nacheinander.", + "gui.refinedstorage.scheduling_mode.random": "Zufällig", + "gui.refinedstorage.scheduling_mode.random.help": "Benutze einen zufälligen Filter.", + "gui.refinedstorage.priority": "Priorität", + "gui.refinedstorage.priority.storage_help": "Die Reihenfolge, in der das Speichernetzwerk Ressourcen einfügen oder extrahieren soll, das höchste zuerst.", + "gui.refinedstorage.amount": "Anzahl", + "gui.refinedstorage.amount.reset": "Zurücksetzen", + "gui.refinedstorage.amount.set": "Setzen", + "gui.refinedstorage.filter_mode": "Filtermodus", + "gui.refinedstorage.filter_mode.allow": "Erlaubnisliste", + "gui.refinedstorage.filter_mode.block": "Sperrliste", + "gui.refinedstorage.fuzzy_mode": "Unscharfer Modus", + "gui.refinedstorage.fuzzy_mode.on": "An", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Passen Sie die Filter exakt auf die Erlaubnis- oder Sperrliste an.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Passen Sie den Filter exakt an.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Passen Sie die Filter beim Extrahieren aus dem Speichernetzwerk genau an.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Passen Sie die Filter beim Extrahieren aus der Quelle genau an.", + "gui.refinedstorage.fuzzy_mode.off": "Aus", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Passen Sie die Filter für die Erlaubnisliste oder die Sperrliste an, ohne NBT-Tags zu vergleichen.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Passen Sie den Filter an, ohne NBT-Tags zu vergleichen.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Passen Sie die Filter beim Extrahieren aus dem Speichernetzwerk an, ohne NBT-Tags zu vergleichen.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Passen Sie die Filter an, wenn Sie aus der Quelle extrahieren, ohne NBT-Tags zu vergleichen.", + "gui.refinedstorage.access_mode": "Zugriffsmodus", + "gui.refinedstorage.access_mode.insert_extract": "Importieren und exportieren", + "gui.refinedstorage.access_mode.insert_extract.help": "Das Speichernetzwerk kann von diesem Speicher importieren oder exportieren.", + "gui.refinedstorage.access_mode.insert": "Nur importieren", + "gui.refinedstorage.access_mode.insert.help": "Das Speichernetzwerk kann nur in diesen Speicher importieren. Enthaltene Ressourcen werden weiterhin in der Konsole sichtbar sein.", + "gui.refinedstorage.access_mode.extract": "Nur exportieren", + "gui.refinedstorage.access_mode.extract.help": "Das Speichernetzwerk kann nur von diesem Speicher extrahieren.", + "gui.refinedstorage.void_excess": "Überschüssige Ressourcen löschen", + "gui.refinedstorage.void_excess.help": "Wenn der überschüssige Modus eingeschaltet ist und die Speicherung voll ist, akzeptiert er weiterhin Ressourcen, löscht sie jedoch.", + "gui.refinedstorage.void_excess.allowlist_warning": "Der überschüssige Modus funktioniert nur, wenn der Speicher im Erlaubnisliste Modus ist.", + "gui.refinedstorage.upgrade_slot": "Leerer Upgrade-Slot", + "gui.refinedstorage.filter_slot.empty_filter": "Leerer Filter", + "gui.refinedstorage.filter_slot.left_click_for": "Linksklick für", + "gui.refinedstorage.filter_slot.right_click_for": "Rechtsklick für", + "gui.refinedstorage.filter_slot.click_to_clear": "Klicke zum Löschen", + "gui.refinedstorage.regulator_upgrade.filter_help": "Die Ressource, die im Ziel reguliert werden sollte.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inaktiv", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Fehlende Netzwerkkarte", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d Block(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unerreichbar", + "gui.refinedstorage.security_card.permission.reset": "Zurücksetzen", + "gui.refinedstorage.security_card.permission.modified": "Modifiziert", + "gui.refinedstorage.security_manager.redstone_mode_help": "Wenn dieses Gerät inaktiv ist, wird das Netzwerk nicht geschützt.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot für eine Standard-Sicherheitskarte.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Fügen Sie diesem Slot eine Standard-Sicherheitskarte hinzu, um Berechtigungen für jeden Spieler ohne Sicherheitskarte festzulegen. Standardmäßig werden alle Aktionen verweigert.", + "gui.refinedstorage.relay.filter_help": "Ressourcen, die vom Eingabenetzwerk dem Ausgabenetz ausgesetzt werden sollen, wenn das Relais nicht im Durchlaufmodus ist.", + "gui.refinedstorage.relay.pass_through": "Durchlaufen", + "gui.refinedstorage.relay.pass_through.help": "Ob dieses Gerät das gesamte Eingangsnetzsignal so durchlaufen soll, wie es ist. Schalten Sie dies aus, um Komponenten selektiv dem Ausgangsnetz anzuzeigen.", + "gui.refinedstorage.relay.pass_energy": "Energie weitergeben", + "gui.refinedstorage.relay.pass_energy.help": "Gibt an, ob dieses Gerät den Energiepuffer vom Eingangsnetz an das Ausgangsnetz übergeben soll.", + "gui.refinedstorage.relay.pass_storage": "Speicher weitergeben", + "gui.refinedstorage.relay.pass_storage.help": "Gibt an, ob dieses Gerät den Speicher aus dem Eingangsnetzwerk an das Ausgangsnetz übergeben soll.", + "gui.refinedstorage.relay.pass_security": "Sicherheit weitergeben", + "gui.refinedstorage.relay.pass_security.help": "Gibt an, ob dieses Gerät die Sicherheitseinstellungen vom Eingangsnetzwerk an das Ausgangsnetz übergeben soll.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Stellen Sie nur Ressourcen aus dem Eingabenetzwerk dem Ausgabenetzwerk aus, die in den Filtern konfiguriert sind.", + "gui.refinedstorage.relay.filter_mode.block.help": "Stellen Sie keine Ressourcen aus dem Eingabenetzwerk dem Ausgabenetzwerk aus, die in den Filtern konfiguriert sind.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Stellt das Speichernetzwerk mit Energie zur Verfügung. Mehrere sind in einem einzigen Speichernetzwerk erlaubt.", + "item.refinedstorage.creative_controller.help": "Stellt dem Speichernetzwerk eine unendliche Energiequelle zur Verfügung.", + "item.refinedstorage.disk_drive.help": "Akzeptiert Speicherplatten, um dem Speichernetz Speicherplatz zur Verfügung zu stellen.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Ermöglicht die Interaktion mit dem Speichernetzwerk.", + "item.refinedstorage.crafting_grid.help": "Ermöglicht die Interaktion mit dem Speichernetzwerk, mit Herstellungsfähigkeiten.", + "item.refinedstorage.importer.help": "Importiert Ressourcen von einer externen Quelle in das Speichernetzwerk.", + "item.refinedstorage.exporter.help": "Exportiert Ressourcen aus dem Speichernetzwerk an ein externes Ziel.", + "item.refinedstorage.interface.help": "Funktioniert als die Kombination von Importierer und Exportierer.", + "item.refinedstorage.external_storage.help": "Stellt dem Speichernetzwerk Speicher von einer externen Quelle zur Verfügung.", + "item.refinedstorage.detector.help": "Sendet ein Redstone Signal, wenn das Speichernetzwerk eine Ressource enthält, die gleich über oder unter einer bestimmten Menge ist.", + "item.refinedstorage.constructor.help": "Platziert Blöcke aus dem Speichernetzwerk in der Welt.", + "item.refinedstorage.destructor.help": "Zerstört Blöcke aus der Welt und setzt sie in das Speichernetzwerk.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Quarz angereichertes Eisen", + "item.refinedstorage.processor_binding": "Prozessor Rohmaterial", + "item.refinedstorage.silicon": "Silikon", + "item.refinedstorage.raw_basic_processor": "Basisrohprozessor", + "item.refinedstorage.raw_improved_processor": "Verbesserter Rohprozessor", + "item.refinedstorage.raw_advanced_processor": "Fortschrittlicher Rohprozessor", + "item.refinedstorage.basic_processor": "Basisprozessor", + "item.refinedstorage.improved_processor": "Verbesserter Prozessor", + "item.refinedstorage.advanced_processor": "Fortschrittlicher Prozessor", + "item.refinedstorage.1k_storage_part": "1k Speicherkern", + "item.refinedstorage.4k_storage_part": "4k Speicherkern", + "item.refinedstorage.16k_storage_part": "16k Speicherkern", + "item.refinedstorage.64k_storage_part": "64k Speicherkern", + "item.refinedstorage.1k_storage_disk": "1k Speicherplatte", + "item.refinedstorage.4k_storage_disk": "4k Speicherplatte", + "item.refinedstorage.16k_storage_disk": "16k Speicherplatte", + "item.refinedstorage.64k_storage_disk": "64k Speicherplatte", + "item.refinedstorage.creative_storage_disk": "Kreative Speicherplatte", + "item.refinedstorage.64b_fluid_storage_part": "64B Flüssigspeicherkern", + "item.refinedstorage.256b_fluid_storage_part": "256B Flüssigspeicherkern", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Flüssigspeicherkern", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Flüssigspeicherkern", + "item.refinedstorage.64b_fluid_storage_disk": "64B Flüssigspeicherplatte", + "item.refinedstorage.256b_fluid_storage_disk": "256B Flüssigspeicherplatte", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Flüssigspeicherplatte", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Flüssigspeicherplatte", + "item.refinedstorage.creative_fluid_storage_disk": "Kreative Flüssigspeicherplatte", + "item.refinedstorage.storage_housing": "Speichergehäuse", + "item.refinedstorage.construction_core": "Konstruktionskern", + "item.refinedstorage.destruction_core": "Zerstörungskern", + "item.refinedstorage.wrench": "Schraubenschlüssel", + "item.refinedstorage.wrench.helper": "Verwende es, um Blöcke zu drehen oder drücke SHIFT und baue Refined Storage Blöcke ab.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Geschwindigkeitsupgrade", + "item.refinedstorage.stack_upgrade": "Stapelupgrade", + "item.refinedstorage.silk_touch_upgrade": "Behutsamkeitsupgrade", + "item.refinedstorage.fortune_upgrade.1": "Glück I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Glück II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Glück III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In einem Exportierer wird nur dann exportiert, wenn der Betrag im Ziel geringer als im Upgrade konfiguriert ist. In einem Importierer wird nur importiert, wenn der Betrag im Ziel mehr als im Upgrade konfiguriert ist. Benutzen Sie das Item zur Konfiguration.", + "item.refinedstorage.range_upgrade": "Reichweitenupgrade", + "item.refinedstorage.creative_range_upgrade": "Kreativer Reichweitenupgrade", + "item.refinedstorage.wireless_grid": "Drahtlose Konsole", + "item.refinedstorage.creative_wireless_grid": "Kreative drahtlose Konsole", + "item.refinedstorage.wireless_transmitter.help": "Stellt drahtlosen Netzwerkzugang für Items wie die drahtlose Konsole zur Verfügung. Mehrere sind in einem Bereich für eine breitere Abdeckung erlaubt.", + "item.refinedstorage.network_item.unbound": "Ungebunden.", + "item.refinedstorage.network_item.unbound.help": "Auf irgendeinem Speichernetzwerk verwenden, um es zu verbinden.", + "item.refinedstorage.network_item.bound_to": "Verbunden zu %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "Es gibt mehr als ein %s in deinem Inventar.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "Es gibt keine %s in deinem Inventar.", + "item.refinedstorage.configuration_card": "Konfigurationskarte", + "item.refinedstorage.configuration_card.empty": "Leer.", + "item.refinedstorage.configuration_card.configured": "Enthält Konfiguration für %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Konfiguration für %s kopiert.", + "item.refinedstorage.configuration_card.cleared_configuration": "Konfiguration geleert.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Konfigurationskarte kann nicht auf andere Gerätetypen angewendet werden. Sie ist für %s konfiguriert.", + "item.refinedstorage.configuration_card.applied_configuration": "Konfiguration angewandt.", + "item.refinedstorage.configuration_card.empty_help": "Benutzen auf einem Speichernetzwerkgerät während Sie schleichen um die Konfigurationen und Upgrades auf die Karte zu kopieren.", + "item.refinedstorage.configuration_card.configured_help": "Benutzen auf dem Ziel Speichernetzwerk während Sie Schleichen um die Konfigurationen und Upgrades zu übertragen. Zum Leeren beim Schleichen verwenden.", + "item.refinedstorage.network_card": "Netzwerkkarte", + "item.refinedstorage.network_card.unbound_help": "Verwende beim Schleichen auf einem Netzwerk-Empfänger.", + "item.refinedstorage.network_card.unbound": "Ungebunden.", + "item.refinedstorage.network_card.bound_help": "Einfügen in einen Netzwerksender. Benutzen beim Schleichen um die Verbindung zu löschen.", + "item.refinedstorage.network_card.bound": "Verbunden zu %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Sicherheitskarte", + "item.refinedstorage.security_card.cleared_configuration": "Konfiguration gelöscht.", + "item.refinedstorage.security_card.unbound": "Nicht zugewiesen.", + "item.refinedstorage.security_card.unbound.help": "Rechtsklick zum Konfigurieren und Zuweisen an den aktuellen Spieler.", + "item.refinedstorage.security_card.bound": "Zugewiesen an %s.", + "item.refinedstorage.security_card.bound.help": "Rechtsklick zum Konfigurieren. Benutze während Schleichen, um die Konfiguration und Zuweisung zu löschen.", + "item.refinedstorage.fallback_security_card": "Standard-Sicherheitskarte", + "item.refinedstorage.fallback_security_card.help": "Funktioniert als Standard, wenn keine passende Sicherheitskarte für einen Spieler gefunden wurde. Rechtsklick zum Konfigurieren. Benutze während Schleichen, um die Konfiguration zu löschen.", + "misc.refinedstorage.stored": "Gespeichert: %s", + "misc.refinedstorage.stored_with_capacity": "Gespeichert: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d Gesamt", + "misc.refinedstorage.last_modified.just_now": "Zuletzt geändert von %s", + "misc.refinedstorage.last_modified.second": "Zuletzt vor %d Sekunde von %s geändert", + "misc.refinedstorage.last_modified.seconds": "Zuletzt vor %d Sekunden von %s geändert", + "misc.refinedstorage.last_modified.minute": "Zuletzt vor %d Minute von %s geändert", + "misc.refinedstorage.last_modified.minutes": "Zuletzt vor %d Minuten von %s geändert", + "misc.refinedstorage.last_modified.hour": "Zuletzt vor %d Stunde von %s geändert", + "misc.refinedstorage.last_modified.hours": "Zuletzt vor %d Stunden von %s geändert", + "misc.refinedstorage.last_modified.day": "Zuletzt vor %d Tag von %s geändert", + "misc.refinedstorage.last_modified.days": "Zuletzt vor %d Tagen von %s geändert", + "misc.refinedstorage.last_modified.week": "Zuletzt vor %d Woche von %s geändert", + "misc.refinedstorage.last_modified.weeks": "Zuletzt vor %d Wochen von %s geändert", + "misc.refinedstorage.last_modified.year": "Zuletzt vor %d Jahr von %s geändert", + "misc.refinedstorage.last_modified.years": "Zuletzt vor %d Jahren von %s geändert", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Flüssigkeit", + "misc.refinedstorage.press_shift_for_help": "Drücke SHIFT für Hilfe", + "misc.refinedstorage.no_permission": "Kein Zugriff", + "misc.refinedstorage.no_permission.open": "Sie sind nicht berechtigt, die %s zu öffnen.", + "misc.refinedstorage.no_permission.insert": "Sie haben keine Berechtigung zum Einfügen.", + "misc.refinedstorage.no_permission.extract": "Sie haben keine Berechtigung zum Extrahieren.", + "misc.refinedstorage.no_permission.build.place": "Sie sind nicht berechtigt, hier %s zu platzieren.", + "misc.refinedstorage.no_permission.build.break": "Du hast keine Berechtigung die %s zu brechen.", + "misc.refinedstorage.no_permission.build.rotate": "Sie haben keine Berechtigung die %s zu drehen.", + "misc.refinedstorage.no_permission.build.dismantle": "Sie haben keine Berechtigung die %s abzubauen.", + "key.refinedstorage.focus_search_bar": "Suchleiste Selektieren", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Werkbank in der Konsole zum Netzwerk leeren", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Werkbank in der Konsole zum Inventar leeren", + "key.refinedstorage.open_wireless_grid": "Drahtlose Konsole öffnen", + "refinedstorage.subtitle.wrench": "Schraubenschlüssel benutzt", + "permission.refinedstorage.insert": "Einfügen", + "permission.refinedstorage.insert.description": "Gibt an, ob der Spieler Ressourcen in ein Netzwerk einfügen kann.", + "permission.refinedstorage.extract": "Extrahieren", + "permission.refinedstorage.extract.description": "Gibt an, ob der Spieler Ressourcen aus einem Netzwerk extrahieren kann.", + "permission.refinedstorage.autocrafting": "Automatisches Herstellen", + "permission.refinedstorage.autocrafting.description": "Ob der Spieler einen Herstellungsauftrag starten, abbrechen oder sehen kann.", + "permission.refinedstorage.open": "Öffnen", + "permission.refinedstorage.open.description": "Gibt an, ob der Player GUIs des Netzwerkgeräts öffnen kann.", + "permission.refinedstorage.build": "Bauen", + "permission.refinedstorage.build.description": "Gibt an, ob der Player Netzwerkgeräte hinzufügen oder entfernen kann.", + "permission.refinedstorage.security": "Sicherheit", + "permission.refinedstorage.security.description": "Ob der Spieler die Sicherheitsoptionen für ein Netzwerk verwalten kann.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Flüssiges Scrollen", + "text.autoconfig.refinedstorage.option.screenSize": "Bildschirmgröße", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximale Anzahl von Zeilen, wenn Bildschirmgröße gestreckt ist", + "text.autoconfig.refinedstorage.option.grid": "Konsole", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Große Schriftart", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Sortierung verhindern während SHIFT gedrückt ist", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detaillierte Kurzinfo", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Suchabfrage merken", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Autoselektieres Suchfeld", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronisator", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Ressourcentyp", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sortierrichtung", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sortierart", + "text.autoconfig.refinedstorage.option.craftingGrid": "Herstellungskonsole", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Werkbank Schließverhalten", + "text.autoconfig.refinedstorage.option.controller": "Kontrollblock", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energiekapazität", + "text.autoconfig.refinedstorage.option.cable": "Kabel", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.diskDrive": "Laufwerk", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energieverbrauch pro Festplatte", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Speicherblock", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1k Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4k Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16k Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64k Energieverbrauch", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Kreativer Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Flüssigspeicherblock", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B Energieverbrauch", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Kreativer Energieverbrauch", + "text.autoconfig.refinedstorage.option.importer": "Importierer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.exporter": "Exportierer", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.detector": "Detektor", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.constructor": "Konstruktor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.destructor": "Destruktor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Energieverbrauch von Geschwindigkeitsupgrade", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Energieverbrauch vom Stapelupgrade", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Energieverbrauch vom Glück 1 Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Energieverbrauch vom Glück 2 Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Energieverbrauch vom Glück 3 Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Energieverbrauch vom Behutsamkeitsupgrade", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Energieverbrauch vom Regulator Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Energieverbrauch vom Reichweitenupgrade", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Energieverbrauch vom Kreativen Reichweitenupgrade", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Reichweite vom Reichweitenupgrade", + "text.autoconfig.refinedstorage.option.iface": "Schnittstelle", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.externalStorage": "Externer Speicher", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Drahtlose Konsole", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energiekapazität", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Energieverbrauch beim Öffnen", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Energieverbrauch beim Importieren", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Energieverbrauch beim Exportieren", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Funksender", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Basisreichweite", + "text.autoconfig.refinedstorage.option.storageMonitor": "Speichermonitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.networkReceiver": "Netzwerkempfänger", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Netzwerksender", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.portableGrid": "Mobile Konsole", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energiekapazität", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Energieverbrauch beim Öffnen", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Energieverbrauch beim Importieren", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Energieverbrauch beim Exportieren", + "text.autoconfig.refinedstorage.option.securityCard": "Sicherheitskarte", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Standard-Sicherheitskarte", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.securityManager": "Sicherheits-Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energieverbrauch", + "text.autoconfig.refinedstorage.option.relay": "Relais", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Eingabenetzwerk Energienutzung", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Ausgangsnetzwerk Energieverbrauch (wenn nicht im Durchlauf-Modus)", + "advancements.refinedstorage.root.description": "Nutzen Sie einen oder mehrere Kontrollblöcke in einem Speichernetzwerk, um das Netzwerk mit Energie zu versorgen", + "advancements.refinedstorage.connecting": "Verbinden", + "advancements.refinedstorage.connecting.description": "Benutze Kabel um Geräte miteinander zu verbinden, oder platziere Geräte nebeneinander", + "advancements.refinedstorage.drives": "Festplatten", + "advancements.refinedstorage.drives.description": "Erstellen Sie ein Laufwerk, um Ihre Speicherplatten einsetzen zu können", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Items speichern", + "advancements.refinedstorage.storing_items.description": "Erstelle eine Speicherplatte und stecke sie in dein Laufwerk", + "advancements.refinedstorage.viewing_your_storage": "Ihren Speicher anzeigen", + "advancements.refinedstorage.viewing_your_storage.description": "Stelle eine Konsole her, um mit deinem Speicher zu interagieren", + "advancements.refinedstorage.upgrading_your_grid": "Konsole verbessern", + "advancements.refinedstorage.upgrading_your_grid.description": "Verbessere deine Konsole zu einem Handwerksraster, um eine Werkbank zu erhalten", + "advancements.refinedstorage.storing_fluids": "Flüssigkeiten speichern", + "advancements.refinedstorage.storing_fluids.description": "Erstelle eine Flüssigspeicherplatte und stecke sie in dein Laufwerk", + "advancements.refinedstorage.importing": "Importieren", + "advancements.refinedstorage.importing.description": "Holen Sie sich Ressourcen in das Speichernetzwerk mit einem Importierer", + "advancements.refinedstorage.exporting": "Exportieren", + "advancements.refinedstorage.exporting.description": "Holen Sie Ressourcen aus dem Speichernetzwerk mit einem Exportierer", + "advancements.refinedstorage.upgrading": "Verbessern", + "advancements.refinedstorage.upgrading.description": "Bau ein Upgrade um verschiedene Geräte zu verbessern", + "advancements.refinedstorage.interface_to_the_world": "Schnittstelle zur Welt", + "advancements.refinedstorage.interface_to_the_world.description": "Exportieren und Importieren von Items gleichzeitig mit einer Schnittstelle", + "advancements.refinedstorage.storing_externally": "Extern speichern", + "advancements.refinedstorage.storing_externally.description": "Verwenden Sie einen externen Speicher um dem Netzwerk Speicher von einem externen Block wie einer Truhe zur Verfügung zu stellen", + "advancements.refinedstorage.detecting": "Erkennung", + "advancements.refinedstorage.detecting.description": "Nutzen Sie Redstone um die, in einem Netzwerk gespeicherten, Ressourcen zu überprüfen", + "advancements.refinedstorage.construction": "Konstruktion", + "advancements.refinedstorage.construction.description": "Erhalte Blöcke aus dem Speichernetzwerk in die Welt mit einem Konstruktor", + "advancements.refinedstorage.destruction": "Zerstörung", + "advancements.refinedstorage.destruction.description": "Erhalte Blöcke aus der Welt in das Speichernetzwerk mit einem Destruktor", + "advancements.refinedstorage.wireless": "Drahtlos", + "advancements.refinedstorage.wireless.description": "Greifen Sie drahtlos auf Ihre Ressourcen mit einer drahtlosen Konsole zu", + "advancements.refinedstorage.better_than_a_barrel": "Besser als ein Fass", + "advancements.refinedstorage.better_than_a_barrel.description": "Stelle einen Speichermonitor her, um Ressourcen in einem Speichernetzwerk anzuzeigen, zu importieren oder zu exportieren", + "advancements.refinedstorage.no_cables_required": "Keine Kabel erforderlich", + "advancements.refinedstorage.no_cables_required.description": "Fügen Sie Ihrem Speichernetzwerk zusätzliche Komponenten hinzu, ohne Kabel zu verwenden, indem Sie einen Netzwerkübermittler, Netzwerkempfänger und Netzwerkkarte verwenden", + "advancements.refinedstorage.portable_storage": "Tragbarer Speicher", + "advancements.refinedstorage.portable_storage.description": "Erstelle eine mobile Konsole um auf den Inhalt von Speicherplatten zuzugreifen, ohne ein Speichernetzwerk zu benötigen", + "advancements.refinedstorage.security": "Sicherheit", + "advancements.refinedstorage.security.description": "Sichern Sie Ihr Speichernetzwerk mit einem Security-Manager und einer Sicherheitskarte", + "advancements.refinedstorage.conditional_connecting": "Bedingte Verbindung", + "advancements.refinedstorage.conditional_connecting.description": "Schalten Sie ganze Abschnitte eines Speichernetzwerks ein oder aus und erstellen Sie neue Zweige Ihres Netzwerks mit einem Relais" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json new file mode 100644 index 000000000..f08f87e3b --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/en_us.json @@ -0,0 +1,473 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Cable", + "block.refinedstorage.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", + "block.refinedstorage.quartz_enriched_copper_block": "Block of Quartz Enriched Copper", + "block.refinedstorage.disk_drive": "Disk Drive", + "block.refinedstorage.machine_casing": "Machine Casing", + "block.refinedstorage.grid": "Grid", + "block.refinedstorage.crafting_grid": "Crafting Grid", + "block.refinedstorage.controller": "Controller", + "block.refinedstorage.creative_controller": "Creative Controller", + "block.refinedstorage.1k_storage_block": "1K Storage Block", + "block.refinedstorage.4k_storage_block": "4K Storage Block", + "block.refinedstorage.16k_storage_block": "16K Storage Block", + "block.refinedstorage.64k_storage_block": "64K Storage Block", + "block.refinedstorage.creative_storage_block": "Creative Storage Block", + "block.refinedstorage.64b_fluid_storage_block": "64B Fluid Storage Block", + "block.refinedstorage.256b_fluid_storage_block": "256B Fluid Storage Block", + "block.refinedstorage.1024b_fluid_storage_block": "1024B Fluid Storage Block", + "block.refinedstorage.4096b_fluid_storage_block": "4096B Fluid Storage Block", + "block.refinedstorage.creative_fluid_storage_block": "Creative Fluid Storage Block", + "block.refinedstorage.importer": "Importer", + "block.refinedstorage.exporter": "Exporter", + "block.refinedstorage.interface": "Interface", + "block.refinedstorage.external_storage": "External Storage", + "block.refinedstorage.detector": "Detector", + "block.refinedstorage.constructor": "Constructor", + "block.refinedstorage.destructor": "Destructor", + "block.refinedstorage.wireless_transmitter": "Wireless Transmitter", + "block.refinedstorage.storage_monitor": "Storage Monitor", + "block.refinedstorage.network_receiver": "Network Receiver", + "block.refinedstorage.network_transmitter": "Network Transmitter", + "block.refinedstorage.portable_grid": "Portable Grid", + "block.refinedstorage.creative_portable_grid": "Creative Portable Grid", + "block.refinedstorage.security_manager": "Security Manager", + "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", + "gui.refinedstorage.disk_drive.disks": "Disks", + "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", + "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "Sorting direction", + "gui.refinedstorage.grid.sorting.direction.ascending": "Ascending", + "gui.refinedstorage.grid.sorting.direction.descending": "Descending", + "gui.refinedstorage.grid.sorting.type": "Sorting type", + "gui.refinedstorage.grid.sorting.type.quantity": "Quantity", + "gui.refinedstorage.grid.sorting.type.name": "Name", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Last modified", + "gui.refinedstorage.grid.auto_selected": "Auto-selected", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "Synchronization mode", + "gui.refinedstorage.grid.synchronizer.off": "Off", + "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", + "gui.refinedstorage.grid.resource_type": "Resource type", + "gui.refinedstorage.grid.resource_type.all": "All", + "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", + "gui.refinedstorage.crafting_grid.move.network": "Move items to network", + "gui.refinedstorage.crafting_grid.move.inventory": "Move items to inventory", + "gui.refinedstorage.screen_size": "Screen size", + "gui.refinedstorage.screen_size.stretch": "Stretch", + "gui.refinedstorage.screen_size.small": "Small", + "gui.refinedstorage.screen_size.medium": "Medium", + "gui.refinedstorage.screen_size.large": "Large", + "gui.refinedstorage.screen_size.extra_large": "Extra large", + "gui.refinedstorage.detector.mode": "Mode", + "gui.refinedstorage.detector.mode.under": "Emit redstone signal when under the amount", + "gui.refinedstorage.detector.mode.equal": "Emit redstone signal when on the amount", + "gui.refinedstorage.detector.mode.above": "Emit redstone signal when above the amount", + "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", + "gui.refinedstorage.destructor.pickup_items": "Pickup items instead of breaking", + "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "Drop items instead of placing blocks", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%d block(s)", + "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", + "gui.refinedstorage.redstone_mode": "Redstone mode", + "gui.refinedstorage.redstone_mode.ignore": "Ignore", + "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", + "gui.refinedstorage.redstone_mode.high": "High", + "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", + "gui.refinedstorage.redstone_mode.low": "Low", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Scheduling mode", + "gui.refinedstorage.scheduling_mode.default": "Default", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "Random", + "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", + "gui.refinedstorage.priority": "Priority", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Amount", + "gui.refinedstorage.amount.reset": "Reset", + "gui.refinedstorage.amount.set": "Set", + "gui.refinedstorage.filter_mode": "Filter mode", + "gui.refinedstorage.filter_mode.allow": "Allowlist", + "gui.refinedstorage.filter_mode.block": "Blocklist", + "gui.refinedstorage.fuzzy_mode": "Fuzzy mode", + "gui.refinedstorage.fuzzy_mode.on": "On", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Off", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Access mode", + "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Insert only", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Extract only", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Void excess resources", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d block(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unreachable", + "gui.refinedstorage.security_card.permission.reset": "Reset", + "gui.refinedstorage.security_card.permission.modified": "Modified", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.quartz_enriched_copper": "Quartz Enriched Copper", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicon", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", + "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", + "item.refinedstorage.basic_processor": "Basic Processor", + "item.refinedstorage.improved_processor": "Improved Processor", + "item.refinedstorage.advanced_processor": "Advanced Processor", + "item.refinedstorage.1k_storage_part": "1K Storage Part", + "item.refinedstorage.4k_storage_part": "4K Storage Part", + "item.refinedstorage.16k_storage_part": "16K Storage Part", + "item.refinedstorage.64k_storage_part": "64K Storage Part", + "item.refinedstorage.1k_storage_disk": "1K Storage Disk", + "item.refinedstorage.4k_storage_disk": "4K Storage Disk", + "item.refinedstorage.16k_storage_disk": "16K Storage Disk", + "item.refinedstorage.64k_storage_disk": "64K Storage Disk", + "item.refinedstorage.storage_disk.help": "Stores %s items.", + "item.refinedstorage.storage_block.help": "Stores %s items.", + "item.refinedstorage.creative_storage_disk": "Creative Storage Disk", + "item.refinedstorage.creative_storage_disk.help": "Stores an infinite amount of items.", + "item.refinedstorage.creative_storage_block.help": "Stores an infinite amount of items.", + "item.refinedstorage.64b_fluid_storage_part": "64B Fluid Storage Part", + "item.refinedstorage.256b_fluid_storage_part": "256B Fluid Storage Part", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", + "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", + "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage.fluid_storage_disk.help": "Stores %s buckets.", + "item.refinedstorage.fluid_storage_block.help": "Stores %s buckets.", + "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage.creative_fluid_storage_disk.help": "Stores an infinite amount of buckets.", + "item.refinedstorage.creative_fluid_storage_block.help": "Stores an infinite amount of buckets.", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Wrench", + "item.refinedstorage.wrench.help": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.speed_upgrade.help": "Increases the operation speed of a storage network device.", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.stack_upgrade.help": "Increases the amount of resources that the storage network device handles per operation.", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.silk_touch_upgrade.help": "Acts like the Silk Touch enchantment on a pickaxe.", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.fortune_upgrade.help": "Yields more resources when breaking a block. Acts like the Fortune enchantment on a pickaxe.", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.range_upgrade.help": "Increases the range of the Wireless Transmitter.", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.creative_range_upgrade.help": "Provides infinite range for the Wireless Transmitter. Does not work cross-dimensionally.", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.network_transmitter.help": "Transmits a network signal wirelessly. Needs a Network Card that is paired with a Network Receiver.", + "item.refinedstorage.network_receiver.help": "Receives a network signal wirelessly. Bind a Network Card to this block.", + "item.refinedstorage.cable.help": "Connects storage network devices with each other.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "item.refinedstorage.portable_grid.help": "Allows to interact with a storage disk while not being connected to a storage network. Can be used as a block in world, or from your inventory.", + "item.refinedstorage.storage_monitor.help": "A block that displays the current amount of a certain resource in your storage network. SHIFT + right click to configure. Left click to extract a stack, SHIFT + left click to extract a single resource, right click to insert a resource, right click multiple times to insert resources in bulk.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json new file mode 100644 index 000000000..58c6c8688 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/es_es.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Almacenamiento refinado", + "block.refinedstorage.cable": "Cable", + "block.refinedstorage.quartz_enriched_iron_block": "Bloque de Hierro Enriquecido", + "block.refinedstorage.disk_drive": "Unidad de Disco", + "block.refinedstorage.machine_casing": "Carcasa de la Máquina", + "block.refinedstorage.grid": "Rejilla", + "block.refinedstorage.crafting_grid": "Rejilla de Fabricación", + "block.refinedstorage.controller": "Controlador", + "block.refinedstorage.creative_controller": "Controlador Creativo", + "block.refinedstorage.1k_storage_block": "Bloque de almacenamiento de 1K", + "block.refinedstorage.4k_storage_block": "Bloque de almacenamiento de 4K", + "block.refinedstorage.16k_storage_block": "Bloque de almacenamiento de 16K", + "block.refinedstorage.64k_storage_block": "Bloque de almacenamiento de 64K", + "block.refinedstorage.creative_storage_block": "Bloque de almacenamiento creativo", + "block.refinedstorage.64b_fluid_storage_block": "Bloque de almacenamiento de fluidos de 64B", + "block.refinedstorage.256b_fluid_storage_block": "Bloque de almacenamiento de fluidos de 64B", + "block.refinedstorage.1024b_fluid_storage_block": "Bloque de almacenamiento de fluidos de 1024B", + "block.refinedstorage.4096b_fluid_storage_block": "Bloque de almacenamiento de fluidos de 4096B", + "block.refinedstorage.creative_fluid_storage_block": "Bloque de almacenamiento de fluidos creativo", + "block.refinedstorage.importer": "Importador", + "block.refinedstorage.exporter": "Exportador", + "block.refinedstorage.interface": "Interfaz", + "block.refinedstorage.external_storage": "Almacenamiento Externo", + "block.refinedstorage.detector": "Detector", + "block.refinedstorage.constructor": "Constructor", + "block.refinedstorage.destructor": "Destructor", + "block.refinedstorage.wireless_transmitter": "Transmisor Inalámbrico", + "block.refinedstorage.storage_monitor": "Monitor de Almacenamiento", + "block.refinedstorage.network_receiver": "Receptor de Red", + "block.refinedstorage.network_transmitter": "Transmisor de Red", + "block.refinedstorage.portable_grid": "Rejilla Portátil", + "block.refinedstorage.creative_portable_grid": "Rejilla Portátil Creativa", + "block.refinedstorage.security_manager": "Gestor de seguridad", + "block.refinedstorage.security_manager.help": "Cuando este dispositivo está activo, protegerá la red por defecto y bloqueará todas las operaciones. Empieza a añadir tarjetas de seguridad para permitir o denegar operaciones específicas para un jugador.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "Cuando este dispositivo está inactivo, la red de almacenamiento no podrá utilizar este dispositivo como fuente de energía.", + "gui.refinedstorage.disk_drive.disks": "Discos", + "gui.refinedstorage.storage.redstone_mode_help": "Cuando este dispositivo está inactivo, ya no se podrá acceder al almacenamiento contenido desde la red de almacenamiento.", + "gui.refinedstorage.storage.filter_help": "Los recursos que pueden o no ser permitidos en este almacenamiento, dependiendo de si el dispositivo está en la lista de permitidos o en el modo de lista de bloqueos.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Sin filtros configurados, no se aceptarán recursos en este almacenamiento.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Sólo permitir recursos en este almacenamiento que estén configurados en los filtros.", + "gui.refinedstorage.storage.filter_mode.block.help": "No permitir recursos en este almacenamiento que están configurados en los filtros.", + "gui.refinedstorage.grid.sorting.direction": "Dirección de ordenación", + "gui.refinedstorage.grid.sorting.direction.ascending": "Ascendente", + "gui.refinedstorage.grid.sorting.direction.descending": "Descendente", + "gui.refinedstorage.grid.sorting.type": "Tipo de ordenación", + "gui.refinedstorage.grid.sorting.type.quantity": "Cantidad", + "gui.refinedstorage.grid.sorting.type.name": "Nombre", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Última modificación", + "gui.refinedstorage.grid.auto_selected": "Auto-seleccionado", + "gui.refinedstorage.grid.auto_selected.help": "Si seleccionar automáticamente el cuadro de búsqueda al abrir el cuadrículo.", + "gui.refinedstorage.grid.synchronizer": "Modo de sincronización", + "gui.refinedstorage.grid.synchronizer.off": "Apagado", + "gui.refinedstorage.grid.synchronizer.off.help": "No sincronizar el texto del cuadro de búsqueda.", + "gui.refinedstorage.grid.resource_type": "Tipo de Recurso", + "gui.refinedstorage.grid.resource_type.all": "Todo", + "gui.refinedstorage.grid.resource_type.help": "Filtrar tipos de recurso específicos.", + "gui.refinedstorage.crafting_grid.move.network": "Mover objetos a la red", + "gui.refinedstorage.crafting_grid.move.inventory": "Mover objetos al inventario", + "gui.refinedstorage.screen_size": "Tamaño de pantalla", + "gui.refinedstorage.screen_size.stretch": "Estirar", + "gui.refinedstorage.screen_size.small": "Pequeño", + "gui.refinedstorage.screen_size.medium": "Mediano", + "gui.refinedstorage.screen_size.large": "Grande", + "gui.refinedstorage.screen_size.extra_large": "Muy grande", + "gui.refinedstorage.detector.mode": "Modo", + "gui.refinedstorage.detector.mode.under": "Emitir señal de redstone cuando esté por debajo de la cantidad", + "gui.refinedstorage.detector.mode.equal": "Emitir señal de redstone cuando esté en la cantidad", + "gui.refinedstorage.detector.mode.above": "Emitir señal de redstone cuando esté por encima de la cantidad", + "gui.refinedstorage.detector.filter_help": "El recurso que debería ser detectado en la red de almacenamiento.", + "gui.refinedstorage.destructor.pickup_items": "Recoger objetos en lugar de romperlos", + "gui.refinedstorage.destructor.filter_help": "Los bloques que pueden o no ser destruidos, dependiendo de si el dispositivo está en la lista de permitidos o en el modo de lista de bloqueos.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Solo permitir bloques en esta red de almacenamiento que estén configurados en los filtros.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "Soltar objetos en lugar de poner bloques", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%d bloque(s)", + "gui.refinedstorage.storage_monitor.filter_help": "El recurso a mostrar.", + "gui.refinedstorage.redstone_mode": "Modo Redstone", + "gui.refinedstorage.redstone_mode.ignore": "Ignorar", + "gui.refinedstorage.redstone_mode.ignore.help": "Este dispositivo siempre estará activo, independientemente de la señal de redstone.", + "gui.refinedstorage.redstone_mode.high": "Alto", + "gui.refinedstorage.redstone_mode.high.help": "Este dispositivo solo estará activo con una señal de redstone.", + "gui.refinedstorage.redstone_mode.low": "Bajo", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Modo programado", + "gui.refinedstorage.scheduling_mode.default": "Por defecto", + "gui.refinedstorage.scheduling_mode.default.help": "Usar el primer filtro disponible.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Usar cada filtro al girar.", + "gui.refinedstorage.scheduling_mode.random": "Aleatorio", + "gui.refinedstorage.scheduling_mode.random.help": "Usar un filtro aleatorio.", + "gui.refinedstorage.priority": "Prioridad", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Cantidad", + "gui.refinedstorage.amount.reset": "Reiniciar", + "gui.refinedstorage.amount.set": "Establecer", + "gui.refinedstorage.filter_mode": "Modo de filtro", + "gui.refinedstorage.filter_mode.allow": "Lista blanca", + "gui.refinedstorage.filter_mode.block": "Lista negra", + "gui.refinedstorage.fuzzy_mode": "Modo Fuzzy", + "gui.refinedstorage.fuzzy_mode.on": "Encendido", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Coincidir exactamente con el filtro.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Apagado", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Coincide los filtros al extraer de la red de almacenamiento sin comparar las etiquetas NBT.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Coincide los filtros al extraer de la fuente sin comparar las etiquetas NBT.", + "gui.refinedstorage.access_mode": "Modo de acceso", + "gui.refinedstorage.access_mode.insert_extract": "Insertar y extraer", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Solo Insertar", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Solo Extraer", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Eliminar recursos excedentes", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Ranura de mejora vacía", + "gui.refinedstorage.filter_slot.empty_filter": "Filtro vacío", + "gui.refinedstorage.filter_slot.left_click_for": "Clic izquierdo para", + "gui.refinedstorage.filter_slot.right_click_for": "Clic derecho para", + "gui.refinedstorage.filter_slot.click_to_clear": "Clic para limpiar", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Falta tarjeta de red", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d bloque(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Fuera del alcance", + "gui.refinedstorage.security_card.permission.reset": "Reiniciar", + "gui.refinedstorage.security_card.permission.modified": "Modificado", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exporta recursos de la red de almacenamiento a un destino externo.", + "item.refinedstorage.interface.help": "Actúa como la combinación de un importador y exportador.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Hierro enriquecido con cuarzo", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicio", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Procesador Mejorado Bruto", + "item.refinedstorage.raw_advanced_processor": "Procesador Avanzado Bruto", + "item.refinedstorage.basic_processor": "Procesador básico", + "item.refinedstorage.improved_processor": "Procesador Mejorado", + "item.refinedstorage.advanced_processor": "Procesador Avanzado", + "item.refinedstorage.1k_storage_part": "Parte de almacenamiento de 1K", + "item.refinedstorage.4k_storage_part": "Parte de almacenamiento de 4K", + "item.refinedstorage.16k_storage_part": "Parte de almacenamiento de 16K", + "item.refinedstorage.64k_storage_part": "Parte de almacenamiento de 64K", + "item.refinedstorage.1k_storage_disk": "Disco de almacenamiento de 1K", + "item.refinedstorage.4k_storage_disk": "Disco de almacenamiento de 4K", + "item.refinedstorage.16k_storage_disk": "Disco de almacenamiento de 16K", + "item.refinedstorage.64k_storage_disk": "Disco de almacenamiento de 64K", + "item.refinedstorage.creative_storage_disk": "Disco de almacenamiento creativo", + "item.refinedstorage.64b_fluid_storage_part": "Parte de almacenamiento de fluidos de 64B", + "item.refinedstorage.256b_fluid_storage_part": "Parte de almacenamiento de fluidos de 256B", + "item.refinedstorage.1024b_fluid_storage_part": "Parte de almacenamiento de fluidos de 1024B", + "item.refinedstorage.4096b_fluid_storage_part": "Parte de almacenamiento de fluidos de 4096B", + "item.refinedstorage.64b_fluid_storage_disk": "Disco de almacenamiento de fluidos de 64B", + "item.refinedstorage.256b_fluid_storage_disk": "Disco de almacenamiento de fluidos de 256B", + "item.refinedstorage.1024b_fluid_storage_disk": "Disco de almacenamiento de fluidos de 1024B", + "item.refinedstorage.4096b_fluid_storage_disk": "Disco de almacenamiento de fluidos de 4096B", + "item.refinedstorage.creative_fluid_storage_disk": "Disco de almacenamiento de fluidos creativo", + "item.refinedstorage.storage_housing": "Carcasa de almacenamiento", + "item.refinedstorage.construction_core": "Núcleo de construcción", + "item.refinedstorage.destruction_core": "Núcleo de destrucción", + "item.refinedstorage.wrench": "Llave inglesa", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Mejora", + "item.refinedstorage.speed_upgrade": "Mejora de Velocidad", + "item.refinedstorage.stack_upgrade": "Mejora de Stack", + "item.refinedstorage.silk_touch_upgrade": "Mejora de Toque de Seda", + "item.refinedstorage.fortune_upgrade.1": "Mejora de Fortuna I", + "item.refinedstorage.fortune_upgrade.2": "Mejora de Fortune II", + "item.refinedstorage.fortune_upgrade.3": "Mejora de Fortuna III", + "item.refinedstorage.regulator_upgrade": "Mejora de Regulador", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Mejora de rango", + "item.refinedstorage.creative_range_upgrade": "Mejora de Rango Creativo", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Desvincular.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Vinculado a %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Tarjeta de Configuración", + "item.refinedstorage.configuration_card.empty": "Vacío.", + "item.refinedstorage.configuration_card.configured": "Contiene configuración para %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Desvinculado.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Tarjeta de Seguridad", + "item.refinedstorage.security_card.cleared_configuration": "Configuración limpiada.", + "item.refinedstorage.security_card.unbound": "Desvinculado.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Vinculado a %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Almacenado: %s", + "misc.refinedstorage.stored_with_capacity": "Almacenado: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Última modificación ahora por %s", + "misc.refinedstorage.last_modified.second": "Última modificación hace %d segundo por %s", + "misc.refinedstorage.last_modified.seconds": "Última modificación hace %d segundos por %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Objeto", + "misc.refinedstorage.resource_type.fluid": "Fluido", + "misc.refinedstorage.press_shift_for_help": "Presiona SHIFT para ayuda", + "misc.refinedstorage.no_permission": "No tienes permisos", + "misc.refinedstorage.no_permission.open": "No tienes permiso para abrir el %s.", + "misc.refinedstorage.no_permission.insert": "No tienes permiso para insertar.", + "misc.refinedstorage.no_permission.extract": "No tienes permiso para extraer.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Enfocar la barra de búsqueda", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Llave Inglesa usada", + "permission.refinedstorage.insert": "Insertar", + "permission.refinedstorage.insert.description": "Si el jugador puede insertar recursos en una red.", + "permission.refinedstorage.extract": "Extraer", + "permission.refinedstorage.extract.description": "Si el jugador puede extraer recursos de una red.", + "permission.refinedstorage.autocrafting": "Autocrafteo", + "permission.refinedstorage.autocrafting.description": "Si el jugador puede comenzar, cancelar o ver una tarea de autocrafteo.", + "permission.refinedstorage.open": "Abrir", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Construir", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Seguridad", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Desplazamiento suave", + "text.autoconfig.refinedstorage.option.screenSize": "Tamaño de pantalla", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Fuente grande", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Evitar ordenar mientras SHIFT está presionado", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Descripción detallada", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Recordar búsqueda", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Tipo de Recurso", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Dirección de ordenación", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Tipo de ordenación", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.diskDrive": "Disco Duro", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Uso de energía por disco", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Bloque de almacenamiento", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K de consumo de energía", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K de consumo de energía", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K de consumo de energía", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K de consumo de energía", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Consumo de energía creativo", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importador", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.exporter": "Exportador", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.upgrade": "Mejora", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Rango de mejora de rango", + "text.autoconfig.refinedstorage.option.iface": "Interfaz", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.externalStorage": "Almacenamiento Externo", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Consumo de energía al extraer", + "text.autoconfig.refinedstorage.option.securityCard": "Tarjeta de Seguridad", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.securityManager": "Gestor de seguridad", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Uso de energía", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Utilice uno o varios controladores en una red de almacenamiento para proporcionar energía a su red", + "advancements.refinedstorage.connecting": "Conectando", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Dispositivos y unidades", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Almacenando fluidos", + "advancements.refinedstorage.storing_fluids.description": "Crea un disco de almacenamiento de fluidos y colócalo en tu unidad de discos", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Mejorando", + "advancements.refinedstorage.upgrading.description": "Crea una mejora para actualizar varios dispositivos", + "advancements.refinedstorage.interface_to_the_world": "Interfaz al mundo", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Almacenando externamente", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detectando", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construcción", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destrucción", + "advancements.refinedstorage.destruction.description": "Obtén bloques del mundo a la red mediante un Destructor", + "advancements.refinedstorage.wireless": "Comunicaciones Inalámbricas", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Mejor que un barril", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No se necesitan cables", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Almacenamiento portátil", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Seguridad", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json new file mode 100644 index 000000000..e36bace70 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/fr_fr.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Câble", + "block.refinedstorage.quartz_enriched_iron_block": "Bloc de Fer Enrichi en Quartz", + "block.refinedstorage.disk_drive": "Lecteur de Disque", + "block.refinedstorage.machine_casing": "Boitier de Machine", + "block.refinedstorage.grid": "Grille", + "block.refinedstorage.crafting_grid": "Grille d’Artisanat", + "block.refinedstorage.controller": "Contrôleur", + "block.refinedstorage.creative_controller": "Contrôleur créatif", + "block.refinedstorage.1k_storage_block": "Bloc de Stockage 1K", + "block.refinedstorage.4k_storage_block": "Bloc de Stockage 4k", + "block.refinedstorage.16k_storage_block": "Bloc de Stockage 16k", + "block.refinedstorage.64k_storage_block": "Bloc de Stockage 64k", + "block.refinedstorage.creative_storage_block": "Bloc de Stockage Créatif", + "block.refinedstorage.64b_fluid_storage_block": "Bloc de Stockage de Fluides 64B", + "block.refinedstorage.256b_fluid_storage_block": "Bloc de Stockage de Fluides 256B", + "block.refinedstorage.1024b_fluid_storage_block": "Bloc de Stockage de Fluides 1024B", + "block.refinedstorage.4096b_fluid_storage_block": "Bloc de Stockage de Fluides 4096B", + "block.refinedstorage.creative_fluid_storage_block": "Bloc de Stockage de Fluides Créatif", + "block.refinedstorage.importer": "Importateur", + "block.refinedstorage.exporter": "Exportateur", + "block.refinedstorage.interface": "Interface", + "block.refinedstorage.external_storage": "Stockage Externe", + "block.refinedstorage.detector": "Détecteur", + "block.refinedstorage.constructor": "Constructeur", + "block.refinedstorage.destructor": "Destructeur", + "block.refinedstorage.wireless_transmitter": "Transmetteur sans fil", + "block.refinedstorage.storage_monitor": "Moniteur de Stockage", + "block.refinedstorage.network_receiver": "Récepteur Réseau", + "block.refinedstorage.network_transmitter": "Transmetteur Réseau", + "block.refinedstorage.portable_grid": "Grille portable", + "block.refinedstorage.creative_portable_grid": "Grille portable créative", + "block.refinedstorage.security_manager": "Poste de sécurité", + "block.refinedstorage.security_manager.help": "Lorsque ce périphérique est actif, il protège le réseau par défaut et bloque toutes les opérations. Commencez à ajouter des Cartes de Sécurité pour permettre ou refuser des opérations spécifiques pour un joueur.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "Lorsque ce périphérique est inactif, le réseau de stockage ne peut pas utiliser ce périphérique comme source d'énergie.", + "gui.refinedstorage.disk_drive.disks": "Disques", + "gui.refinedstorage.storage.redstone_mode_help": "Lorsque ce périphérique est inactif, le stockage contenu ne sera plus accessible depuis le réseau de stockage.", + "gui.refinedstorage.storage.filter_help": "Les ressources qui sont autorisées ou refusées dans ce stockage, en fonction du mode de filtrage du périphérique.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Sans filtre configuré, aucune ressource ne sera accepté dans ce stockage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Autorise dans ce stockage uniquement les ressources configurées dans les filtres.", + "gui.refinedstorage.storage.filter_mode.block.help": "Interdis dans ce stockage les ressources configurées dans les filtres.", + "gui.refinedstorage.grid.sorting.direction": "Direction du tri", + "gui.refinedstorage.grid.sorting.direction.ascending": "Ascendant", + "gui.refinedstorage.grid.sorting.direction.descending": "Descendant", + "gui.refinedstorage.grid.sorting.type": "Type de tri", + "gui.refinedstorage.grid.sorting.type.quantity": "Quantité", + "gui.refinedstorage.grid.sorting.type.name": "Nom", + "gui.refinedstorage.grid.sorting.type.id": "Identifiant", + "gui.refinedstorage.grid.sorting.type.last_modified": "Dernière modification", + "gui.refinedstorage.grid.auto_selected": "Sélection automatique", + "gui.refinedstorage.grid.auto_selected.help": "Si la barre de recherche doit être sélectionnée automatique à l'ouverture de la grille.", + "gui.refinedstorage.grid.synchronizer": "Mode de synchronisation", + "gui.refinedstorage.grid.synchronizer.off": "Éteint", + "gui.refinedstorage.grid.synchronizer.off.help": "Ne pas synchroniser la recherche.", + "gui.refinedstorage.grid.resource_type": "Type de ressource", + "gui.refinedstorage.grid.resource_type.all": "Toutes", + "gui.refinedstorage.grid.resource_type.help": "Filtrer un type de ressources spécifique.", + "gui.refinedstorage.crafting_grid.move.network": "Déplacer les objets dans le réseau", + "gui.refinedstorage.crafting_grid.move.inventory": "Déplacer les objets dans l'inventaire", + "gui.refinedstorage.screen_size": "Taille de l'écran", + "gui.refinedstorage.screen_size.stretch": "Etiré", + "gui.refinedstorage.screen_size.small": "Petit", + "gui.refinedstorage.screen_size.medium": "Moyen", + "gui.refinedstorage.screen_size.large": "Grand", + "gui.refinedstorage.screen_size.extra_large": "Très grand", + "gui.refinedstorage.detector.mode": "Mode", + "gui.refinedstorage.detector.mode.under": "Émet un signal de redstone si la valeur est inférieure au seuil.", + "gui.refinedstorage.detector.mode.equal": "Émet un signal de redstone si la valeur est égale au seuil.", + "gui.refinedstorage.detector.mode.above": "Émet un signal de redstone si la valeur est supérieure au seuil.", + "gui.refinedstorage.detector.filter_help": "La ressource qui doit être détectée dans le réseau de stockage.", + "gui.refinedstorage.destructor.pickup_items": "Ramasser des objets au lieu de casser des blocs.", + "gui.refinedstorage.destructor.filter_help": "Les blocs qui seront détruits ou ignorés en fonction du mode de filtrage du périphérique.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Autorise dans le réseau de stockage uniquement les blocs configurés dans les filtres.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Interdit dans le réseau de stockage les blocs configurés dans les filtres.", + "gui.refinedstorage.constructor.drop_items": "Laisser tomber des objets au lieu de placer des blocs.", + "gui.refinedstorage.constructor.filter_help": "Les ressources qui doivent être placées depuis le réseau de stockage.", + "gui.refinedstorage.interface.filter_help": "Les ressources qui doivent être exportées depuis le réseau de stockage.", + "gui.refinedstorage.exporter.filter_help": "Les ressources qui doivent être exportées depuis le réseau de stockage.", + "gui.refinedstorage.importer.filter_help": "Les ressources qui doivent être importées depuis l'inventaire ciblé.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Autorise dans le réseau de stockage uniquement les ressources configurées dans les filtres.", + "gui.refinedstorage.importer.filter_mode.block.help": "Interdit dans le réseau de stockage les ressources configurées dans les filtres.", + "gui.refinedstorage.wireless_transmitter.distance": "%d bloc(s)", + "gui.refinedstorage.storage_monitor.filter_help": "La ressource à afficher.", + "gui.refinedstorage.redstone_mode": "Mode redstone", + "gui.refinedstorage.redstone_mode.ignore": "Ignoré", + "gui.refinedstorage.redstone_mode.ignore.help": "Ce périphérique sera toujours actif quel que soit le signal de redstone.", + "gui.refinedstorage.redstone_mode.high": "Allumé", + "gui.refinedstorage.redstone_mode.high.help": "Ce périphérique sera actif seulement s'il reçoit un signal de redstone.", + "gui.refinedstorage.redstone_mode.low": "Éteint", + "gui.refinedstorage.redstone_mode.low.help": "Ce périphérique sera actif seulement s'il ne reçoit pas de signal de redstone.", + "gui.refinedstorage.scheduling_mode": "Mode de distribution", + "gui.refinedstorage.scheduling_mode.default": "Par défaut", + "gui.refinedstorage.scheduling_mode.default.help": "Utilise le premier filtre disponible.", + "gui.refinedstorage.scheduling_mode.round_robin": "À tour de rôle", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Utiliser chaque filtre à tour de rôle.", + "gui.refinedstorage.scheduling_mode.random": "Aléatoire", + "gui.refinedstorage.scheduling_mode.random.help": "Utiliser un filtre aléatoire.", + "gui.refinedstorage.priority": "Priorité", + "gui.refinedstorage.priority.storage_help": "L'ordre dans lequel le réseau de stockage va insérer ou extraire les ressources, le plus élevé en premier.", + "gui.refinedstorage.amount": "Quantité", + "gui.refinedstorage.amount.reset": "Réinitialiser", + "gui.refinedstorage.amount.set": "Définir", + "gui.refinedstorage.filter_mode": "Mode de filtrage", + "gui.refinedstorage.filter_mode.allow": "Liste blanche", + "gui.refinedstorage.filter_mode.block": "Liste noire", + "gui.refinedstorage.fuzzy_mode": "Mode flou", + "gui.refinedstorage.fuzzy_mode.on": "Activé", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Désactivé", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Mode d'accès", + "gui.refinedstorage.access_mode.insert_extract": "Insertion et extraction", + "gui.refinedstorage.access_mode.insert_extract.help": "Le réseau de stockage pourra insérer et extraire depuis ce stockage.", + "gui.refinedstorage.access_mode.insert": "Insertion uniquement", + "gui.refinedstorage.access_mode.insert.help": "Le réseau de stockage ne pourra qu'insérer dans stockage. Les ressources seront tout de même visible dans une grille.", + "gui.refinedstorage.access_mode.extract": "Extraction uniquement", + "gui.refinedstorage.access_mode.extract.help": "Le réseau de stockage ne pourra qu'extraire depuis ce stockage.", + "gui.refinedstorage.void_excess": "Anéantir les ressources en excès", + "gui.refinedstorage.void_excess.help": "Quand le mode anéantir les ressources en excès est allumé et que le stockage est plein, il continuera d'accepter les ressources mais les détruira.", + "gui.refinedstorage.void_excess.allowlist_warning": "Le mode anéantir les ressources en excès ne fonction que lorsque le stockage est en mode liste blanche.", + "gui.refinedstorage.upgrade_slot": "Emplacement d'amélioration vide", + "gui.refinedstorage.filter_slot.empty_filter": "Filtre vide", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "La ressource qui doit être régulée dans la cible.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactif", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Carte réseau manquante", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d bloc(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Inaccessible", + "gui.refinedstorage.security_card.permission.reset": "Réinitialiser", + "gui.refinedstorage.security_card.permission.modified": "Modifiée", + "gui.refinedstorage.security_manager.redstone_mode_help": "Lorsque ce périphérique est inactif, le réseau ne sera pas protégé.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Emplacement pour une carte de sécurité de repli.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Ajoutez une Carte de sécurité de repli à cet emplacement pour définir les permissions de tous les joueurs sans Carte de sécurité. Par défaut, toutes les actions sont interdites.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Alimente le réseau de stockage en énergie. Plusieurs sont autorisés dans un seul réseau de stockage. ", + "item.refinedstorage.creative_controller.help": "Alimente le réseau de stockage avec une source d'énergie infinie. ", + "item.refinedstorage.disk_drive.help": "Accepte des disques de stockage pour fournir de l'espace de stockage au réseau.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Permet d'interagir avec le réseau de stockage.", + "item.refinedstorage.crafting_grid.help": "Permet d'interagir avec le réseau de stockage, avec les capacités d'artisanat.", + "item.refinedstorage.importer.help": "Importe des ressources depuis une source externe vers le réseau de stockage.", + "item.refinedstorage.exporter.help": "Exporte les ressources du réseau de stockage vers une destination externe.", + "item.refinedstorage.interface.help": "Agit comme la combinaison d'un importateur et d'un exportateur.", + "item.refinedstorage.external_storage.help": "Fournit au réseau de stockage accès à un inventaire externe.", + "item.refinedstorage.detector.help": "Émet un signal de redstone si le réseau de stockage contient une ressource en quantité égale, supérieure ou inférieure à un seuil donné.", + "item.refinedstorage.constructor.help": "Place des blocs du réseau de stockage dans le monde.", + "item.refinedstorage.destructor.help": "Détruit les blocs du monde et les met dans le réseau de stockage.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Fer enrichi en quartz", + "item.refinedstorage.processor_binding": "Liant pour processeur", + "item.refinedstorage.silicon": "Silicone", + "item.refinedstorage.raw_basic_processor": "Processeur basique brut", + "item.refinedstorage.raw_improved_processor": "Processeur amélioré brut", + "item.refinedstorage.raw_advanced_processor": "Processeur avancé brut", + "item.refinedstorage.basic_processor": "Processeur basique", + "item.refinedstorage.improved_processor": "Processeur amélioré", + "item.refinedstorage.advanced_processor": "Processeur avancé", + "item.refinedstorage.1k_storage_part": "Pièce de stockage 1k", + "item.refinedstorage.4k_storage_part": "Pièce de stockage 4k", + "item.refinedstorage.16k_storage_part": "Pièce de stockage 16k", + "item.refinedstorage.64k_storage_part": "Pièce de stockage 64k", + "item.refinedstorage.1k_storage_disk": "Disque de stockage 1k", + "item.refinedstorage.4k_storage_disk": "Disque de stockage 4k", + "item.refinedstorage.16k_storage_disk": "Disque de stockage 16k", + "item.refinedstorage.64k_storage_disk": "Disque de stockage 64k", + "item.refinedstorage.creative_storage_disk": "Disque de stockage créatif", + "item.refinedstorage.64b_fluid_storage_part": "Pièce de stockage de fluides 64B", + "item.refinedstorage.256b_fluid_storage_part": "Pièce de stockage de fluides 256B", + "item.refinedstorage.1024b_fluid_storage_part": "Pièce de stockage de fluides 1024B", + "item.refinedstorage.4096b_fluid_storage_part": "Pièce de stockage de fluides 4096B", + "item.refinedstorage.64b_fluid_storage_disk": "Disque de stockage de fluides 64B", + "item.refinedstorage.256b_fluid_storage_disk": "Disque de stockage de fluides 256B", + "item.refinedstorage.1024b_fluid_storage_disk": "Disque de stockage de fluides 1024B", + "item.refinedstorage.4096b_fluid_storage_disk": "Disque de stockage de fluides 4096B", + "item.refinedstorage.creative_fluid_storage_disk": "Disque de stockage de fluides créatif", + "item.refinedstorage.storage_housing": "Boitier de stockage", + "item.refinedstorage.construction_core": "Cœur de construction", + "item.refinedstorage.destruction_core": "Cœur de destruction", + "item.refinedstorage.wrench": "Clé", + "item.refinedstorage.wrench.helper": "Utilisez pour faire tourner un bloc, ou appuyez sur Maj et utilisez pour démonter les blocs de Refined Storage.", + "item.refinedstorage.upgrade": "Amélioration", + "item.refinedstorage.speed_upgrade": "Amélioration de vitesse", + "item.refinedstorage.stack_upgrade": "Amélioration de stack", + "item.refinedstorage.silk_touch_upgrade": "Amélioration de toucher de soie", + "item.refinedstorage.fortune_upgrade.1": "Amélioration de fortune I", + "item.refinedstorage.fortune_upgrade.2": "Amélioration de fortune II", + "item.refinedstorage.fortune_upgrade.3": "Amélioration de fortune III", + "item.refinedstorage.regulator_upgrade": "Amélioration de régulation", + "item.refinedstorage.regulator_upgrade.help": "Dans un Exportateur, n'exportera que si le montant dans la cible est inférieur à la valeur configurée dans l'amélioration. Dans un Importateur, n'importera que si le montant dans la cible est supérieur à la valeur configurée dans l'amélioration. Utilisez l'objet pour configurer.", + "item.refinedstorage.range_upgrade": "Amélioration de portée", + "item.refinedstorage.creative_range_upgrade": "Amélioration de portée créative", + "item.refinedstorage.wireless_grid": "Grille sans fil", + "item.refinedstorage.creative_wireless_grid": "Grille sans fil créative", + "item.refinedstorage.wireless_transmitter.help": "Fournit un accès au réseau sans fil pour des objets comme la grille sans fil. Plusieurs sont autorisés pour une couverture plus large.", + "item.refinedstorage.network_item.unbound": "Non liée.", + "item.refinedstorage.network_item.unbound.help": "Utiliser sur n'importe quel périphérique du réseau de stockage pour relier.", + "item.refinedstorage.network_item.bound_to": "Lié à %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "Il y a plusieurs %s dans votre inventaire.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "Il n'y a pas de %s dans votre inventaire.", + "item.refinedstorage.configuration_card": "Carte de configuration", + "item.refinedstorage.configuration_card.empty": "Vide.", + "item.refinedstorage.configuration_card.configured": "Contient une configuration pour %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Configuration copiée pour %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Configuration effacée.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Impossible d'appliquer la carte de configuration à un autre type de périphérique. Elle est configurée pour %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Configuration appliquée.", + "item.refinedstorage.configuration_card.empty_help": "Utiliser sur un périphérique réseau en étant accroupi pour sauvegarder sa configuration et ses améliorations dans la carte.", + "item.refinedstorage.configuration_card.configured_help": "Utiliser sur le périphérique de destination en étant accroupi pour transférer la configuration et les améliorations. Utiliser en étant accroupi pour effacer.", + "item.refinedstorage.network_card": "Carte réseau", + "item.refinedstorage.network_card.unbound_help": "Utilisez en étant accroupi sur un Récepteur réseau.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Stocké : %s", + "misc.refinedstorage.stored_with_capacity": "Stocké : %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Dernière modification à l'instant par %s", + "misc.refinedstorage.last_modified.second": "Dernière modification il y %d seconde par %s", + "misc.refinedstorage.last_modified.seconds": "Dernière modification il y %d secondes par %s", + "misc.refinedstorage.last_modified.minute": "Dernière modification il y %d minute par %s", + "misc.refinedstorage.last_modified.minutes": "Dernière modification il y %d minutes par %s", + "misc.refinedstorage.last_modified.hour": "Dernière modification il y %d heure par %s", + "misc.refinedstorage.last_modified.hours": "Dernière modification il y %d heures par %s", + "misc.refinedstorage.last_modified.day": "Dernière modification il y %d jour par %s", + "misc.refinedstorage.last_modified.days": "Dernière modification il y %d jours par %s", + "misc.refinedstorage.last_modified.week": "Dernière modification il y %d semaine par %s", + "misc.refinedstorage.last_modified.weeks": "Dernière modification il y %d semaines par %s", + "misc.refinedstorage.last_modified.year": "Dernière modification il y %d an par %s", + "misc.refinedstorage.last_modified.years": "Dernière modification il y %d ans par %s", + "misc.refinedstorage.resource_type.item": "Objet", + "misc.refinedstorage.resource_type.fluid": "Fluide", + "misc.refinedstorage.press_shift_for_help": "Appuyez sur Maj pour obtenir de l'aide", + "misc.refinedstorage.no_permission": "Permission manquante", + "misc.refinedstorage.no_permission.open": "Vous n'êtes pas autorisé à ouvrir %s.", + "misc.refinedstorage.no_permission.insert": "Vous n'êtes pas autorisé à insérer.", + "misc.refinedstorage.no_permission.extract": "Vous n'êtes pas autorisé à extraire.", + "misc.refinedstorage.no_permission.build.place": "Vous n'êtes pas autorisé à placer %s ici.", + "misc.refinedstorage.no_permission.build.break": "Vous n'êtes pas autorisé à casser %s.", + "misc.refinedstorage.no_permission.build.rotate": "Vous n'êtes pas autorisé à faire pivoter %s.", + "misc.refinedstorage.no_permission.build.dismantle": "Vous n'êtes pas autorisé à démonter %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Vider la matrice d'artisanat dans le réseau", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Vider la matrice d'artisanat dans l'inventaire", + "key.refinedstorage.open_wireless_grid": "Ouvrir la grille sans fil", + "refinedstorage.subtitle.wrench": "Clé utilisée", + "permission.refinedstorage.insert": "Insérer", + "permission.refinedstorage.insert.description": "Si le joueur peut insérer des ressources dans le réseau.", + "permission.refinedstorage.extract": "Extraire", + "permission.refinedstorage.extract.description": "Si le joueur peut extraire des ressources du réseau.", + "permission.refinedstorage.autocrafting": "Fabrication automatique", + "permission.refinedstorage.autocrafting.description": "Si le joueur peut démarrer, annuler ou afficher les tâches de fabrication automatique.", + "permission.refinedstorage.open": "Ouvrir", + "permission.refinedstorage.open.description": "Si le joueur peut ouvrir l'interface graphique des périphériques du réseau.", + "permission.refinedstorage.build": "Construire", + "permission.refinedstorage.build.description": "Si le joueur peut ajouter ou enlever des périphériques au réseau.", + "permission.refinedstorage.security": "Sécurité", + "permission.refinedstorage.security.description": "Si le joueur peut gérer les options de sécurité du réseau.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grille", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Empêcher le tri lorsque la touche Maj est enfoncée", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronisation", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Direction du tri", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Type de tri", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importateur", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exportateur", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Détecteur", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructeur", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructeur", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "Stockage Externe", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Grille sans fil", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Capacité énergétique", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Émetteur sans fil", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Portée de base", + "text.autoconfig.refinedstorage.option.storageMonitor": "Moniteur de Stockage", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Récepteur Réseau", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Transmetteur Réseau", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Grille portable", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Utiliser un câble pour connecter pour connecter des périphériques ensembles, ou placer les périphériques l'un contre l'autre", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Construire une amélioration pour améliorer divers périphériques", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Sans fil", + "advancements.refinedstorage.wireless.description": "Accédez à vos ressources à distance avec une grille sans fil", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json new file mode 100644 index 000000000..470eb7c92 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/hu_hu.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Cable", + "block.refinedstorage.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", + "block.refinedstorage.disk_drive": "Disk Drive", + "block.refinedstorage.machine_casing": "Machine Casing", + "block.refinedstorage.grid": "Grid", + "block.refinedstorage.crafting_grid": "Crafting Grid", + "block.refinedstorage.controller": "Controller", + "block.refinedstorage.creative_controller": "Creative Controller", + "block.refinedstorage.1k_storage_block": "1K Storage Block", + "block.refinedstorage.4k_storage_block": "4K Storage Block", + "block.refinedstorage.16k_storage_block": "16K Storage Block", + "block.refinedstorage.64k_storage_block": "64K Storage Block", + "block.refinedstorage.creative_storage_block": "Creative Storage Block", + "block.refinedstorage.64b_fluid_storage_block": "64B Fluid Storage Block", + "block.refinedstorage.256b_fluid_storage_block": "256B Fluid Storage Block", + "block.refinedstorage.1024b_fluid_storage_block": "1024B Fluid Storage Block", + "block.refinedstorage.4096b_fluid_storage_block": "4096B Fluid Storage Block", + "block.refinedstorage.creative_fluid_storage_block": "Creative Fluid Storage Block", + "block.refinedstorage.importer": "Importer", + "block.refinedstorage.exporter": "Exporter", + "block.refinedstorage.interface": "Interface", + "block.refinedstorage.external_storage": "External Storage", + "block.refinedstorage.detector": "Detector", + "block.refinedstorage.constructor": "Constructor", + "block.refinedstorage.destructor": "Destructor", + "block.refinedstorage.wireless_transmitter": "Wireless Transmitter", + "block.refinedstorage.storage_monitor": "Storage Monitor", + "block.refinedstorage.network_receiver": "Network Receiver", + "block.refinedstorage.network_transmitter": "Network Transmitter", + "block.refinedstorage.portable_grid": "Portable Grid", + "block.refinedstorage.creative_portable_grid": "Creative Portable Grid", + "block.refinedstorage.security_manager": "Security Manager", + "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", + "gui.refinedstorage.disk_drive.disks": "Disks", + "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", + "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "Sorting direction", + "gui.refinedstorage.grid.sorting.direction.ascending": "Ascending", + "gui.refinedstorage.grid.sorting.direction.descending": "Descending", + "gui.refinedstorage.grid.sorting.type": "Sorting type", + "gui.refinedstorage.grid.sorting.type.quantity": "Quantity", + "gui.refinedstorage.grid.sorting.type.name": "Name", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Last modified", + "gui.refinedstorage.grid.auto_selected": "Auto-selected", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "Synchronization mode", + "gui.refinedstorage.grid.synchronizer.off": "Off", + "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", + "gui.refinedstorage.grid.resource_type": "Resource type", + "gui.refinedstorage.grid.resource_type.all": "All", + "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", + "gui.refinedstorage.crafting_grid.move.network": "Move items to network", + "gui.refinedstorage.crafting_grid.move.inventory": "Move items to inventory", + "gui.refinedstorage.screen_size": "Screen size", + "gui.refinedstorage.screen_size.stretch": "Stretch", + "gui.refinedstorage.screen_size.small": "Small", + "gui.refinedstorage.screen_size.medium": "Medium", + "gui.refinedstorage.screen_size.large": "Large", + "gui.refinedstorage.screen_size.extra_large": "Extra large", + "gui.refinedstorage.detector.mode": "Mode", + "gui.refinedstorage.detector.mode.under": "Emit redstone signal when under the amount", + "gui.refinedstorage.detector.mode.equal": "Emit redstone signal when on the amount", + "gui.refinedstorage.detector.mode.above": "Emit redstone signal when above the amount", + "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", + "gui.refinedstorage.destructor.pickup_items": "Pickup items instead of breaking", + "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "Drop items instead of placing blocks", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%d block(s)", + "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", + "gui.refinedstorage.redstone_mode": "Redstone mode", + "gui.refinedstorage.redstone_mode.ignore": "Ignore", + "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", + "gui.refinedstorage.redstone_mode.high": "High", + "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", + "gui.refinedstorage.redstone_mode.low": "Low", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Scheduling mode", + "gui.refinedstorage.scheduling_mode.default": "Default", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "Random", + "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", + "gui.refinedstorage.priority": "Priority", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Amount", + "gui.refinedstorage.amount.reset": "Reset", + "gui.refinedstorage.amount.set": "Set", + "gui.refinedstorage.filter_mode": "Filter mode", + "gui.refinedstorage.filter_mode.allow": "Allowlist", + "gui.refinedstorage.filter_mode.block": "Blocklist", + "gui.refinedstorage.fuzzy_mode": "Fuzzy mode", + "gui.refinedstorage.fuzzy_mode.on": "On", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Off", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Access mode", + "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Insert only", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Extract only", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Void excess resources", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d block(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unreachable", + "gui.refinedstorage.security_card.permission.reset": "Reset", + "gui.refinedstorage.security_card.permission.modified": "Modified", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicon", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", + "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", + "item.refinedstorage.basic_processor": "Basic Processor", + "item.refinedstorage.improved_processor": "Improved Processor", + "item.refinedstorage.advanced_processor": "Advanced Processor", + "item.refinedstorage.1k_storage_part": "1K Storage Part", + "item.refinedstorage.4k_storage_part": "4K Storage Part", + "item.refinedstorage.16k_storage_part": "16K Storage Part", + "item.refinedstorage.64k_storage_part": "64K Storage Part", + "item.refinedstorage.1k_storage_disk": "1K Storage Disk", + "item.refinedstorage.4k_storage_disk": "4K Storage Disk", + "item.refinedstorage.16k_storage_disk": "16K Storage Disk", + "item.refinedstorage.64k_storage_disk": "64K Storage Disk", + "item.refinedstorage.creative_storage_disk": "Creative Storage Disk", + "item.refinedstorage.64b_fluid_storage_part": "64B Fluid Storage Part", + "item.refinedstorage.256b_fluid_storage_part": "256B Fluid Storage Part", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", + "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", + "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Wrench", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json new file mode 100644 index 000000000..f5f558131 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/id_id.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Kabel", + "block.refinedstorage.quartz_enriched_iron_block": "Balok Besi yang Diperkaya Kuarsa", + "block.refinedstorage.disk_drive": "Lemari Cakram", + "block.refinedstorage.machine_casing": "Kerangka Mesin", + "block.refinedstorage.grid": "Kisi", + "block.refinedstorage.crafting_grid": "Kisi Kerajinan", + "block.refinedstorage.controller": "Pengendali", + "block.refinedstorage.creative_controller": "Pengendali Kreatif", + "block.refinedstorage.1k_storage_block": "Balok Penyimpanan 1K", + "block.refinedstorage.4k_storage_block": "Balok Penyimpanan 4K", + "block.refinedstorage.16k_storage_block": "Balok Penyimpanan 16K", + "block.refinedstorage.64k_storage_block": "Balok Penyimpanan 64K", + "block.refinedstorage.creative_storage_block": "Balok Penyimpanan Kreatif", + "block.refinedstorage.64b_fluid_storage_block": "Balok Penyimpanan Cairan 64B", + "block.refinedstorage.256b_fluid_storage_block": "Balok Penyimpanan Cairan 256B", + "block.refinedstorage.1024b_fluid_storage_block": "Balok Penyimpanan Cairan 1024B", + "block.refinedstorage.4096b_fluid_storage_block": "Balok Penyimpanan Cairan 4096B", + "block.refinedstorage.creative_fluid_storage_block": "Balok Penyimpanan Cairan Kreatif", + "block.refinedstorage.importer": "Importir", + "block.refinedstorage.exporter": "Eksportir", + "block.refinedstorage.interface": "Antarmuka", + "block.refinedstorage.external_storage": "Penyimpanan Eksternal", + "block.refinedstorage.detector": "Pendeteksi", + "block.refinedstorage.constructor": "Pembangun", + "block.refinedstorage.destructor": "Penghancur", + "block.refinedstorage.wireless_transmitter": "Pemancar Nirkabel", + "block.refinedstorage.storage_monitor": "Monitor Penyimpanan", + "block.refinedstorage.network_receiver": "Penerima Jaringan", + "block.refinedstorage.network_transmitter": "Pemancar Jaringan", + "block.refinedstorage.portable_grid": "Kisi Portabel", + "block.refinedstorage.creative_portable_grid": "Kisi Portabel Kreatif", + "block.refinedstorage.security_manager": "Security Manager", + "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "Ketika peranagkat ini nonaktif, jaringan penyimpanan tidak dapat menggunakan perangkat ini sebagai sumber energi.", + "gui.refinedstorage.disk_drive.disks": "Cakram", + "gui.refinedstorage.storage.redstone_mode_help": "Ketika perangkat ini nonaktif, penyimpanan tidak akan dapat diakses dari dalam jaringan penyimpanan.", + "gui.refinedstorage.storage.filter_help": "Sumber daya yang diperbolehkan atau tidak ke dalam penyimpanan ini, tergantung jika perangkat dalam mode diizinkan atau diblokir.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Tanpa konfigurasi filter, tidak ada sumber daya yang akan diterima kedalam penyimpanan ini.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Hanya izinkan sumber daya kedalam penyimpanan ini yang telah dikonfigurasi dalam filter.", + "gui.refinedstorage.storage.filter_mode.block.help": "Blokir sumber daya kedalam penyimpanan ini yang telah dikonfigurasi dalam filter.", + "gui.refinedstorage.grid.sorting.direction": "Arah Pengurutan", + "gui.refinedstorage.grid.sorting.direction.ascending": "Menaik", + "gui.refinedstorage.grid.sorting.direction.descending": "Menurun", + "gui.refinedstorage.grid.sorting.type": "Jenis pengurutan", + "gui.refinedstorage.grid.sorting.type.quantity": "Kuantitas", + "gui.refinedstorage.grid.sorting.type.name": "Nama", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Terakhir dirubah", + "gui.refinedstorage.grid.auto_selected": "Pilih otomatis", + "gui.refinedstorage.grid.auto_selected.help": "Memilih kotak pencarian secara otomatis saat membuka Kisi.", + "gui.refinedstorage.grid.synchronizer": "Mode sinkronisasi", + "gui.refinedstorage.grid.synchronizer.off": "Nonaktif", + "gui.refinedstorage.grid.synchronizer.off.help": "Jangan sinkronkan teks kotak pencarian.", + "gui.refinedstorage.grid.resource_type": "Jenis sumber daya", + "gui.refinedstorage.grid.resource_type.all": "Semua", + "gui.refinedstorage.grid.resource_type.help": "Filter jenis sumber daya tertentu.", + "gui.refinedstorage.crafting_grid.move.network": "Pindahkan barang ke jaringan", + "gui.refinedstorage.crafting_grid.move.inventory": "Pindahkan barang ke inventaris", + "gui.refinedstorage.screen_size": "Screen size", + "gui.refinedstorage.screen_size.stretch": "Stretch", + "gui.refinedstorage.screen_size.small": "Small", + "gui.refinedstorage.screen_size.medium": "Medium", + "gui.refinedstorage.screen_size.large": "Large", + "gui.refinedstorage.screen_size.extra_large": "Extra large", + "gui.refinedstorage.detector.mode": "Mode", + "gui.refinedstorage.detector.mode.under": "Pancarkan sinyal redstone saat berada di bawah jumlah yang ditentukan", + "gui.refinedstorage.detector.mode.equal": "Pancarkan sinyal redstone saat berada pada jumlah yang ditentukan", + "gui.refinedstorage.detector.mode.above": "Pancarkan sinyal redstone saat berada diatas jumlah yang ditentukan", + "gui.refinedstorage.detector.filter_help": "Sumber daya yang harus dideteksi dalam jaringan penyimpanan.", + "gui.refinedstorage.destructor.pickup_items": "Ambil barang daripada memecah", + "gui.refinedstorage.destructor.filter_help": "Balok yang dapat atau tidak dapat untuk dihancurkan, tergantung jika perangkat dalam mode diizinkan atau diblokir.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Hanya izinkan balok kedalam jaringan penyimpanan yang telah dikonfigurasi dalam filter.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Blokir balok kedalam jaringan penyimpanan yang telah dikonfigurasi dalam filter.", + "gui.refinedstorage.constructor.drop_items": "Jatuhkan barang dibanding menempatkan balok", + "gui.refinedstorage.constructor.filter_help": "Sumber daya yang harus ditempatkan dari jaringan penyimpanan.", + "gui.refinedstorage.interface.filter_help": "Sumber daya yang harus diekspor dari jaringan penyimpanan.", + "gui.refinedstorage.exporter.filter_help": "Sumber daya yang harus diekspor dari jaringan penyimpanan.", + "gui.refinedstorage.importer.filter_help": "Sumber daya yang mungkin diimpor dari penyimpanan sasaran.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Hanya izinkan sumber daya kedalam jaringan penyimpanan yang telah dikonfigurasi dalam filter.", + "gui.refinedstorage.importer.filter_mode.block.help": "Blokir sumber daya kedalam jaringan penyimpanan yang telah dikonfigurasi dalam filter.", + "gui.refinedstorage.wireless_transmitter.distance": "%d blok", + "gui.refinedstorage.storage_monitor.filter_help": "Sumber daya untuk ditampilkan.", + "gui.refinedstorage.redstone_mode": "Mode redstone", + "gui.refinedstorage.redstone_mode.ignore": "Abaikan", + "gui.refinedstorage.redstone_mode.ignore.help": "Perangkat ini akan selalu aktif, menghiraukan sinyal redstone.", + "gui.refinedstorage.redstone_mode.high": "Tinggi", + "gui.refinedstorage.redstone_mode.high.help": "Perangkat ini hanya akan aktif dengan sinyal redstone.", + "gui.refinedstorage.redstone_mode.low": "Rendah", + "gui.refinedstorage.redstone_mode.low.help": "Perangkat ini hanya akan aktif tanpa sinyal redstone.", + "gui.refinedstorage.scheduling_mode": "Mode penjadwalan", + "gui.refinedstorage.scheduling_mode.default": "Bawaan", + "gui.refinedstorage.scheduling_mode.default.help": "Gunakan filter yang tersedia terlebih dahulu.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Gunakan setiap filter secara bergilir.", + "gui.refinedstorage.scheduling_mode.random": "Acak", + "gui.refinedstorage.scheduling_mode.random.help": "Gunakan filter acak.", + "gui.refinedstorage.priority": "Prioritas", + "gui.refinedstorage.priority.storage_help": "Urutan dimana jaringan penyimpanan akan memasukkan atau mengekstrak sumber daya, mulai dari yang tertinggi.", + "gui.refinedstorage.amount": "Jumlah", + "gui.refinedstorage.amount.reset": "Atur Ulang", + "gui.refinedstorage.amount.set": "Atur", + "gui.refinedstorage.filter_mode": "Mode Filter", + "gui.refinedstorage.filter_mode.allow": "Diizinkan", + "gui.refinedstorage.filter_mode.block": "Diblokir", + "gui.refinedstorage.fuzzy_mode": "Mode acak", + "gui.refinedstorage.fuzzy_mode.on": "Hidup", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Cocokkan persis filter untuk daftar yang diizinkan atau yang diblokir.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Sesuaikan persis filter.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Sesuaikan persis filter ketika mengekstrak dari jaringan penyimpanan.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Sesuaikan persis filter ketika mengekstrak dari sumber.", + "gui.refinedstorage.fuzzy_mode.off": "Nonaktif", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Cocokkan filter untuk daftar yang diizinkan atau yang diblokir tanpa membandingkan label NBT.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Sesuaikan filter tanpa membandingkan label NBT.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Sesuaikan filter ketika mengekstrak dari jaringan penyimpanan tanpa membandingkan label NBT.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Sesuaikan filter ketika mengekstrak dari sumber tanpa membandingkan label NBT.", + "gui.refinedstorage.access_mode": "Modus akses", + "gui.refinedstorage.access_mode.insert_extract": "Masukkan dan ekstrak", + "gui.refinedstorage.access_mode.insert_extract.help": "Jaringan penyimpanan akan dapat memasukkan atau mengekstrak dari penyimpanan ini.", + "gui.refinedstorage.access_mode.insert": "Masukkan saja", + "gui.refinedstorage.access_mode.insert.help": "Jaringan penyimpanan hanya akan dapat memasukkan kedalam penyimpanan ini. Sumber daya masih dapat dilihat dalam Kisi.", + "gui.refinedstorage.access_mode.extract": "Ekstrak saja", + "gui.refinedstorage.access_mode.extract.help": "Jaringan penyimpanan hanya akan dapat mengekstrak dari penyimpanan ini.", + "gui.refinedstorage.void_excess": "Kosongkan sumber daya berlebih", + "gui.refinedstorage.void_excess.help": "Ketika mode kosongan kelebihan dihidupkan dan penyimpanan penuh, penyimpanan akan tetap menerima sumber daya akan tetapi akan mengosongkannya.", + "gui.refinedstorage.void_excess.allowlist_warning": "Kosongkan kelebihan hanya akan bekerja ketika penyimpanan dalam mode diizinkan.", + "gui.refinedstorage.upgrade_slot": "Slot peningkatan kosong", + "gui.refinedstorage.filter_slot.empty_filter": "Filter kosong", + "gui.refinedstorage.filter_slot.left_click_for": "Klik kiri untuk", + "gui.refinedstorage.filter_slot.right_click_for": "Klik kanan untuk", + "gui.refinedstorage.filter_slot.click_to_clear": "Klik untuk membersihkan", + "gui.refinedstorage.regulator_upgrade.filter_help": "Sumber daya yang harus diatur dalam sasaran.", + "gui.refinedstorage.network_transmitter.status.inactive": "Tidak aktif", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Kartu Jaringan Tidak Ditemukan", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d blok", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Tidak dapat diraih", + "gui.refinedstorage.security_card.permission.reset": "Reset", + "gui.refinedstorage.security_card.permission.modified": "Modified", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Menyediakan energi ke jaringan penyimpanan. dapat digunakan beberapa kali dalam satu jaringan penyimpanan.", + "item.refinedstorage.creative_controller.help": "Menyediakan energi tidak terbatas ke jaringan penyimpanan.", + "item.refinedstorage.disk_drive.help": "Menerima cakram penyimpanan untuk menyediakan ruang penyimpanan kedalam jaringan penyimpanan.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Memungkinkan untuk mengakses jaringan penyimpanan.", + "item.refinedstorage.crafting_grid.help": "Memungkinkan untuk mengakses jaringan penyimpanan, dengan kemampuan untuk merakit.", + "item.refinedstorage.importer.help": "Import sumber daya dari sumber eksternal kedalam jaringan penyimpanan.", + "item.refinedstorage.exporter.help": "Ekspor sumber daya dari jaringan penyimpanan kedalam tujuan eksternal.", + "item.refinedstorage.interface.help": "Berfungsi sebagai gabungan dari Importir dan Eksportir.", + "item.refinedstorage.external_storage.help": "Menyediakan penyimpanan dari sumber eksternal kedalam jaringan penyimpanan.", + "item.refinedstorage.detector.help": "Pancarkan sinyal redstone jika jaringan penyimpanan berisi sumber daya sama dengan, diatas atau dibawah jumlah yang ditentukan.", + "item.refinedstorage.constructor.help": "Tempatkan balok dari jaringan penyimpanan ke dunia.", + "item.refinedstorage.destructor.help": "Memecahkan balok dari dunia dan memasukkannya kedalam jaringan penyimpanan.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Besi yang Diperkaya Kuarsa", + "item.refinedstorage.processor_binding": "Pengikat Prosesor", + "item.refinedstorage.silicon": "Silikon", + "item.refinedstorage.raw_basic_processor": "Procesor Dasar Mentah", + "item.refinedstorage.raw_improved_processor": "Prosesor Ditingkatkan Mentah", + "item.refinedstorage.raw_advanced_processor": "Prosesor Canggih Mentah", + "item.refinedstorage.basic_processor": "Procesor Dasar", + "item.refinedstorage.improved_processor": "Prosesor Ditingkatkan", + "item.refinedstorage.advanced_processor": "Prosesor Canggih", + "item.refinedstorage.1k_storage_part": "Suku Cadang Penyimpanan 1K", + "item.refinedstorage.4k_storage_part": "Suku Cadang Penyimpanan 4K", + "item.refinedstorage.16k_storage_part": "Suku Cadang Penyimpanan 16K", + "item.refinedstorage.64k_storage_part": "Suku Cadang Penyimpanan 64K", + "item.refinedstorage.1k_storage_disk": "Cakram Penyimpanan 1K", + "item.refinedstorage.4k_storage_disk": "Cakram Penyimpanan 4K", + "item.refinedstorage.16k_storage_disk": "Cakram Penyimpanan 16K", + "item.refinedstorage.64k_storage_disk": "Cakram Penyimpanan 64K", + "item.refinedstorage.creative_storage_disk": "Cakram Penyimpanan Kreatif", + "item.refinedstorage.64b_fluid_storage_part": "Suku cadang Penyimpanan Cairan 64B", + "item.refinedstorage.256b_fluid_storage_part": "Suku cadang Penyimpanan Cairan 256B", + "item.refinedstorage.1024b_fluid_storage_part": "Suku cadang Penyimpanan Cairan 1024B", + "item.refinedstorage.4096b_fluid_storage_part": "Suku cadang Penyimpanan Cairan 4096B", + "item.refinedstorage.64b_fluid_storage_disk": "Cakram Penyimpanan Cairan 64B", + "item.refinedstorage.256b_fluid_storage_disk": "Cakram Penyimpanan Cairan 256B", + "item.refinedstorage.1024b_fluid_storage_disk": "Cakram Penyimpanan Cairan 1024B", + "item.refinedstorage.4096b_fluid_storage_disk": "Cakram Penyimpanan Cairan 4096B", + "item.refinedstorage.creative_fluid_storage_disk": "Cakram Penyimpanan Cairan Kreatif", + "item.refinedstorage.storage_housing": "Kerangka Penyimpanan", + "item.refinedstorage.construction_core": "Inti Pembangunan", + "item.refinedstorage.destruction_core": "Inti Penghancuran", + "item.refinedstorage.wrench": "Kunci inggris", + "item.refinedstorage.wrench.helper": "Gunakan untuk memutar balok atau tekan SHIFT dan gunakan untuk membongkar balok Refined Storage.", + "item.refinedstorage.upgrade": "Tingkatkan", + "item.refinedstorage.speed_upgrade": "Peningkatan Kecepatan", + "item.refinedstorage.stack_upgrade": "Peningkatan Tumpukan", + "item.refinedstorage.silk_touch_upgrade": "Peningkatan Sentuhan Sutra", + "item.refinedstorage.fortune_upgrade.1": "Peningkatan Peruntungan 1", + "item.refinedstorage.fortune_upgrade.2": "Peningkatan Peruntungan 2", + "item.refinedstorage.fortune_upgrade.3": "Peningkatan Peruntungan 3", + "item.refinedstorage.regulator_upgrade": "Peningkatan Pengatur", + "item.refinedstorage.regulator_upgrade.help": "Didalam Eksportir, hanya akan mengekspor jika jumlah sasaran kurang dari yang dikonfigurasi dalam peningkatan. Didalam Importir, hanya akan mengimpor jika jumlah sasaran lebih dari yang dikonfigurasi dalam peningkatan. Gunakan barang untuk mengonfigurasi.", + "item.refinedstorage.range_upgrade": "Peningkatan Jangkauan", + "item.refinedstorage.creative_range_upgrade": "Peningkatan Jangkauan Kreatif", + "item.refinedstorage.wireless_grid": "Kisi Nirkabel", + "item.refinedstorage.creative_wireless_grid": "Kisi Nirkabel Kreatif", + "item.refinedstorage.wireless_transmitter.help": "Menyediakan akses jaringan nirkabel untuk barang seperti Kisi Nirkabel. Dapat digunakan beberapa dalam area untuk jangkauan yang lebih luas.", + "item.refinedstorage.network_item.unbound": "Tidak terikat.", + "item.refinedstorage.network_item.unbound.help": "Gunakan pada perangkat jaringan penyimpanan manapun untuk mengikat.", + "item.refinedstorage.network_item.bound_to": "Terikat pada %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "Terdapat %s lebih dari satu di inventaris anda.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "Tidak ada %s di inventaris anda.", + "item.refinedstorage.configuration_card": "Kartu Konfigurasi", + "item.refinedstorage.configuration_card.empty": "Kosong.", + "item.refinedstorage.configuration_card.configured": "Berisi konfigurasi untuk %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Menyalin konfigurasi untuk %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Konfigurasi dibersihkan.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Tidak dapat menerapkan kartu konfigurasi ke jenis perangkat yang berbeda. Kartu terkonfigurasi untuk %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Konfigurasi diterapkan.", + "item.refinedstorage.configuration_card.empty_help": "Gunakan pada perangkat perangkat jaringan penyimpanan sambil berjongkok untuk menyalin konfigurasi dan peningkatannya kedalam kartu.", + "item.refinedstorage.configuration_card.configured_help": "Gunakan pada perangkat jaringan penyimpanan tujuan sambil berjongkok untuk mengirimkan konfigurasi dan peningkatan. Gunakan sambil berjongkok untuk membersihkan.", + "item.refinedstorage.network_card": "Kartu Jaringan", + "item.refinedstorage.network_card.unbound_help": "Gunakan sambil berjongkok pada Penerima Jaringan.", + "item.refinedstorage.network_card.unbound": "Tidak terikat.", + "item.refinedstorage.network_card.bound_help": "Masukkan ke Pemancar Jaringan. Gunakan sambil berjongkok untuk membersihkan ikatan.", + "item.refinedstorage.network_card.bound": "Terikat pada %d, %d, %d dalam %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Tersimpan: %s", + "misc.refinedstorage.stored_with_capacity": "Tersimpan: %s / %s (%d%%)", + "misc.refinedstorage.total": "Total %d", + "misc.refinedstorage.last_modified.just_now": "Baru saja dirubah oleh %s", + "misc.refinedstorage.last_modified.second": "Terakhir dirubah %d detik yang lalu oleh %s", + "misc.refinedstorage.last_modified.seconds": "Terakhir dirubah %d detik yang lalu oleh %s", + "misc.refinedstorage.last_modified.minute": "Terakhir dirubah %d menit yang lalu oleh %s", + "misc.refinedstorage.last_modified.minutes": "Terakhir dirubah %d menit yang lalu oleh %s", + "misc.refinedstorage.last_modified.hour": "Terakhir dirubah %d jam yang lalu oleh %s", + "misc.refinedstorage.last_modified.hours": "Terakhir dirubah %d jam yang lalu oleh %s", + "misc.refinedstorage.last_modified.day": "Terakhir dirubah %d hari yang lalu oleh %s", + "misc.refinedstorage.last_modified.days": "Terakhir dirubah %d hari yang lalu oleh %s", + "misc.refinedstorage.last_modified.week": "Terakhir dirubah %d minggu yang lalu oleh %s", + "misc.refinedstorage.last_modified.weeks": "Terakhir dirubah %d minggu yang lalu oleh %s", + "misc.refinedstorage.last_modified.year": "Terakhir dirubah %d tahun yang lalu oleh %s", + "misc.refinedstorage.last_modified.years": "Terakhir dirubah %d tahun yang lalu oleh %s", + "misc.refinedstorage.resource_type.item": "Barang", + "misc.refinedstorage.resource_type.fluid": "Cairan", + "misc.refinedstorage.press_shift_for_help": "Tekan SHIFT untuk bantuan", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Fokus pada kotak pencarian", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Singkirkan matriks Kisi Kerajinan ke jaringan", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Singkirkan matriks Kisi Kerajinan ke inventaris", + "key.refinedstorage.open_wireless_grid": "Buka Kisi Nirkabel", + "refinedstorage.subtitle.wrench": "Kunci inggris digunakan", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Kisi", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Font besar", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Mencegah pengurutan ketika SHIFT ditekan", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detail teks keterangan", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Ingat permintaan pencarian", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Memilih otomatis kotak pencarian", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Sinkronisasi", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Jenis sumber daya", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Arah Pengurutan", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Jenis pengurutan", + "text.autoconfig.refinedstorage.option.craftingGrid": "Kisi Kerajinan", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Perilaku menutup Matriks kerajinan", + "text.autoconfig.refinedstorage.option.controller": "Pengendali", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Kapasitas daya", + "text.autoconfig.refinedstorage.option.cable": "Kabel", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.diskDrive": "Lemari Cakram", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Pemakaian daya per cakram", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Balok Penyimpanan", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "Pemakaian daya 1K", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "Pemakaian daya 4K", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "Pemakaian daya 16K", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "Pemakaian daya 64K", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Pemakaian daya kreatif", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Balok Penyimpanan Cairan", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "Pemakaian daya 64M", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "Pemakaian daya 256M", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "Pemakaian daya 1024M", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "Pemakaian daya 4096M", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Pemakaian daya kreatif", + "text.autoconfig.refinedstorage.option.importer": "Importir", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.exporter": "Eksportir", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.detector": "Pendeteksi", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.constructor": "Pembangun", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.destructor": "Penghancur", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.upgrade": "Peningkatan", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Pemakaian daya peningkat kecepatan", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Pemakaian daya peningkat tumpukan", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Pemakaian daya peningkat peruntungan 1", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Pemakaian daya peningkat peruntungan 2", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Pemakaian daya peningkat peruntungan 3", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Pemakaian daya peningkat sentuhan sutra", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Pemakaian daya peningkat pengatur", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Pemakaian daya peningkat jangkauan", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Pemakaian daya peningkat jangkauan kreatif", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Rentang Peningkatan Jangkauan", + "text.autoconfig.refinedstorage.option.iface": "Antarmuka", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.externalStorage": "Penyimpanan Eksternal", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Kisi Nirkabel", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Kapasitas energi", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Buka pemakaian daya", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Masukkan pemakaian daya", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Ekstrak pemakaian daya", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Pemancar Nirkabel", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Jangkauan Dasar", + "text.autoconfig.refinedstorage.option.storageMonitor": "Monitor Penyimpanan", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.networkReceiver": "Penerima Jaringan", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Pemancar Jaringan", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Pemakaian daya", + "text.autoconfig.refinedstorage.option.portableGrid": "Kisi Portabel", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Kapasitas energi", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Buka pemakaian daya", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Masukkan pemakaian daya", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Ekstrak pemakaian daya", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Menyambungkan", + "advancements.refinedstorage.connecting.description": "Gunakan Kabel untuk menghubungkan perangkat satu sama lain, atau letakkan perangkat melawan satu sama lain", + "advancements.refinedstorage.drives": "Cakram", + "advancements.refinedstorage.drives.description": "Rakit Lemari Cakram untuk menyimpan cakram penyimpanan anda", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Menyimpan Barang", + "advancements.refinedstorage.storing_items.description": "Rakit Cakram Penyimpanan dan letakkan kedalam Lemari Cakram anda", + "advancements.refinedstorage.viewing_your_storage": "Melihat penyimpanan anda", + "advancements.refinedstorage.viewing_your_storage.description": "Rakit Kisi untuk berinteraksi dengan penyimpanan anda", + "advancements.refinedstorage.upgrading_your_grid": "Meningkatkan Kisi anda", + "advancements.refinedstorage.upgrading_your_grid.description": "Tingkatkan Kisi anda menjadi Kisi Kerajinan untuk mendapatkan kemampuan kerajinan", + "advancements.refinedstorage.storing_fluids": "Menyimpan cairan", + "advancements.refinedstorage.storing_fluids.description": "Rakit Cakram Penyimpanan Cairan dan letakkan kedalam Lemari Cakram anda", + "advancements.refinedstorage.importing": "Pengimporan", + "advancements.refinedstorage.importing.description": "Masukkan sumber daya kedalam jaringan penyimpanan menggunakan Importir", + "advancements.refinedstorage.exporting": "Pengeksporan", + "advancements.refinedstorage.exporting.description": "Keluarkan sumberdaya dari jaringan penyimpanan menggunakan Eksportir", + "advancements.refinedstorage.upgrading": "Meningkatkan", + "advancements.refinedstorage.upgrading.description": "Rakit Peningkatan untuk meningkatkan berbagai perangkat", + "advancements.refinedstorage.interface_to_the_world": "Antarmuka ke dunia", + "advancements.refinedstorage.interface_to_the_world.description": "Ekspor dan Impor barang secara bersamaan dengan Antarmuka", + "advancements.refinedstorage.storing_externally": "Menyimpan secara eksternal", + "advancements.refinedstorage.storing_externally.description": "Gunakan Penyimpanan Eksternal untuk menyediakan jaringan dengan penyimpanan dari balok eksternal seperti peti", + "advancements.refinedstorage.detecting": "Mendeteksi", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Pembangunan", + "advancements.refinedstorage.construction.description": "Tempatkan balok dari jaringan penyimpanan ke dunia menggunakan Pembangun", + "advancements.refinedstorage.destruction": "Penghancuran", + "advancements.refinedstorage.destruction.description": "Peroleh balok dari dunia kedalam jaringan penyimpanan menggunakan Penghancur", + "advancements.refinedstorage.wireless": "Nirkabel", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Lebih baik dari tong", + "advancements.refinedstorage.better_than_a_barrel.description": "Rakit Monitor Penyimpanan untuk melihat, memasukkan atau mengekstrak sumber daya dalam jaringan penyimpanan", + "advancements.refinedstorage.no_cables_required": "Tidak memerlukan kabel", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Penyimpanan portabel", + "advancements.refinedstorage.portable_storage.description": "Rakit Kisi Portabel untuk mengakses isi dari cakram tanpa memerlukan jaringan penyimpanan", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json new file mode 100644 index 000000000..470eb7c92 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/it_it.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Cable", + "block.refinedstorage.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", + "block.refinedstorage.disk_drive": "Disk Drive", + "block.refinedstorage.machine_casing": "Machine Casing", + "block.refinedstorage.grid": "Grid", + "block.refinedstorage.crafting_grid": "Crafting Grid", + "block.refinedstorage.controller": "Controller", + "block.refinedstorage.creative_controller": "Creative Controller", + "block.refinedstorage.1k_storage_block": "1K Storage Block", + "block.refinedstorage.4k_storage_block": "4K Storage Block", + "block.refinedstorage.16k_storage_block": "16K Storage Block", + "block.refinedstorage.64k_storage_block": "64K Storage Block", + "block.refinedstorage.creative_storage_block": "Creative Storage Block", + "block.refinedstorage.64b_fluid_storage_block": "64B Fluid Storage Block", + "block.refinedstorage.256b_fluid_storage_block": "256B Fluid Storage Block", + "block.refinedstorage.1024b_fluid_storage_block": "1024B Fluid Storage Block", + "block.refinedstorage.4096b_fluid_storage_block": "4096B Fluid Storage Block", + "block.refinedstorage.creative_fluid_storage_block": "Creative Fluid Storage Block", + "block.refinedstorage.importer": "Importer", + "block.refinedstorage.exporter": "Exporter", + "block.refinedstorage.interface": "Interface", + "block.refinedstorage.external_storage": "External Storage", + "block.refinedstorage.detector": "Detector", + "block.refinedstorage.constructor": "Constructor", + "block.refinedstorage.destructor": "Destructor", + "block.refinedstorage.wireless_transmitter": "Wireless Transmitter", + "block.refinedstorage.storage_monitor": "Storage Monitor", + "block.refinedstorage.network_receiver": "Network Receiver", + "block.refinedstorage.network_transmitter": "Network Transmitter", + "block.refinedstorage.portable_grid": "Portable Grid", + "block.refinedstorage.creative_portable_grid": "Creative Portable Grid", + "block.refinedstorage.security_manager": "Security Manager", + "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", + "gui.refinedstorage.disk_drive.disks": "Disks", + "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", + "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "Sorting direction", + "gui.refinedstorage.grid.sorting.direction.ascending": "Ascending", + "gui.refinedstorage.grid.sorting.direction.descending": "Descending", + "gui.refinedstorage.grid.sorting.type": "Sorting type", + "gui.refinedstorage.grid.sorting.type.quantity": "Quantity", + "gui.refinedstorage.grid.sorting.type.name": "Name", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Last modified", + "gui.refinedstorage.grid.auto_selected": "Auto-selected", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "Synchronization mode", + "gui.refinedstorage.grid.synchronizer.off": "Off", + "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", + "gui.refinedstorage.grid.resource_type": "Resource type", + "gui.refinedstorage.grid.resource_type.all": "All", + "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", + "gui.refinedstorage.crafting_grid.move.network": "Move items to network", + "gui.refinedstorage.crafting_grid.move.inventory": "Move items to inventory", + "gui.refinedstorage.screen_size": "Screen size", + "gui.refinedstorage.screen_size.stretch": "Stretch", + "gui.refinedstorage.screen_size.small": "Small", + "gui.refinedstorage.screen_size.medium": "Medium", + "gui.refinedstorage.screen_size.large": "Large", + "gui.refinedstorage.screen_size.extra_large": "Extra large", + "gui.refinedstorage.detector.mode": "Mode", + "gui.refinedstorage.detector.mode.under": "Emit redstone signal when under the amount", + "gui.refinedstorage.detector.mode.equal": "Emit redstone signal when on the amount", + "gui.refinedstorage.detector.mode.above": "Emit redstone signal when above the amount", + "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", + "gui.refinedstorage.destructor.pickup_items": "Pickup items instead of breaking", + "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "Drop items instead of placing blocks", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%d block(s)", + "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", + "gui.refinedstorage.redstone_mode": "Redstone mode", + "gui.refinedstorage.redstone_mode.ignore": "Ignore", + "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", + "gui.refinedstorage.redstone_mode.high": "High", + "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", + "gui.refinedstorage.redstone_mode.low": "Low", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Scheduling mode", + "gui.refinedstorage.scheduling_mode.default": "Default", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "Random", + "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", + "gui.refinedstorage.priority": "Priority", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Amount", + "gui.refinedstorage.amount.reset": "Reset", + "gui.refinedstorage.amount.set": "Set", + "gui.refinedstorage.filter_mode": "Filter mode", + "gui.refinedstorage.filter_mode.allow": "Allowlist", + "gui.refinedstorage.filter_mode.block": "Blocklist", + "gui.refinedstorage.fuzzy_mode": "Fuzzy mode", + "gui.refinedstorage.fuzzy_mode.on": "On", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Off", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Access mode", + "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Insert only", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Extract only", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Void excess resources", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d block(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unreachable", + "gui.refinedstorage.security_card.permission.reset": "Reset", + "gui.refinedstorage.security_card.permission.modified": "Modified", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicon", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", + "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", + "item.refinedstorage.basic_processor": "Basic Processor", + "item.refinedstorage.improved_processor": "Improved Processor", + "item.refinedstorage.advanced_processor": "Advanced Processor", + "item.refinedstorage.1k_storage_part": "1K Storage Part", + "item.refinedstorage.4k_storage_part": "4K Storage Part", + "item.refinedstorage.16k_storage_part": "16K Storage Part", + "item.refinedstorage.64k_storage_part": "64K Storage Part", + "item.refinedstorage.1k_storage_disk": "1K Storage Disk", + "item.refinedstorage.4k_storage_disk": "4K Storage Disk", + "item.refinedstorage.16k_storage_disk": "16K Storage Disk", + "item.refinedstorage.64k_storage_disk": "64K Storage Disk", + "item.refinedstorage.creative_storage_disk": "Creative Storage Disk", + "item.refinedstorage.64b_fluid_storage_part": "64B Fluid Storage Part", + "item.refinedstorage.256b_fluid_storage_part": "256B Fluid Storage Part", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", + "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", + "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Wrench", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json new file mode 100644 index 000000000..61f177328 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ja_jp.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "ケーブル", + "block.refinedstorage.quartz_enriched_iron_block": "クォーツ濃縮鉄ブロック", + "block.refinedstorage.disk_drive": "ディスクドライブ", + "block.refinedstorage.machine_casing": "マシンケーシング", + "block.refinedstorage.grid": "グリッド", + "block.refinedstorage.crafting_grid": "クラフトグリッド", + "block.refinedstorage.controller": "コントローラー", + "block.refinedstorage.creative_controller": "クリエイティブコントローラー", + "block.refinedstorage.1k_storage_block": "1Kストレージブロック", + "block.refinedstorage.4k_storage_block": "4Kストレージブロック", + "block.refinedstorage.16k_storage_block": "16Kストレージブロック", + "block.refinedstorage.64k_storage_block": "64Kストレージブロック", + "block.refinedstorage.creative_storage_block": "クリエイティブストレージブロック", + "block.refinedstorage.64b_fluid_storage_block": "64B流体ストレージブロック", + "block.refinedstorage.256b_fluid_storage_block": "256B流体ストレージブロック", + "block.refinedstorage.1024b_fluid_storage_block": "1024B流体ストレージブロック", + "block.refinedstorage.4096b_fluid_storage_block": "4096B流体ストレージブロック", + "block.refinedstorage.creative_fluid_storage_block": "クリエイティブ流体ストレージブロック", + "block.refinedstorage.importer": "インポーター", + "block.refinedstorage.exporter": "エクスポーター", + "block.refinedstorage.interface": "インターフェース", + "block.refinedstorage.external_storage": "外部ストレージ", + "block.refinedstorage.detector": "ディテクター", + "block.refinedstorage.constructor": "コンストラクター", + "block.refinedstorage.destructor": "ディストラクター", + "block.refinedstorage.wireless_transmitter": "ワイヤレス送信機", + "block.refinedstorage.storage_monitor": "ストレージモニター", + "block.refinedstorage.network_receiver": "ネットワーク受信機", + "block.refinedstorage.network_transmitter": "ネットワーク送信機", + "block.refinedstorage.portable_grid": "携帯グリッド", + "block.refinedstorage.creative_portable_grid": "クリエイティブ携帯グリッド", + "block.refinedstorage.security_manager": "セキュリティマネージャー", + "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", + "block.refinedstorage.relay": "リレー", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", + "gui.refinedstorage.disk_drive.disks": "ディスク", + "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", + "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "並び順", + "gui.refinedstorage.grid.sorting.direction.ascending": "昇順", + "gui.refinedstorage.grid.sorting.direction.descending": "降順", + "gui.refinedstorage.grid.sorting.type": "並べ替え", + "gui.refinedstorage.grid.sorting.type.quantity": "量", + "gui.refinedstorage.grid.sorting.type.name": "名前", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "最終変更時間", + "gui.refinedstorage.grid.auto_selected": "自動選択", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "同期モード", + "gui.refinedstorage.grid.synchronizer.off": "オフ", + "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", + "gui.refinedstorage.grid.resource_type": "リソースの種類", + "gui.refinedstorage.grid.resource_type.all": "すべて", + "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", + "gui.refinedstorage.crafting_grid.move.network": "アイテムをネットワークに移動", + "gui.refinedstorage.crafting_grid.move.inventory": "アイテムをインベントリに移動", + "gui.refinedstorage.screen_size": "画面サイズ", + "gui.refinedstorage.screen_size.stretch": "連動", + "gui.refinedstorage.screen_size.small": "小", + "gui.refinedstorage.screen_size.medium": "中", + "gui.refinedstorage.screen_size.large": "大", + "gui.refinedstorage.screen_size.extra_large": "特大", + "gui.refinedstorage.detector.mode": "モード", + "gui.refinedstorage.detector.mode.under": "指定数を下回るとレッドストーン信号を出力", + "gui.refinedstorage.detector.mode.equal": "指定数と同量でレッドストーン信号を出力", + "gui.refinedstorage.detector.mode.above": "指定数を上回るとレッドストーン信号を出力", + "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", + "gui.refinedstorage.destructor.pickup_items": "ブロックを破壊せずにアイテムを拾う", + "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "ブロックを設置せずにアイテム化させる", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%dブロック", + "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", + "gui.refinedstorage.redstone_mode": "レッドストーン", + "gui.refinedstorage.redstone_mode.ignore": "無視", + "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", + "gui.refinedstorage.redstone_mode.high": "高", + "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", + "gui.refinedstorage.redstone_mode.low": "低", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "スケジュールモード", + "gui.refinedstorage.scheduling_mode.default": "デフォルト", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "ラウンドロビン", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "ランダム", + "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", + "gui.refinedstorage.priority": "優先度", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "量", + "gui.refinedstorage.amount.reset": "リセット", + "gui.refinedstorage.amount.set": "設定", + "gui.refinedstorage.filter_mode": "フィルターモード", + "gui.refinedstorage.filter_mode.allow": "ホワイトリスト", + "gui.refinedstorage.filter_mode.block": "ブラックリスト", + "gui.refinedstorage.fuzzy_mode": "曖昧モード", + "gui.refinedstorage.fuzzy_mode.on": "オン", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "オフ", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "アクセスモード", + "gui.refinedstorage.access_mode.insert_extract": "搬入・搬出", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "搬入のみ", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "搬出のみ", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "余分なリソースを破棄", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", + "gui.refinedstorage.network_transmitter.status.transmitting": "%dブロック", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "アクセス不可", + "gui.refinedstorage.security_card.permission.reset": "リセット", + "gui.refinedstorage.security_card.permission.modified": "変更済み", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "通過", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "エネルギーを通過", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "ストレージを通過", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "セキュリティを通過", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "クォーツ濃縮鉄", + "item.refinedstorage.processor_binding": "プロセッサ接合材", + "item.refinedstorage.silicon": "シリコン", + "item.refinedstorage.raw_basic_processor": "生の基本プロセッサ", + "item.refinedstorage.raw_improved_processor": "生の改良プロセッサ", + "item.refinedstorage.raw_advanced_processor": "生の発展プロセッサ", + "item.refinedstorage.basic_processor": "基本プロセッサ", + "item.refinedstorage.improved_processor": "改良プロセッサ", + "item.refinedstorage.advanced_processor": "発展プロセッサ", + "item.refinedstorage.1k_storage_part": "1Kストレージパーツ", + "item.refinedstorage.4k_storage_part": "4Kストレージパーツ", + "item.refinedstorage.16k_storage_part": "16Kストレージパーツ", + "item.refinedstorage.64k_storage_part": "64Kストレージパーツ", + "item.refinedstorage.1k_storage_disk": "1Kストレージディスク", + "item.refinedstorage.4k_storage_disk": "4Kストレージディスク", + "item.refinedstorage.16k_storage_disk": "16Kストレージディスク", + "item.refinedstorage.64k_storage_disk": "64Kストレージディスク", + "item.refinedstorage.creative_storage_disk": "クリエイティブストレージディスク", + "item.refinedstorage.64b_fluid_storage_part": "64B流体ストレージパーツ", + "item.refinedstorage.256b_fluid_storage_part": "256B流体ストレージパーツ", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", + "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", + "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Wrench", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json new file mode 100644 index 000000000..470eb7c92 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ko_kr.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Cable", + "block.refinedstorage.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", + "block.refinedstorage.disk_drive": "Disk Drive", + "block.refinedstorage.machine_casing": "Machine Casing", + "block.refinedstorage.grid": "Grid", + "block.refinedstorage.crafting_grid": "Crafting Grid", + "block.refinedstorage.controller": "Controller", + "block.refinedstorage.creative_controller": "Creative Controller", + "block.refinedstorage.1k_storage_block": "1K Storage Block", + "block.refinedstorage.4k_storage_block": "4K Storage Block", + "block.refinedstorage.16k_storage_block": "16K Storage Block", + "block.refinedstorage.64k_storage_block": "64K Storage Block", + "block.refinedstorage.creative_storage_block": "Creative Storage Block", + "block.refinedstorage.64b_fluid_storage_block": "64B Fluid Storage Block", + "block.refinedstorage.256b_fluid_storage_block": "256B Fluid Storage Block", + "block.refinedstorage.1024b_fluid_storage_block": "1024B Fluid Storage Block", + "block.refinedstorage.4096b_fluid_storage_block": "4096B Fluid Storage Block", + "block.refinedstorage.creative_fluid_storage_block": "Creative Fluid Storage Block", + "block.refinedstorage.importer": "Importer", + "block.refinedstorage.exporter": "Exporter", + "block.refinedstorage.interface": "Interface", + "block.refinedstorage.external_storage": "External Storage", + "block.refinedstorage.detector": "Detector", + "block.refinedstorage.constructor": "Constructor", + "block.refinedstorage.destructor": "Destructor", + "block.refinedstorage.wireless_transmitter": "Wireless Transmitter", + "block.refinedstorage.storage_monitor": "Storage Monitor", + "block.refinedstorage.network_receiver": "Network Receiver", + "block.refinedstorage.network_transmitter": "Network Transmitter", + "block.refinedstorage.portable_grid": "Portable Grid", + "block.refinedstorage.creative_portable_grid": "Creative Portable Grid", + "block.refinedstorage.security_manager": "Security Manager", + "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", + "gui.refinedstorage.disk_drive.disks": "Disks", + "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", + "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "Sorting direction", + "gui.refinedstorage.grid.sorting.direction.ascending": "Ascending", + "gui.refinedstorage.grid.sorting.direction.descending": "Descending", + "gui.refinedstorage.grid.sorting.type": "Sorting type", + "gui.refinedstorage.grid.sorting.type.quantity": "Quantity", + "gui.refinedstorage.grid.sorting.type.name": "Name", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Last modified", + "gui.refinedstorage.grid.auto_selected": "Auto-selected", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "Synchronization mode", + "gui.refinedstorage.grid.synchronizer.off": "Off", + "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", + "gui.refinedstorage.grid.resource_type": "Resource type", + "gui.refinedstorage.grid.resource_type.all": "All", + "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", + "gui.refinedstorage.crafting_grid.move.network": "Move items to network", + "gui.refinedstorage.crafting_grid.move.inventory": "Move items to inventory", + "gui.refinedstorage.screen_size": "Screen size", + "gui.refinedstorage.screen_size.stretch": "Stretch", + "gui.refinedstorage.screen_size.small": "Small", + "gui.refinedstorage.screen_size.medium": "Medium", + "gui.refinedstorage.screen_size.large": "Large", + "gui.refinedstorage.screen_size.extra_large": "Extra large", + "gui.refinedstorage.detector.mode": "Mode", + "gui.refinedstorage.detector.mode.under": "Emit redstone signal when under the amount", + "gui.refinedstorage.detector.mode.equal": "Emit redstone signal when on the amount", + "gui.refinedstorage.detector.mode.above": "Emit redstone signal when above the amount", + "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", + "gui.refinedstorage.destructor.pickup_items": "Pickup items instead of breaking", + "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "Drop items instead of placing blocks", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%d block(s)", + "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", + "gui.refinedstorage.redstone_mode": "Redstone mode", + "gui.refinedstorage.redstone_mode.ignore": "Ignore", + "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", + "gui.refinedstorage.redstone_mode.high": "High", + "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", + "gui.refinedstorage.redstone_mode.low": "Low", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Scheduling mode", + "gui.refinedstorage.scheduling_mode.default": "Default", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "Random", + "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", + "gui.refinedstorage.priority": "Priority", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Amount", + "gui.refinedstorage.amount.reset": "Reset", + "gui.refinedstorage.amount.set": "Set", + "gui.refinedstorage.filter_mode": "Filter mode", + "gui.refinedstorage.filter_mode.allow": "Allowlist", + "gui.refinedstorage.filter_mode.block": "Blocklist", + "gui.refinedstorage.fuzzy_mode": "Fuzzy mode", + "gui.refinedstorage.fuzzy_mode.on": "On", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Off", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Access mode", + "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Insert only", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Extract only", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Void excess resources", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d block(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unreachable", + "gui.refinedstorage.security_card.permission.reset": "Reset", + "gui.refinedstorage.security_card.permission.modified": "Modified", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicon", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", + "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", + "item.refinedstorage.basic_processor": "Basic Processor", + "item.refinedstorage.improved_processor": "Improved Processor", + "item.refinedstorage.advanced_processor": "Advanced Processor", + "item.refinedstorage.1k_storage_part": "1K Storage Part", + "item.refinedstorage.4k_storage_part": "4K Storage Part", + "item.refinedstorage.16k_storage_part": "16K Storage Part", + "item.refinedstorage.64k_storage_part": "64K Storage Part", + "item.refinedstorage.1k_storage_disk": "1K Storage Disk", + "item.refinedstorage.4k_storage_disk": "4K Storage Disk", + "item.refinedstorage.16k_storage_disk": "16K Storage Disk", + "item.refinedstorage.64k_storage_disk": "64K Storage Disk", + "item.refinedstorage.creative_storage_disk": "Creative Storage Disk", + "item.refinedstorage.64b_fluid_storage_part": "64B Fluid Storage Part", + "item.refinedstorage.256b_fluid_storage_part": "256B Fluid Storage Part", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", + "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", + "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Wrench", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/nl_nl.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/nl_nl.json new file mode 100644 index 000000000..547960d11 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/nl_nl.json @@ -0,0 +1,365 @@ +{ + "itemGroup.refinedstorage.general": "Refined Storage", + "block.refinedstorage.cable": "Cable", + "block.refinedstorage.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", + "block.refinedstorage.disk_drive": "Disk Drive", + "block.refinedstorage.machine_casing": "Machine Casing", + "block.refinedstorage.grid": "Grid", + "block.refinedstorage.crafting_grid": "Crafting Grid", + "block.refinedstorage.controller": "Controller", + "block.refinedstorage.controller.rei_fully_charged": "Fully charged Controller", + "block.refinedstorage.creative_controller": "Creative Controller", + "block.refinedstorage.1k_storage_block": "1K Storage Block", + "block.refinedstorage.4k_storage_block": "4K Storage Block", + "block.refinedstorage.16k_storage_block": "16K Storage Block", + "block.refinedstorage.64k_storage_block": "64K Storage Block", + "block.refinedstorage.creative_storage_block": "Creative Storage Block", + "block.refinedstorage.64b_fluid_storage_block": "64B Fluid Storage Block", + "block.refinedstorage.256b_fluid_storage_block": "256B Fluid Storage Block", + "block.refinedstorage.1024b_fluid_storage_block": "1024B Fluid Storage Block", + "block.refinedstorage.4096b_fluid_storage_block": "4096B Fluid Storage Block", + "block.refinedstorage.creative_fluid_storage_block": "Creative Fluid Storage Block", + "block.refinedstorage.importer": "Importer", + "block.refinedstorage.exporter": "Exporter", + "block.refinedstorage.interface": "Interface", + "block.refinedstorage.external_storage": "External Storage", + "block.refinedstorage.detector": "Detector", + "block.refinedstorage.constructor": "Constructor", + "block.refinedstorage.destructor": "Destructor", + "block.refinedstorage.wireless_transmitter": "Wireless Transmitter", + "block.refinedstorage.storage_monitor": "Storage Monitor", + "block.refinedstorage.network_receiver": "Network Receiver", + "block.refinedstorage.network_transmitter": "Network Transmitter", + "block.refinedstorage.portable_grid": "Portable Grid", + "block.refinedstorage.creative_portable_grid": "Creative Portable Grid", + "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", + "gui.refinedstorage.disk_drive.disks": "Disks", + "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", + "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "Sorting direction", + "gui.refinedstorage.grid.sorting.direction.ascending": "Ascending", + "gui.refinedstorage.grid.sorting.direction.descending": "Descending", + "gui.refinedstorage.grid.sorting.type": "Sorting type", + "gui.refinedstorage.grid.sorting.type.quantity": "Quantity", + "gui.refinedstorage.grid.sorting.type.name": "Name", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Last modified", + "gui.refinedstorage.grid.size": "Size", + "gui.refinedstorage.grid.size.stretch": "Stretch", + "gui.refinedstorage.grid.size.small": "Small", + "gui.refinedstorage.grid.size.medium": "Medium", + "gui.refinedstorage.grid.size.large": "Large", + "gui.refinedstorage.grid.size.extra_large": "Extra large", + "gui.refinedstorage.grid.auto_selected": "Auto-selected", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "Synchronization mode", + "gui.refinedstorage.grid.synchronizer.off": "Off", + "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", + "gui.refinedstorage.grid.synchronizer.jei": "JEI", + "gui.refinedstorage.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.", + "gui.refinedstorage.grid.synchronizer.jei.two_way": "JEI two-way", + "gui.refinedstorage.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text.", + "gui.refinedstorage.grid.synchronizer.rei": "REI", + "gui.refinedstorage.grid.synchronizer.rei.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage.grid.synchronizer.rei.two_way": "REI two-way", + "gui.refinedstorage.grid.synchronizer.rei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text.", + "gui.refinedstorage.grid.resource_type": "Resource type", + "gui.refinedstorage.grid.resource_type.all": "All", + "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", + "gui.refinedstorage.crafting_grid.move.network": "Move items to network", + "gui.refinedstorage.crafting_grid.move.inventory": "Move items to inventory", + "gui.refinedstorage.detector.mode": "Mode", + "gui.refinedstorage.detector.mode.under": "Emit redstone signal when under the amount", + "gui.refinedstorage.detector.mode.equal": "Emit redstone signal when on the amount", + "gui.refinedstorage.detector.mode.above": "Emit redstone signal when above the amount", + "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", + "gui.refinedstorage.destructor.pickup_items": "Pickup items instead of breaking", + "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "Drop items instead of placing blocks", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%d block(s)", + "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", + "gui.refinedstorage.redstone_mode": "Redstone mode", + "gui.refinedstorage.redstone_mode.ignore": "Ignore", + "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", + "gui.refinedstorage.redstone_mode.high": "High", + "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", + "gui.refinedstorage.redstone_mode.low": "Low", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Scheduling mode", + "gui.refinedstorage.scheduling_mode.default": "Default", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "Random", + "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", + "gui.refinedstorage.priority": "Priority", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Amount", + "gui.refinedstorage.amount.reset": "Reset", + "gui.refinedstorage.amount.set": "Set", + "gui.refinedstorage.filter_mode": "Filter mode", + "gui.refinedstorage.filter_mode.allow": "Allowlist", + "gui.refinedstorage.filter_mode.block": "Blocklist", + "gui.refinedstorage.fuzzy_mode": "Fuzzy mode", + "gui.refinedstorage.fuzzy_mode.on": "On", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Off", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Access mode", + "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Insert only", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Extract only", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Void excess resources", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d block(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unreachable", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicon", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", + "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", + "item.refinedstorage.basic_processor": "Basic Processor", + "item.refinedstorage.improved_processor": "Improved Processor", + "item.refinedstorage.advanced_processor": "Advanced Processor", + "item.refinedstorage.1k_storage_part": "1K Storage Part", + "item.refinedstorage.4k_storage_part": "4K Storage Part", + "item.refinedstorage.16k_storage_part": "16K Storage Part", + "item.refinedstorage.64k_storage_part": "64K Storage Part", + "item.refinedstorage.1k_storage_disk": "1K Storage Disk", + "item.refinedstorage.4k_storage_disk": "4K Storage Disk", + "item.refinedstorage.16k_storage_disk": "16K Storage Disk", + "item.refinedstorage.64k_storage_disk": "64K Storage Disk", + "item.refinedstorage.creative_storage_disk": "Creative Storage Disk", + "item.refinedstorage.64b_fluid_storage_part": "64B Fluid Storage Part", + "item.refinedstorage.256b_fluid_storage_part": "256B Fluid Storage Part", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", + "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", + "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Wrench", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "category.refinedstorage.key_bindings": "Refined Storage", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.maxRowsStretch": "Maximum amount of rows when stretched", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.grid.size": "Size", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid.", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json new file mode 100644 index 000000000..6b8a0a065 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pl_pl.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Kabel", + "block.refinedstorage.quartz_enriched_iron_block": "Blok kwarcowego żelaza", + "block.refinedstorage.disk_drive": "Napęd dysku", + "block.refinedstorage.machine_casing": "Osłona maszyny", + "block.refinedstorage.grid": "Terminal", + "block.refinedstorage.crafting_grid": "Terminal rzemieślniczy", + "block.refinedstorage.controller": "Kontroler", + "block.refinedstorage.creative_controller": "Kontroler kreatywny", + "block.refinedstorage.1k_storage_block": "Blok pamięci 1k", + "block.refinedstorage.4k_storage_block": "Blok pamięci 4k", + "block.refinedstorage.16k_storage_block": "Blok pamięci 16k", + "block.refinedstorage.64k_storage_block": "Blok pamięci 64k", + "block.refinedstorage.creative_storage_block": "Kreatywny blok pamięci", + "block.refinedstorage.64b_fluid_storage_block": "Blok pamięci płynów 64B", + "block.refinedstorage.256b_fluid_storage_block": "Blok pamięci płynów 256B", + "block.refinedstorage.1024b_fluid_storage_block": "Blok pamięci płynów 1024B", + "block.refinedstorage.4096b_fluid_storage_block": "Blok pamięci płynów 4096B", + "block.refinedstorage.creative_fluid_storage_block": "Kreatywny blok pamięci płynów", + "block.refinedstorage.importer": "Importer", + "block.refinedstorage.exporter": "Eksporter", + "block.refinedstorage.interface": "Interfejs", + "block.refinedstorage.external_storage": "Zewnętrzny magazyn", + "block.refinedstorage.detector": "Detektor", + "block.refinedstorage.constructor": "Konstruktor", + "block.refinedstorage.destructor": "Destruktor", + "block.refinedstorage.wireless_transmitter": "Nadajnik bezprzewodowy", + "block.refinedstorage.storage_monitor": "Monitor magazynu", + "block.refinedstorage.network_receiver": "Odbiornik sieci", + "block.refinedstorage.network_transmitter": "Nadajnik sieci", + "block.refinedstorage.portable_grid": "Przenośny terminal", + "block.refinedstorage.creative_portable_grid": "Kreatywny przenośny terminal", + "block.refinedstorage.security_manager": "Security Manager", + "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "Gdy to urządzenie jest nieaktywne, sieć magazynowa nie będzie w stanie używać tego urządzenia jako źródła energii.", + "gui.refinedstorage.disk_drive.disks": "Dyski", + "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", + "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "Kierunek sortowania", + "gui.refinedstorage.grid.sorting.direction.ascending": "Rosnąco", + "gui.refinedstorage.grid.sorting.direction.descending": "Malejąco", + "gui.refinedstorage.grid.sorting.type": "Rodzaj sortowania", + "gui.refinedstorage.grid.sorting.type.quantity": "Ilość", + "gui.refinedstorage.grid.sorting.type.name": "Nazwa", + "gui.refinedstorage.grid.sorting.type.id": "Identyfikator", + "gui.refinedstorage.grid.sorting.type.last_modified": "Ostatnia modyfikacja", + "gui.refinedstorage.grid.auto_selected": "Automatycznie zaznaczone", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "Tryb synchronizacji", + "gui.refinedstorage.grid.synchronizer.off": "Wyłączone", + "gui.refinedstorage.grid.synchronizer.off.help": "Nie synchronizuj tekstu pola wyszukiwania.", + "gui.refinedstorage.grid.resource_type": "Typ zasobu", + "gui.refinedstorage.grid.resource_type.all": "Wszystko", + "gui.refinedstorage.grid.resource_type.help": "Filtruj określone typy zasobów.", + "gui.refinedstorage.crafting_grid.move.network": "Przenieś przedmioty do sieci", + "gui.refinedstorage.crafting_grid.move.inventory": "Przenieś przedmioty do ekwipunku", + "gui.refinedstorage.screen_size": "Screen size", + "gui.refinedstorage.screen_size.stretch": "Stretch", + "gui.refinedstorage.screen_size.small": "Small", + "gui.refinedstorage.screen_size.medium": "Medium", + "gui.refinedstorage.screen_size.large": "Large", + "gui.refinedstorage.screen_size.extra_large": "Extra large", + "gui.refinedstorage.detector.mode": "Tryb", + "gui.refinedstorage.detector.mode.under": "Emituj sygnał redstone, kiedy poniżej danej ilości", + "gui.refinedstorage.detector.mode.equal": "Emituj sygnał redstone, kiedy dana ilość", + "gui.refinedstorage.detector.mode.above": "Emituj sygnał redstone, kiedy powyżej danej ilości", + "gui.refinedstorage.detector.filter_help": "Zasób, który powinien zostać wykryty w sieci magazynowania.", + "gui.refinedstorage.destructor.pickup_items": "Ponieść przedmiot, zamiast niszczyć", + "gui.refinedstorage.destructor.filter_help": "Bloki, które mogą lub nie mogą być zniszczone, w zależności od tego, czy urządzenie jest w trybie dozwolonych lub zablokowanych.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Zezwalaj tylko na bloki do sieci magazynowej, które są skonfigurowane w filtrach.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Nie zezwalaj na bloki do sieci magazynowej, które są skonfigurowane w filtrach.", + "gui.refinedstorage.constructor.drop_items": "Upuszczaj przedmioty zamiast stawiania bloków", + "gui.refinedstorage.constructor.filter_help": "Zasób, który zostać postawiony z sieci magazynowania.", + "gui.refinedstorage.interface.filter_help": "Zasoby, które powinny być eksportowane z sieci magazynowania.", + "gui.refinedstorage.exporter.filter_help": "Zasoby, które powinny być eksportowane z sieci magazynowania.", + "gui.refinedstorage.importer.filter_help": "Zasoby, które mogą być importowane z docelowego ekwipunku.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Zezwalaj tylko na zasoby do sieci magazynowej, które są skonfigurowane w filtrach.", + "gui.refinedstorage.importer.filter_mode.block.help": "Nie zezwalaj na zasoby do sieci magazynowej, które są skonfigurowane w filtrach.", + "gui.refinedstorage.wireless_transmitter.distance": "%d blok(ów)", + "gui.refinedstorage.storage_monitor.filter_help": "Zasób do wyświetlenia.", + "gui.refinedstorage.redstone_mode": "Tryb redstone", + "gui.refinedstorage.redstone_mode.ignore": "Ignoruj", + "gui.refinedstorage.redstone_mode.ignore.help": "To urządzenie będzie zawsze aktywne, niezależnie od sygnału redstone.", + "gui.refinedstorage.redstone_mode.high": "Wysoki", + "gui.refinedstorage.redstone_mode.high.help": "To urządzenie będzie aktywne tylko z sygnałem redstone.", + "gui.refinedstorage.redstone_mode.low": "Niski", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Scheduling mode", + "gui.refinedstorage.scheduling_mode.default": "Default", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "Losowy", + "gui.refinedstorage.scheduling_mode.random.help": "Użyj filtru losowego.", + "gui.refinedstorage.priority": "Priorytet", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Ilość", + "gui.refinedstorage.amount.reset": "Reset", + "gui.refinedstorage.amount.set": "Ustaw", + "gui.refinedstorage.filter_mode": "Tryb filtrowania", + "gui.refinedstorage.filter_mode.allow": "Allowlist", + "gui.refinedstorage.filter_mode.block": "Blocklist", + "gui.refinedstorage.fuzzy_mode": "Tryb nieprecyzyjny", + "gui.refinedstorage.fuzzy_mode.on": "Włączono", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Off", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Access mode", + "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Insert only", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Extract only", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Void excess resources", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Brak karty sieci", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d blok(ów)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Nieosiągalny", + "gui.refinedstorage.security_card.permission.reset": "Reset", + "gui.refinedstorage.security_card.permission.modified": "Modified", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Zapewnia sieć magazynowania w energie. Sieć może mieć ich kilka.", + "item.refinedstorage.creative_controller.help": "Zapewnia sieć magazynowania w nieskończoną energię.", + "item.refinedstorage.disk_drive.help": "Akceptuje dyski do zapewnienia przestrzeni dyskowej dla sieci magazynowania.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Umożliwia interakcję z siecią magazynowania.", + "item.refinedstorage.crafting_grid.help": "Umożliwia interakcję z siecią magazynowania, z możliwością tworzenia.", + "item.refinedstorage.importer.help": "Importuj zasoby ze źródła zewnętrznego do sieci magazynowej.", + "item.refinedstorage.exporter.help": "Eksport zasobów z sieci magazynowej do zewnętrznego miejsca przeznaczenia.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Dostarcza pamięć z zewnętrznego źródła.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicon", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", + "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", + "item.refinedstorage.basic_processor": "Basic Processor", + "item.refinedstorage.improved_processor": "Improved Processor", + "item.refinedstorage.advanced_processor": "Advanced Processor", + "item.refinedstorage.1k_storage_part": "1K Storage Part", + "item.refinedstorage.4k_storage_part": "4K Storage Part", + "item.refinedstorage.16k_storage_part": "16K Storage Part", + "item.refinedstorage.64k_storage_part": "64K Storage Part", + "item.refinedstorage.1k_storage_disk": "1K Storage Disk", + "item.refinedstorage.4k_storage_disk": "4K Storage Disk", + "item.refinedstorage.16k_storage_disk": "16K Storage Disk", + "item.refinedstorage.64k_storage_disk": "64K Storage Disk", + "item.refinedstorage.creative_storage_disk": "Creative Storage Disk", + "item.refinedstorage.64b_fluid_storage_part": "64B Fluid Storage Part", + "item.refinedstorage.256b_fluid_storage_part": "256B Fluid Storage Part", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", + "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", + "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Wrench", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "Zewnętrzny magazyn", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Zużycie energii", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Przechowywanie zewnętrzne", + "advancements.refinedstorage.storing_externally.description": "Użyj zewnętrznego magazynu, aby zapewnić sieć w pamięć z zewnętrznego bloku jak skrzynia", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json new file mode 100644 index 000000000..177c318dd --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/pt_br.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Cabo", + "block.refinedstorage.quartz_enriched_iron_block": "Bloco de ferro com quartzo infundido", + "block.refinedstorage.disk_drive": "Disco rígido", + "block.refinedstorage.machine_casing": "Revestimento de máquina", + "block.refinedstorage.grid": "Grade", + "block.refinedstorage.crafting_grid": "Grade de Criação", + "block.refinedstorage.controller": "Controlador", + "block.refinedstorage.creative_controller": "Controlador Criativo", + "block.refinedstorage.1k_storage_block": "Bloco de armazenamento 1k", + "block.refinedstorage.4k_storage_block": "Bloco de armazenamento 4K", + "block.refinedstorage.16k_storage_block": "Bloco de armazenamento 16K", + "block.refinedstorage.64k_storage_block": "Bloco de armazenamento 64K", + "block.refinedstorage.creative_storage_block": "Bloco de armazenamento Criativo", + "block.refinedstorage.64b_fluid_storage_block": "Bloco de Armazenamento de Fluido 64B", + "block.refinedstorage.256b_fluid_storage_block": "Bloco de Armazenamento de Fluido 256B", + "block.refinedstorage.1024b_fluid_storage_block": "Bloco de Armazenamento de Fluido 1024B", + "block.refinedstorage.4096b_fluid_storage_block": "Bloco de armazenamento de fluido 4096B", + "block.refinedstorage.creative_fluid_storage_block": "Bloco de armazenamento de fluido Criativo", + "block.refinedstorage.importer": "Importador", + "block.refinedstorage.exporter": "Exportador", + "block.refinedstorage.interface": "Interface", + "block.refinedstorage.external_storage": "Armazenamento Externo", + "block.refinedstorage.detector": "Detector", + "block.refinedstorage.constructor": "Construtor", + "block.refinedstorage.destructor": "Destrutor", + "block.refinedstorage.wireless_transmitter": "Transmissor sem fio", + "block.refinedstorage.storage_monitor": "Monitor de Armazenamento", + "block.refinedstorage.network_receiver": "Receptor da Rede", + "block.refinedstorage.network_transmitter": "Transmissor de Rede", + "block.refinedstorage.portable_grid": "Grade Portátil", + "block.refinedstorage.creative_portable_grid": "Grade Portátil Criativa", + "block.refinedstorage.security_manager": "Security Manager", + "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "Quando este dispositivo estiver inativo, a rede de armazenamento não poderá usar este dispositivo como fonte de energia.", + "gui.refinedstorage.disk_drive.disks": "Discos", + "gui.refinedstorage.storage.redstone_mode_help": "Quando este dispositivo estiver inativo, o armazenamento contido não estará mais acessível a partir da rede de armazenamento.", + "gui.refinedstorage.storage.filter_help": "Os recursos que podem ou não ser permitidos neste armazenamento, dependendo se o dispositivo está no modo de lista de permissões ou lista de bloqueio.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Sem filtros configurados, nenhum recurso será aceito neste armazenamento.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Só permite recursos neste armazenamento que está configurado nos filtros.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "Sorting direction", + "gui.refinedstorage.grid.sorting.direction.ascending": "Ascending", + "gui.refinedstorage.grid.sorting.direction.descending": "Descending", + "gui.refinedstorage.grid.sorting.type": "Sorting type", + "gui.refinedstorage.grid.sorting.type.quantity": "Quantity", + "gui.refinedstorage.grid.sorting.type.name": "Name", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Last modified", + "gui.refinedstorage.grid.auto_selected": "Auto-selected", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "Synchronization mode", + "gui.refinedstorage.grid.synchronizer.off": "Off", + "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", + "gui.refinedstorage.grid.resource_type": "Resource type", + "gui.refinedstorage.grid.resource_type.all": "All", + "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", + "gui.refinedstorage.crafting_grid.move.network": "Move items to network", + "gui.refinedstorage.crafting_grid.move.inventory": "Move items to inventory", + "gui.refinedstorage.screen_size": "Screen size", + "gui.refinedstorage.screen_size.stretch": "Stretch", + "gui.refinedstorage.screen_size.small": "Small", + "gui.refinedstorage.screen_size.medium": "Medium", + "gui.refinedstorage.screen_size.large": "Large", + "gui.refinedstorage.screen_size.extra_large": "Extra large", + "gui.refinedstorage.detector.mode": "Mode", + "gui.refinedstorage.detector.mode.under": "Emit redstone signal when under the amount", + "gui.refinedstorage.detector.mode.equal": "Emit redstone signal when on the amount", + "gui.refinedstorage.detector.mode.above": "Emit redstone signal when above the amount", + "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", + "gui.refinedstorage.destructor.pickup_items": "Pickup items instead of breaking", + "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "Drop items instead of placing blocks", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%d block(s)", + "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", + "gui.refinedstorage.redstone_mode": "Redstone mode", + "gui.refinedstorage.redstone_mode.ignore": "Ignore", + "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", + "gui.refinedstorage.redstone_mode.high": "High", + "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", + "gui.refinedstorage.redstone_mode.low": "Low", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Scheduling mode", + "gui.refinedstorage.scheduling_mode.default": "Default", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "Random", + "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", + "gui.refinedstorage.priority": "Priority", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Amount", + "gui.refinedstorage.amount.reset": "Reset", + "gui.refinedstorage.amount.set": "Set", + "gui.refinedstorage.filter_mode": "Filter mode", + "gui.refinedstorage.filter_mode.allow": "Allowlist", + "gui.refinedstorage.filter_mode.block": "Blocklist", + "gui.refinedstorage.fuzzy_mode": "Fuzzy mode", + "gui.refinedstorage.fuzzy_mode.on": "On", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Off", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Access mode", + "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Insert only", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Extract only", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Void excess resources", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d block(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unreachable", + "gui.refinedstorage.security_card.permission.reset": "Reset", + "gui.refinedstorage.security_card.permission.modified": "Modified", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicon", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", + "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", + "item.refinedstorage.basic_processor": "Basic Processor", + "item.refinedstorage.improved_processor": "Improved Processor", + "item.refinedstorage.advanced_processor": "Advanced Processor", + "item.refinedstorage.1k_storage_part": "1K Storage Part", + "item.refinedstorage.4k_storage_part": "4K Storage Part", + "item.refinedstorage.16k_storage_part": "16K Storage Part", + "item.refinedstorage.64k_storage_part": "64K Storage Part", + "item.refinedstorage.1k_storage_disk": "1K Storage Disk", + "item.refinedstorage.4k_storage_disk": "4K Storage Disk", + "item.refinedstorage.16k_storage_disk": "16K Storage Disk", + "item.refinedstorage.64k_storage_disk": "64K Storage Disk", + "item.refinedstorage.creative_storage_disk": "Creative Storage Disk", + "item.refinedstorage.64b_fluid_storage_part": "64B Fluid Storage Part", + "item.refinedstorage.256b_fluid_storage_part": "256B Fluid Storage Part", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", + "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", + "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Wrench", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json new file mode 100644 index 000000000..a15f160d2 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/ru_ru.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Кабель", + "block.refinedstorage.quartz_enriched_iron_block": "Блок обогащённого кварцем железа", + "block.refinedstorage.disk_drive": "Дисковый привод", + "block.refinedstorage.machine_casing": "Корпус механизма", + "block.refinedstorage.grid": "Терминал", + "block.refinedstorage.crafting_grid": "Терминал создания", + "block.refinedstorage.controller": "Контроллер", + "block.refinedstorage.creative_controller": "Творческий контроллер", + "block.refinedstorage.1k_storage_block": "Блок хранения 1k", + "block.refinedstorage.4k_storage_block": "Блок хранения 4k", + "block.refinedstorage.16k_storage_block": "Блок хранения 16k", + "block.refinedstorage.64k_storage_block": "Блок хранения 64k", + "block.refinedstorage.creative_storage_block": "Творческий блок хранения", + "block.refinedstorage.64b_fluid_storage_block": "Блок хранения жидкости 64b", + "block.refinedstorage.256b_fluid_storage_block": "Блок хранения жидкости 256b", + "block.refinedstorage.1024b_fluid_storage_block": "Блок хранения жидкости 1024b", + "block.refinedstorage.4096b_fluid_storage_block": "Блок хранения жидкости 4096b", + "block.refinedstorage.creative_fluid_storage_block": "Творческий блок хранения жидкости", + "block.refinedstorage.importer": "Шина импорта", + "block.refinedstorage.exporter": "Шина экспорта", + "block.refinedstorage.interface": "Интерфейс", + "block.refinedstorage.external_storage": "Шина внешнего хранения", + "block.refinedstorage.detector": "Детектор", + "block.refinedstorage.constructor": "Шина формирования", + "block.refinedstorage.destructor": "Шина разрушения", + "block.refinedstorage.wireless_transmitter": "Беспроводной передатчик", + "block.refinedstorage.storage_monitor": "Монитор хранения", + "block.refinedstorage.network_receiver": "Сетевой приёмник", + "block.refinedstorage.network_transmitter": "Сетевой передатчик", + "block.refinedstorage.portable_grid": "Переносной терминал", + "block.refinedstorage.creative_portable_grid": "Творческий переносной терминал", + "block.refinedstorage.security_manager": "Диспетчер безопасности", + "block.refinedstorage.security_manager.help": "Когда это устройство активно, оно по умолчанию защищает сеть и блокирует все операции. Начните добавлять карты безопасности, чтобы разрешить или запретить определённые операции для игрока.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", + "gui.refinedstorage.disk_drive.disks": "Диски", + "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", + "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "Порядок сортировки", + "gui.refinedstorage.grid.sorting.direction.ascending": "По возрастанию", + "gui.refinedstorage.grid.sorting.direction.descending": "По убыванию", + "gui.refinedstorage.grid.sorting.type": "Тип сортировки", + "gui.refinedstorage.grid.sorting.type.quantity": "Кол-во", + "gui.refinedstorage.grid.sorting.type.name": "Название", + "gui.refinedstorage.grid.sorting.type.id": "Идентификатор", + "gui.refinedstorage.grid.sorting.type.last_modified": "Last modified", + "gui.refinedstorage.grid.auto_selected": "Auto-selected", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "Режим синхронизации", + "gui.refinedstorage.grid.synchronizer.off": "Выкл.", + "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", + "gui.refinedstorage.grid.resource_type": "Resource type", + "gui.refinedstorage.grid.resource_type.all": "All", + "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", + "gui.refinedstorage.crafting_grid.move.network": "Move items to network", + "gui.refinedstorage.crafting_grid.move.inventory": "Move items to inventory", + "gui.refinedstorage.screen_size": "Screen size", + "gui.refinedstorage.screen_size.stretch": "Stretch", + "gui.refinedstorage.screen_size.small": "Small", + "gui.refinedstorage.screen_size.medium": "Medium", + "gui.refinedstorage.screen_size.large": "Large", + "gui.refinedstorage.screen_size.extra_large": "Extra large", + "gui.refinedstorage.detector.mode": "Режим", + "gui.refinedstorage.detector.mode.under": "Emit redstone signal when under the amount", + "gui.refinedstorage.detector.mode.equal": "Emit redstone signal when on the amount", + "gui.refinedstorage.detector.mode.above": "Emit redstone signal when above the amount", + "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", + "gui.refinedstorage.destructor.pickup_items": "Pickup items instead of breaking", + "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "Drop items instead of placing blocks", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%d block(s)", + "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", + "gui.refinedstorage.redstone_mode": "Redstone mode", + "gui.refinedstorage.redstone_mode.ignore": "Ignore", + "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", + "gui.refinedstorage.redstone_mode.high": "High", + "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", + "gui.refinedstorage.redstone_mode.low": "Low", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Scheduling mode", + "gui.refinedstorage.scheduling_mode.default": "По умолчанию", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "Random", + "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", + "gui.refinedstorage.priority": "Priority", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Amount", + "gui.refinedstorage.amount.reset": "Reset", + "gui.refinedstorage.amount.set": "Set", + "gui.refinedstorage.filter_mode": "Режим фильтрации", + "gui.refinedstorage.filter_mode.allow": "Allowlist", + "gui.refinedstorage.filter_mode.block": "Blocklist", + "gui.refinedstorage.fuzzy_mode": "Fuzzy mode", + "gui.refinedstorage.fuzzy_mode.on": "On", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Выкл.", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Access mode", + "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Insert only", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Extract only", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Void excess resources", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d block(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unreachable", + "gui.refinedstorage.security_card.permission.reset": "Reset", + "gui.refinedstorage.security_card.permission.modified": "Modified", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Должно ли это устройство передавать весь сигнал входящей сети как есть. Выключите это, чтобы выборочно дать доступ к компонентам в выходной сети.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicon", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", + "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", + "item.refinedstorage.basic_processor": "Базовый процессор", + "item.refinedstorage.improved_processor": "Улучшенный процессор", + "item.refinedstorage.advanced_processor": "Продвинутый процессор", + "item.refinedstorage.1k_storage_part": "Часть хранения на 1 Кбайт", + "item.refinedstorage.4k_storage_part": "Часть хранения на 4 Кбайт", + "item.refinedstorage.16k_storage_part": "Часть хранения на 16 Кбайт", + "item.refinedstorage.64k_storage_part": "Часть хранения на 64 Кбайт", + "item.refinedstorage.1k_storage_disk": "Диск хранения на 1 Кбайт", + "item.refinedstorage.4k_storage_disk": "Диск хранения на 4 Кбайт", + "item.refinedstorage.16k_storage_disk": "Диск хранения на 16 Кбайт", + "item.refinedstorage.64k_storage_disk": "Диск хранения на 64 Кбайт", + "item.refinedstorage.creative_storage_disk": "Диск хранения творческого режима", + "item.refinedstorage.64b_fluid_storage_part": "Часть для хранения жидкости на 64 байт", + "item.refinedstorage.256b_fluid_storage_part": "Часть для хранения жидкости на 256 байт", + "item.refinedstorage.1024b_fluid_storage_part": "Часть для хранения жидкости на 1024 байт", + "item.refinedstorage.4096b_fluid_storage_part": "Часть для хранения жидкости на 4096 байт", + "item.refinedstorage.64b_fluid_storage_disk": "Диск для хранения жидкости на 64 байт", + "item.refinedstorage.256b_fluid_storage_disk": "Диск для хранения жидкости на 256 байт", + "item.refinedstorage.1024b_fluid_storage_disk": "Диск для хранения жидкости на 1024 байт", + "item.refinedstorage.4096b_fluid_storage_disk": "Диск для хранения жидкости на 4096 байт", + "item.refinedstorage.creative_fluid_storage_disk": "Диск для хранения жидкости творческого режима", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Гаечный ключ", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Улучшение", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "В экспортировщике экспортируется только в том случае, если количество в целевом месте меньше, чем указано в улучшении. В импортировщике импортируется только в том случае, если количество в целевом месте больше, чем указано в улучшении. Используйте предмет для настройки.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json new file mode 100644 index 000000000..5dc8e6602 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_cn.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "精致存储", + "block.refinedstorage.cable": "线缆", + "block.refinedstorage.quartz_enriched_iron_block": "富石英铁块", + "block.refinedstorage.disk_drive": "磁盘驱动器", + "block.refinedstorage.machine_casing": "机器外壳", + "block.refinedstorage.grid": "终端", + "block.refinedstorage.crafting_grid": "合成终端", + "block.refinedstorage.controller": "控制器", + "block.refinedstorage.creative_controller": "创造控制器", + "block.refinedstorage.1k_storage_block": "1K 存储方块", + "block.refinedstorage.4k_storage_block": "4K 存储方块", + "block.refinedstorage.16k_storage_block": "16K 存储方块", + "block.refinedstorage.64k_storage_block": "64K 存储方块", + "block.refinedstorage.creative_storage_block": "创造存储方块", + "block.refinedstorage.64b_fluid_storage_block": "64B 流体存储方块", + "block.refinedstorage.256b_fluid_storage_block": "256B 流体存储方块", + "block.refinedstorage.1024b_fluid_storage_block": "1024B 流体存储方块", + "block.refinedstorage.4096b_fluid_storage_block": "4096B 流体存储方块", + "block.refinedstorage.creative_fluid_storage_block": "创造流体存储方块", + "block.refinedstorage.importer": "输入总线", + "block.refinedstorage.exporter": "输出总线", + "block.refinedstorage.interface": "物品传输接口", + "block.refinedstorage.external_storage": "外部存储总线", + "block.refinedstorage.detector": "网络物品检测器", + "block.refinedstorage.constructor": "成型面板", + "block.refinedstorage.destructor": "破坏面板", + "block.refinedstorage.wireless_transmitter": "无线访问点", + "block.refinedstorage.storage_monitor": "存储监控器", + "block.refinedstorage.network_receiver": "网络接收器", + "block.refinedstorage.network_transmitter": "网络变送器", + "block.refinedstorage.portable_grid": "便携式终端", + "block.refinedstorage.creative_portable_grid": "创造模式便携式终端", + "block.refinedstorage.security_manager": "权限管理器", + "block.refinedstorage.security_manager.help": "当此设备处于激活状态时会默认阻止所有操作来保护网络。添加安全卡以配置特定玩家对于特定操作的权限", + "block.refinedstorage.relay": "中继器", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "当此设备处于非激活状态时，存储网络将无法将此设备用作能源来源。", + "gui.refinedstorage.disk_drive.disks": "磁盘", + "gui.refinedstorage.storage.redstone_mode_help": "当此设备处于非激活状态时，其中的存储空间将无法从存储网络内访问。", + "gui.refinedstorage.storage.filter_help": "这些资源可能会或可能不会被允许存储，具体取决于设备是否处于白名单或黑名单模式。", + "gui.refinedstorage.storage.filter_mode.empty_warning": "在没有配置任何过滤器的情况下，此存储将不接受任何资源。", + "gui.refinedstorage.storage.filter_mode.allow.help": "只允许过滤器配置中的资源进入此存储。", + "gui.refinedstorage.storage.filter_mode.block.help": "禁止过滤器配置中的资源进入此存储。", + "gui.refinedstorage.grid.sorting.direction": "排序方式", + "gui.refinedstorage.grid.sorting.direction.ascending": "升序", + "gui.refinedstorage.grid.sorting.direction.descending": "降序", + "gui.refinedstorage.grid.sorting.type": "排序按照", + "gui.refinedstorage.grid.sorting.type.quantity": "数量", + "gui.refinedstorage.grid.sorting.type.name": "名字", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "最后修改时间", + "gui.refinedstorage.grid.auto_selected": "自动选取", + "gui.refinedstorage.grid.auto_selected.help": "在打开终端时是否自动选择搜索框。", + "gui.refinedstorage.grid.synchronizer": "同步模式", + "gui.refinedstorage.grid.synchronizer.off": "关闭", + "gui.refinedstorage.grid.synchronizer.off.help": "不同步搜索框文本。", + "gui.refinedstorage.grid.resource_type": "存储通道", + "gui.refinedstorage.grid.resource_type.all": "全部", + "gui.refinedstorage.grid.resource_type.help": "从特定的存储通道中过滤资源。", + "gui.refinedstorage.crafting_grid.move.network": "将物品移动到网络。", + "gui.refinedstorage.crafting_grid.move.inventory": "将物品移动到物品栏。", + "gui.refinedstorage.screen_size": "界面大小", + "gui.refinedstorage.screen_size.stretch": "自适应", + "gui.refinedstorage.screen_size.small": "小", + "gui.refinedstorage.screen_size.medium": "中", + "gui.refinedstorage.screen_size.large": "大", + "gui.refinedstorage.screen_size.extra_large": "特大", + "gui.refinedstorage.detector.mode": "模式", + "gui.refinedstorage.detector.mode.under": "物品数量小于输入数量时输出信号。", + "gui.refinedstorage.detector.mode.equal": "物品数量等于输入数量时输出信号。", + "gui.refinedstorage.detector.mode.above": "物品数量大于于输入数量时输出信号。", + "gui.refinedstorage.detector.filter_help": "应该在存储网络中检测的资源。", + "gui.refinedstorage.destructor.pickup_items": "拾取物品而不是破坏。", + "gui.refinedstorage.destructor.filter_help": "这些方块被破坏与否，具体取决于设备是否处于白名单或黑名单模式。", + "gui.refinedstorage.destructor.filter_mode.allow.help": "只允许过滤器配置中的方块进入存储网络。", + "gui.refinedstorage.destructor.filter_mode.block.help": "禁止过滤器配置中的方块进入存储网络。", + "gui.refinedstorage.constructor.drop_items": "丢出物品而不是放置方块", + "gui.refinedstorage.constructor.filter_help": "应该从存储网络中放置的资源。", + "gui.refinedstorage.interface.filter_help": "应该从存储网络导出的资源。", + "gui.refinedstorage.exporter.filter_help": "应该从存储网络导出的资源。", + "gui.refinedstorage.importer.filter_help": "可能从目标物品栏导入的资源。", + "gui.refinedstorage.importer.filter_mode.allow.help": "只允许过滤器配置中的资源进入存储网络。", + "gui.refinedstorage.importer.filter_mode.block.help": "禁止过滤器配置中的资源进入存储网络。", + "gui.refinedstorage.wireless_transmitter.distance": "%d 方块", + "gui.refinedstorage.storage_monitor.filter_help": "要显示的资源。", + "gui.refinedstorage.redstone_mode": "红石模式", + "gui.refinedstorage.redstone_mode.ignore": "忽略红石信号", + "gui.refinedstorage.redstone_mode.ignore.help": "此设备将始终处于激活状态，不受红石信号影响。", + "gui.refinedstorage.redstone_mode.high": "有红石信号时工作", + "gui.refinedstorage.redstone_mode.high.help": "此设备仅在有红石信号时才会处于激活状态。", + "gui.refinedstorage.redstone_mode.low": "无红石信号时工作", + "gui.refinedstorage.redstone_mode.low.help": "此设备仅在没有红石信号时才会处于激活状态。", + "gui.refinedstorage.scheduling_mode": "调度模式", + "gui.refinedstorage.scheduling_mode.default": "默认", + "gui.refinedstorage.scheduling_mode.default.help": "使用第一个可用的过滤器。", + "gui.refinedstorage.scheduling_mode.round_robin": "轮询", + "gui.refinedstorage.scheduling_mode.round_robin.help": "轮询使用每个过滤器。", + "gui.refinedstorage.scheduling_mode.random": "随机", + "gui.refinedstorage.scheduling_mode.random.help": "使用随机过滤器。", + "gui.refinedstorage.priority": "优先级", + "gui.refinedstorage.priority.storage_help": "存储网络存入或提取资源的顺序，从高到低。", + "gui.refinedstorage.amount": "物品数量", + "gui.refinedstorage.amount.reset": "重置", + "gui.refinedstorage.amount.set": "设置", + "gui.refinedstorage.filter_mode": "过滤模式", + "gui.refinedstorage.filter_mode.allow": "白名单", + "gui.refinedstorage.filter_mode.block": "黑名单", + "gui.refinedstorage.fuzzy_mode": "模糊模式", + "gui.refinedstorage.fuzzy_mode.on": "开启", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "精确匹配白名单或黑名单的过滤器。", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "精确匹配过滤器。", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "从存储网络提取时精确匹配过滤器。", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "从源提取时精确匹配过滤器。", + "gui.refinedstorage.fuzzy_mode.off": "关闭", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "在白名单或黑名单的过滤器中匹配时不比较NBT标签。", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "在匹配过滤器时不比较NBT标签。", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "从存储网络提取时，在过滤器中匹配时不比较NBT标签。", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "从源提取时，在过滤器中匹配时不比较NBT标签。", + "gui.refinedstorage.access_mode": "访问模式", + "gui.refinedstorage.access_mode.insert_extract": "插入和提取", + "gui.refinedstorage.access_mode.insert_extract.help": "存储网络可以插入或从此存储中提取。", + "gui.refinedstorage.access_mode.insert": "仅插入", + "gui.refinedstorage.access_mode.insert.help": "存储网络只能插入此存储。包含的资源仍然可在终端中看到。", + "gui.refinedstorage.access_mode.extract": "仅提取", + "gui.refinedstorage.access_mode.extract.help": "存储网络只能从此存储中提取。", + "gui.refinedstorage.void_excess": "销毁过量资源", + "gui.refinedstorage.void_excess.help": "当销毁过量模式被打开且存储已满时，将继续接受资源并将其直接销毁。", + "gui.refinedstorage.void_excess.allowlist_warning": "销毁过量仅在白名单模式下才会生效", + "gui.refinedstorage.upgrade_slot": "空升级槽", + "gui.refinedstorage.filter_slot.empty_filter": "空过滤器", + "gui.refinedstorage.filter_slot.left_click_for": "左键点击", + "gui.refinedstorage.filter_slot.right_click_for": "右键点击", + "gui.refinedstorage.filter_slot.click_to_clear": "点击清除", + "gui.refinedstorage.regulator_upgrade.filter_help": "目标中应调节的资源。", + "gui.refinedstorage.network_transmitter.status.inactive": "未激活", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "缺少网络卡", + "gui.refinedstorage.network_transmitter.status.transmitting": "传输中：%d个方块", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "无法访问", + "gui.refinedstorage.security_card.permission.reset": "重置", + "gui.refinedstorage.security_card.permission.modified": "已修改", + "gui.refinedstorage.security_manager.redstone_mode_help": "当此设备处于未激活状态时，将不能保护网络。", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "后备安全卡卡槽", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "在此槽位加入后备权限卡来设置没有单独使用权限卡配置的玩家的权限。默认情况下所有操作均被阻止。", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "为存储网络提供能量。一个存储网络中允许包含多个。", + "item.refinedstorage.creative_controller.help": "为存储网络提供无限能源。", + "item.refinedstorage.disk_drive.help": "接受存储磁盘，为存储网络提供存储空间。", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "允许与存储网络交互。", + "item.refinedstorage.crafting_grid.help": "允许与存储网络交互，并具有合成能力。", + "item.refinedstorage.importer.help": "从外部源导入资源到存储网络。", + "item.refinedstorage.exporter.help": "从存储网络将资源导出到外部目标。", + "item.refinedstorage.interface.help": "充当输入总线和输出总线的结合。", + "item.refinedstorage.external_storage.help": "为存储网络提供来自外部源的存储。", + "item.refinedstorage.detector.help": "如果存储网络包含等于、大于或小于给定数量的资源，则发出红石信号。", + "item.refinedstorage.constructor.help": "从存储网络中放置方块到世界中。", + "item.refinedstorage.destructor.help": "从世界中销毁方块并将其放入存储网络。", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "富石英铁", + "item.refinedstorage.processor_binding": "处理器绑定", + "item.refinedstorage.silicon": "硅", + "item.refinedstorage.raw_basic_processor": "原始基础处理器", + "item.refinedstorage.raw_improved_processor": "原始进阶处理器", + "item.refinedstorage.raw_advanced_processor": "原始高级处理器", + "item.refinedstorage.basic_processor": "基础处理器", + "item.refinedstorage.improved_processor": "进阶处理器", + "item.refinedstorage.advanced_processor": "高级处理器", + "item.refinedstorage.1k_storage_part": "1K 存储元件", + "item.refinedstorage.4k_storage_part": "4K 存储元件", + "item.refinedstorage.16k_storage_part": "16K 存储元件", + "item.refinedstorage.64k_storage_part": "64K 存储元件", + "item.refinedstorage.1k_storage_disk": "1K 存储磁盘", + "item.refinedstorage.4k_storage_disk": "4K 存储磁盘", + "item.refinedstorage.16k_storage_disk": "16K 存储磁盘", + "item.refinedstorage.64k_storage_disk": "64K 存储磁盘", + "item.refinedstorage.creative_storage_disk": "创造存储磁盘", + "item.refinedstorage.64b_fluid_storage_part": "64B 流体存储原件", + "item.refinedstorage.256b_fluid_storage_part": "256B 流体存储原件", + "item.refinedstorage.1024b_fluid_storage_part": "1024B 流体存储原件", + "item.refinedstorage.4096b_fluid_storage_part": "4096B 流体存储原件", + "item.refinedstorage.64b_fluid_storage_disk": "64B 流体存储磁盘", + "item.refinedstorage.256b_fluid_storage_disk": "256B 流体存储磁盘", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B 流体存储磁盘", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B 流体存储磁盘", + "item.refinedstorage.creative_fluid_storage_disk": "创造流体存储磁盘", + "item.refinedstorage.storage_housing": "磁盘外壳", + "item.refinedstorage.construction_core": "成型核心", + "item.refinedstorage.destruction_core": "破坏核心", + "item.refinedstorage.wrench": "扳手", + "item.refinedstorage.wrench.helper": "用于旋转方块，或按住SHIFT并使用以拆解精致存储方块。", + "item.refinedstorage.upgrade": "空白升级", + "item.refinedstorage.speed_upgrade": "速度升级", + "item.refinedstorage.stack_upgrade": "堆叠升级", + "item.refinedstorage.silk_touch_upgrade": "精准采集升级", + "item.refinedstorage.fortune_upgrade.1": "时运 I 升级", + "item.refinedstorage.fortune_upgrade.2": "时运 II 升级", + "item.refinedstorage.fortune_upgrade.3": "时运 III 升级", + "item.refinedstorage.regulator_upgrade": "调节器升级", + "item.refinedstorage.regulator_upgrade.help": "在输出总线中，仅在目标中的数量少于升级中配置的数量时导出。在输入总线中，仅在目标中的数量大于升级中配置的数量时导入。使用物品进行配置。", + "item.refinedstorage.range_upgrade": "范围升级", + "item.refinedstorage.creative_range_upgrade": "创造范围升级", + "item.refinedstorage.wireless_grid": "无线终端", + "item.refinedstorage.creative_wireless_grid": "创造无线终端", + "item.refinedstorage.wireless_transmitter.help": "为诸如无线终端之类的物品提供无线网络访问。一个区域内允许放置多个以扩大覆盖范围。", + "item.refinedstorage.network_item.unbound": "未绑定。", + "item.refinedstorage.network_item.unbound.help": "对任一存储网络设备使用以进行绑定。", + "item.refinedstorage.network_item.bound_to": "绑定到 %d, %d, %d。", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "你的库存中存在多个 %s，无法使用快捷方式打开。", + "item.refinedstorage.network_item.cannot_open_because_not_found": "你的库存中没有任何 %s。", + "item.refinedstorage.configuration_card": "配置卡", + "item.refinedstorage.configuration_card.empty": "空。", + "item.refinedstorage.configuration_card.configured": "包含 %s 的配置。", + "item.refinedstorage.configuration_card.copied_configuration": "已复制 %s 的配置。", + "item.refinedstorage.configuration_card.cleared_configuration": "已清除配置。", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "无法将配置卡应用于不同类型的设备。它配置为 %s。", + "item.refinedstorage.configuration_card.applied_configuration": "已应用配置。", + "item.refinedstorage.configuration_card.empty_help": "在潜行状态下对存储网络设备使用，以将其配置和升级复制到卡上。", + "item.refinedstorage.configuration_card.configured_help": "在蹲下的同时用于目标存储网络设备，以传输配置和升级。蹲下时使用以清除。", + "item.refinedstorage.network_card": "网络卡", + "item.refinedstorage.network_card.unbound_help": "潜行状态下对网络接收器使用", + "item.refinedstorage.network_card.unbound": "未绑定。", + "item.refinedstorage.network_card.bound_help": "插入到网络变送器中。在潜行状态下使用以清除绑定。", + "item.refinedstorage.network_card.bound": "绑定到 %d, %d, %d 在 %s 中。", + "item.refinedstorage.security_card": "权限卡", + "item.refinedstorage.security_card.cleared_configuration": "已清除配置。", + "item.refinedstorage.security_card.unbound": "未绑定。", + "item.refinedstorage.security_card.unbound.help": "右键使用以配置并绑定到当前玩家", + "item.refinedstorage.security_card.bound": "绑定至：%s", + "item.refinedstorage.security_card.bound.help": "右键使用以进行配置，潜行状态下使用以清除当前配置与绑定", + "item.refinedstorage.fallback_security_card": "后备权限卡", + "item.refinedstorage.fallback_security_card.help": "如果权限管理器中没有对应玩家的权限卡则将后备权限卡的权限配置应用于该玩家。右键使用以进行配置，潜行状态使用以清除当前配置", + "misc.refinedstorage.stored": "存储：%s", + "misc.refinedstorage.stored_with_capacity": "存储：%s / %s (%d%%)", + "misc.refinedstorage.total": "总数：%d", + "misc.refinedstorage.last_modified.just_now": "刚刚由 %s 修改", + "misc.refinedstorage.last_modified.second": "%d 秒前由 %s 修改", + "misc.refinedstorage.last_modified.seconds": "%d 秒前由 %s 修改", + "misc.refinedstorage.last_modified.minute": "%d 分钟前由 %s 修改", + "misc.refinedstorage.last_modified.minutes": "%d 分钟前由 %s 修改", + "misc.refinedstorage.last_modified.hour": "%d 小时前由 %s 修改", + "misc.refinedstorage.last_modified.hours": "%d 小时前由 %s 修改", + "misc.refinedstorage.last_modified.day": "%d 天前由 %s 修改", + "misc.refinedstorage.last_modified.days": "%d 天前由 %s 修改", + "misc.refinedstorage.last_modified.week": "%d 周前由 %s 修改", + "misc.refinedstorage.last_modified.weeks": "%d 周前由 %s 修改", + "misc.refinedstorage.last_modified.year": "%d 年前由 %s 修改", + "misc.refinedstorage.last_modified.years": "%d 年前由 %s 修改", + "misc.refinedstorage.resource_type.item": "物品", + "misc.refinedstorage.resource_type.fluid": "流体", + "misc.refinedstorage.press_shift_for_help": "按下 SHIFT 获取帮助", + "misc.refinedstorage.no_permission": "无权限", + "misc.refinedstorage.no_permission.open": "你没有打开 %s 的权限", + "misc.refinedstorage.no_permission.insert": "你没有存储物品的权限", + "misc.refinedstorage.no_permission.extract": "你没有拿取物品的权限", + "misc.refinedstorage.no_permission.build.place": "你没有在这里放置 %s 的权限", + "misc.refinedstorage.no_permission.build.break": "你没有破坏 %s 的权限", + "misc.refinedstorage.no_permission.build.rotate": "你没有旋转 %s 的权限", + "misc.refinedstorage.no_permission.build.dismantle": "你没有拆除 %s 的权限", + "key.refinedstorage.focus_search_bar": "聚焦搜索栏", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "清除合成终端矩阵到网络", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "清除合成终端矩阵到库存", + "key.refinedstorage.open_wireless_grid": "打开无线终端", + "refinedstorage.subtitle.wrench": "使用扳手", + "permission.refinedstorage.insert": "存入", + "permission.refinedstorage.insert.description": "玩家是否可以向存储网络中存入资源", + "permission.refinedstorage.extract": "取出", + "permission.refinedstorage.extract.description": "玩家是否可以从存储网络中取出物品", + "permission.refinedstorage.autocrafting": "自动合成", + "permission.refinedstorage.autocrafting.description": "玩家是否可以开始，取消或者查看自动合成任务", + "permission.refinedstorage.open": "打开", + "permission.refinedstorage.open.description": "玩家是否可以打开网络中设备的使用界面", + "permission.refinedstorage.build": "建造", + "permission.refinedstorage.build.description": "玩家是否可以在网络中添加或者移除设备", + "permission.refinedstorage.security": "权限", + "permission.refinedstorage.security.description": "玩家是否可以管理网络的权限设置", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "精致存储 2", + "text.autoconfig.refinedstorage.option.smoothScrolling": "平滑滚动", + "text.autoconfig.refinedstorage.option.screenSize": "界面大小", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "截面尺寸拉伸时的最大显示行数", + "text.autoconfig.refinedstorage.option.grid": "终端", + "text.autoconfig.refinedstorage.option.grid.largeFont": "大字体", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "按住 SHIFT 时阻止排序", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "详细提示", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "记住搜索查询", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "自动选择搜索框", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "同步器", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "存储通道类型", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "排序方向", + "text.autoconfig.refinedstorage.option.grid.sortingType": "排序类型", + "text.autoconfig.refinedstorage.option.craftingGrid": "合成终端", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "合成矩阵关闭行为", + "text.autoconfig.refinedstorage.option.controller": "控制器", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "能量容量", + "text.autoconfig.refinedstorage.option.cable": "电缆", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.diskDrive": "磁盘驱动器", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "每个磁盘的耗能", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "存储方块", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K 能源", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K 能源", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K 能源", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K 能源", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "创造能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "流体存储块", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B 能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B 能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B 能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B 能源", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "创造能源", + "text.autoconfig.refinedstorage.option.importer": "输入总线", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.exporter": "输出总线", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.detector": "检测器", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.constructor": "成型面板", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.destructor": "破坏面板", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.upgrade": "升级", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "速度升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "堆叠升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "时运 I 升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "时运 II 升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "时运 III 升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "精准采集升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "调节器升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "范围升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "创造范围升级耗能", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "范围升级范围", + "text.autoconfig.refinedstorage.option.iface": "物品传输接口", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.externalStorage": "外部存储", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.wirelessGrid": "无线网格", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "能量容量", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "打开耗能", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "插入耗能", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "取出耗能", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "无线访问点", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "基础范围", + "text.autoconfig.refinedstorage.option.storageMonitor": "存储监控器", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.networkReceiver": "网络接收器", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.networkTransmitter": "网络发送器", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.portableGrid": "便携式终端", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "能量容量", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "打开耗能", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "插入耗能", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "取出耗能", + "text.autoconfig.refinedstorage.option.securityCard": "权限卡", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "后备权限卡", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.securityManager": "权限管理器", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "耗能", + "text.autoconfig.refinedstorage.option.relay": "中继器", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "输入网络耗能", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "在网络中使用一个或多个控制器为其提供能量", + "advancements.refinedstorage.connecting": "连接", + "advancements.refinedstorage.connecting.description": "使用电缆将设备连接在一起，或放置时使设备贴在一起", + "advancements.refinedstorage.drives": "驱动器", + "advancements.refinedstorage.drives.description": "合成一个磁盘驱动器，以便能够收纳您的存储磁盘", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "存储物品", + "advancements.refinedstorage.storing_items.description": "合成一个存储磁盘并将其放入磁盘驱动器中", + "advancements.refinedstorage.viewing_your_storage": "查看您的存储", + "advancements.refinedstorage.viewing_your_storage.description": "合成一个终端以与您的存储互动", + "advancements.refinedstorage.upgrading_your_grid": "升级您的终端", + "advancements.refinedstorage.upgrading_your_grid.description": "将您的终端升级为合成终端以获得制作能力", + "advancements.refinedstorage.storing_fluids": "存储流体", + "advancements.refinedstorage.storing_fluids.description": "合成流体存储磁盘并将其放入磁盘驱动器中", + "advancements.refinedstorage.importing": "输入", + "advancements.refinedstorage.importing.description": "使用输入总线将资源带入存储网络", + "advancements.refinedstorage.exporting": "输出", + "advancements.refinedstorage.exporting.description": "使用输出总线将资源从存储网络中取出", + "advancements.refinedstorage.upgrading": "升级", + "advancements.refinedstorage.upgrading.description": "合成一个升级以改善各种设备", + "advancements.refinedstorage.interface_to_the_world": "通往世界的接口", + "advancements.refinedstorage.interface_to_the_world.description": "使用物品传输接口同时导出和导入物品", + "advancements.refinedstorage.storing_externally": "外部存储", + "advancements.refinedstorage.storing_externally.description": "使用外部存储总线从外部方块（如箱子）提供网络存储", + "advancements.refinedstorage.detecting": "检测", + "advancements.refinedstorage.detecting.description": "使用红石检测存储网络内的资源", + "advancements.refinedstorage.construction": "成型", + "advancements.refinedstorage.construction.description": "使用构造器将方块从存储网络中放入世界", + "advancements.refinedstorage.destruction": "破坏", + "advancements.refinedstorage.destruction.description": "使用破坏器将世界中的方块放入存储网络", + "advancements.refinedstorage.wireless": "无线", + "advancements.refinedstorage.wireless.description": "使用无线终端远程访问你的资源", + "advancements.refinedstorage.better_than_a_barrel": "比桶更好", + "advancements.refinedstorage.better_than_a_barrel.description": "合成存储监视器以查看、插入或提取存储网络中的资源", + "advancements.refinedstorage.no_cables_required": "无需电缆", + "advancements.refinedstorage.no_cables_required.description": "通过使用网络变送器、网络接收器和网络卡，在不使用电缆的情况下添加额外组件到你的存储网络", + "advancements.refinedstorage.portable_storage": "便携式存储", + "advancements.refinedstorage.portable_storage.description": "合成一个便携式终端，在不需要连接到存储网络的情况下也可以访问磁盘内容。", + "advancements.refinedstorage.security": "权限", + "advancements.refinedstorage.security.description": "用权限管理器和权限卡来保护你的存储网络", + "advancements.refinedstorage.conditional_connecting": "条件连接", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json new file mode 100644 index 000000000..470eb7c92 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/lang/zh_tw.json @@ -0,0 +1,452 @@ +{ + "mod.refinedstorage": "Refined Storage", + "block.refinedstorage.cable": "Cable", + "block.refinedstorage.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", + "block.refinedstorage.disk_drive": "Disk Drive", + "block.refinedstorage.machine_casing": "Machine Casing", + "block.refinedstorage.grid": "Grid", + "block.refinedstorage.crafting_grid": "Crafting Grid", + "block.refinedstorage.controller": "Controller", + "block.refinedstorage.creative_controller": "Creative Controller", + "block.refinedstorage.1k_storage_block": "1K Storage Block", + "block.refinedstorage.4k_storage_block": "4K Storage Block", + "block.refinedstorage.16k_storage_block": "16K Storage Block", + "block.refinedstorage.64k_storage_block": "64K Storage Block", + "block.refinedstorage.creative_storage_block": "Creative Storage Block", + "block.refinedstorage.64b_fluid_storage_block": "64B Fluid Storage Block", + "block.refinedstorage.256b_fluid_storage_block": "256B Fluid Storage Block", + "block.refinedstorage.1024b_fluid_storage_block": "1024B Fluid Storage Block", + "block.refinedstorage.4096b_fluid_storage_block": "4096B Fluid Storage Block", + "block.refinedstorage.creative_fluid_storage_block": "Creative Fluid Storage Block", + "block.refinedstorage.importer": "Importer", + "block.refinedstorage.exporter": "Exporter", + "block.refinedstorage.interface": "Interface", + "block.refinedstorage.external_storage": "External Storage", + "block.refinedstorage.detector": "Detector", + "block.refinedstorage.constructor": "Constructor", + "block.refinedstorage.destructor": "Destructor", + "block.refinedstorage.wireless_transmitter": "Wireless Transmitter", + "block.refinedstorage.storage_monitor": "Storage Monitor", + "block.refinedstorage.network_receiver": "Network Receiver", + "block.refinedstorage.network_transmitter": "Network Transmitter", + "block.refinedstorage.portable_grid": "Portable Grid", + "block.refinedstorage.creative_portable_grid": "Creative Portable Grid", + "block.refinedstorage.security_manager": "Security Manager", + "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", + "block.refinedstorage.relay": "Relay", + "block.refinedstorage.disk_interface": "Disk Interface", + "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", + "gui.refinedstorage.disk_drive.disks": "Disks", + "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", + "gui.refinedstorage.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", + "gui.refinedstorage.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", + "gui.refinedstorage.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", + "gui.refinedstorage.grid.sorting.direction": "Sorting direction", + "gui.refinedstorage.grid.sorting.direction.ascending": "Ascending", + "gui.refinedstorage.grid.sorting.direction.descending": "Descending", + "gui.refinedstorage.grid.sorting.type": "Sorting type", + "gui.refinedstorage.grid.sorting.type.quantity": "Quantity", + "gui.refinedstorage.grid.sorting.type.name": "Name", + "gui.refinedstorage.grid.sorting.type.id": "ID", + "gui.refinedstorage.grid.sorting.type.last_modified": "Last modified", + "gui.refinedstorage.grid.auto_selected": "Auto-selected", + "gui.refinedstorage.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", + "gui.refinedstorage.grid.synchronizer": "Synchronization mode", + "gui.refinedstorage.grid.synchronizer.off": "Off", + "gui.refinedstorage.grid.synchronizer.off.help": "Don't sync the search box text.", + "gui.refinedstorage.grid.resource_type": "Resource type", + "gui.refinedstorage.grid.resource_type.all": "All", + "gui.refinedstorage.grid.resource_type.help": "Filter specific resource types.", + "gui.refinedstorage.crafting_grid.move.network": "Move items to network", + "gui.refinedstorage.crafting_grid.move.inventory": "Move items to inventory", + "gui.refinedstorage.screen_size": "Screen size", + "gui.refinedstorage.screen_size.stretch": "Stretch", + "gui.refinedstorage.screen_size.small": "Small", + "gui.refinedstorage.screen_size.medium": "Medium", + "gui.refinedstorage.screen_size.large": "Large", + "gui.refinedstorage.screen_size.extra_large": "Extra large", + "gui.refinedstorage.detector.mode": "Mode", + "gui.refinedstorage.detector.mode.under": "Emit redstone signal when under the amount", + "gui.refinedstorage.detector.mode.equal": "Emit redstone signal when on the amount", + "gui.refinedstorage.detector.mode.above": "Emit redstone signal when above the amount", + "gui.refinedstorage.detector.filter_help": "The resource that should be detected in the storage network.", + "gui.refinedstorage.destructor.pickup_items": "Pickup items instead of breaking", + "gui.refinedstorage.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", + "gui.refinedstorage.constructor.drop_items": "Drop items instead of placing blocks", + "gui.refinedstorage.constructor.filter_help": "The resources that should be placed from the storage network.", + "gui.refinedstorage.interface.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.exporter.filter_help": "The resources that should be exported from the storage network.", + "gui.refinedstorage.importer.filter_help": "The resources that may be imported from the target inventory.", + "gui.refinedstorage.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", + "gui.refinedstorage.wireless_transmitter.distance": "%d block(s)", + "gui.refinedstorage.storage_monitor.filter_help": "The resource to display.", + "gui.refinedstorage.redstone_mode": "Redstone mode", + "gui.refinedstorage.redstone_mode.ignore": "Ignore", + "gui.refinedstorage.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", + "gui.refinedstorage.redstone_mode.high": "High", + "gui.refinedstorage.redstone_mode.high.help": "This device will only be active with a redstone signal.", + "gui.refinedstorage.redstone_mode.low": "Low", + "gui.refinedstorage.redstone_mode.low.help": "This device will only be active without a redstone signal.", + "gui.refinedstorage.scheduling_mode": "Scheduling mode", + "gui.refinedstorage.scheduling_mode.default": "Default", + "gui.refinedstorage.scheduling_mode.default.help": "Use the first available filter.", + "gui.refinedstorage.scheduling_mode.round_robin": "Round robin", + "gui.refinedstorage.scheduling_mode.round_robin.help": "Use each filter in turn.", + "gui.refinedstorage.scheduling_mode.random": "Random", + "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", + "gui.refinedstorage.priority": "Priority", + "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", + "gui.refinedstorage.amount": "Amount", + "gui.refinedstorage.amount.reset": "Reset", + "gui.refinedstorage.amount.set": "Set", + "gui.refinedstorage.filter_mode": "Filter mode", + "gui.refinedstorage.filter_mode.allow": "Allowlist", + "gui.refinedstorage.filter_mode.block": "Blocklist", + "gui.refinedstorage.fuzzy_mode": "Fuzzy mode", + "gui.refinedstorage.fuzzy_mode.on": "On", + "gui.refinedstorage.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", + "gui.refinedstorage.fuzzy_mode.on.generic_help": "Match the filter exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", + "gui.refinedstorage.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", + "gui.refinedstorage.fuzzy_mode.off": "Off", + "gui.refinedstorage.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", + "gui.refinedstorage.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", + "gui.refinedstorage.access_mode": "Access mode", + "gui.refinedstorage.access_mode.insert_extract": "Insert and extract", + "gui.refinedstorage.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", + "gui.refinedstorage.access_mode.insert": "Insert only", + "gui.refinedstorage.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", + "gui.refinedstorage.access_mode.extract": "Extract only", + "gui.refinedstorage.access_mode.extract.help": "The storage network will only be able to extract from this storage.", + "gui.refinedstorage.void_excess": "Void excess resources", + "gui.refinedstorage.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", + "gui.refinedstorage.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", + "gui.refinedstorage.upgrade_slot": "Empty upgrade slot", + "gui.refinedstorage.filter_slot.empty_filter": "Empty filter", + "gui.refinedstorage.filter_slot.left_click_for": "Left click for", + "gui.refinedstorage.filter_slot.right_click_for": "Right click for", + "gui.refinedstorage.filter_slot.click_to_clear": "Click to clear", + "gui.refinedstorage.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", + "gui.refinedstorage.network_transmitter.status.inactive": "Inactive", + "gui.refinedstorage.network_transmitter.status.missing_network_card": "Missing Network Card", + "gui.refinedstorage.network_transmitter.status.transmitting": "%d block(s)", + "gui.refinedstorage.network_transmitter.status.receiver_unreachable": "Unreachable", + "gui.refinedstorage.security_card.permission.reset": "Reset", + "gui.refinedstorage.security_card.permission.modified": "Modified", + "gui.refinedstorage.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", + "gui.refinedstorage.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", + "gui.refinedstorage.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", + "gui.refinedstorage.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", + "gui.refinedstorage.relay.pass_through": "Pass-through", + "gui.refinedstorage.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", + "gui.refinedstorage.relay.pass_energy": "Pass energy", + "gui.refinedstorage.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", + "gui.refinedstorage.relay.pass_storage": "Pass storage", + "gui.refinedstorage.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", + "gui.refinedstorage.relay.pass_security": "Pass security", + "gui.refinedstorage.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", + "gui.refinedstorage.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", + "gui.refinedstorage.disk_interface.in": "In", + "gui.refinedstorage.disk_interface.out": "Out", + "gui.refinedstorage.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", + "gui.refinedstorage.disk_interface.transfer_mode": "Transfer mode", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network": "Insert into network", + "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", + "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", + "item.refinedstorage.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", + "item.refinedstorage.creative_controller.help": "Provides the storage network with an infinite source of energy.", + "item.refinedstorage.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", + "item.refinedstorage.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", + "item.refinedstorage.grid.help": "Allows for interacting with the storage network.", + "item.refinedstorage.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", + "item.refinedstorage.importer.help": "Imports resources from an external source to the storage network.", + "item.refinedstorage.exporter.help": "Exports resources from the storage network to an external destination.", + "item.refinedstorage.interface.help": "Acts as the combination of an Importer and Exporter.", + "item.refinedstorage.external_storage.help": "Provides the storage network with storage from an external source.", + "item.refinedstorage.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", + "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", + "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", + "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", + "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", + "item.refinedstorage.processor_binding": "Processor Binding", + "item.refinedstorage.silicon": "Silicon", + "item.refinedstorage.raw_basic_processor": "Raw Basic Processor", + "item.refinedstorage.raw_improved_processor": "Raw Improved Processor", + "item.refinedstorage.raw_advanced_processor": "Raw Advanced Processor", + "item.refinedstorage.basic_processor": "Basic Processor", + "item.refinedstorage.improved_processor": "Improved Processor", + "item.refinedstorage.advanced_processor": "Advanced Processor", + "item.refinedstorage.1k_storage_part": "1K Storage Part", + "item.refinedstorage.4k_storage_part": "4K Storage Part", + "item.refinedstorage.16k_storage_part": "16K Storage Part", + "item.refinedstorage.64k_storage_part": "64K Storage Part", + "item.refinedstorage.1k_storage_disk": "1K Storage Disk", + "item.refinedstorage.4k_storage_disk": "4K Storage Disk", + "item.refinedstorage.16k_storage_disk": "16K Storage Disk", + "item.refinedstorage.64k_storage_disk": "64K Storage Disk", + "item.refinedstorage.creative_storage_disk": "Creative Storage Disk", + "item.refinedstorage.64b_fluid_storage_part": "64B Fluid Storage Part", + "item.refinedstorage.256b_fluid_storage_part": "256B Fluid Storage Part", + "item.refinedstorage.1024b_fluid_storage_part": "1024B Fluid Storage Part", + "item.refinedstorage.4096b_fluid_storage_part": "4096B Fluid Storage Part", + "item.refinedstorage.64b_fluid_storage_disk": "64B Fluid Storage Disk", + "item.refinedstorage.256b_fluid_storage_disk": "256B Fluid Storage Disk", + "item.refinedstorage.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", + "item.refinedstorage.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", + "item.refinedstorage.creative_fluid_storage_disk": "Creative Fluid Storage Disk", + "item.refinedstorage.storage_housing": "Storage Housing", + "item.refinedstorage.construction_core": "Construction Core", + "item.refinedstorage.destruction_core": "Destruction Core", + "item.refinedstorage.wrench": "Wrench", + "item.refinedstorage.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", + "item.refinedstorage.upgrade": "Upgrade", + "item.refinedstorage.speed_upgrade": "Speed Upgrade", + "item.refinedstorage.stack_upgrade": "Stack Upgrade", + "item.refinedstorage.silk_touch_upgrade": "Silk Touch Upgrade", + "item.refinedstorage.fortune_upgrade.1": "Fortune I Upgrade", + "item.refinedstorage.fortune_upgrade.2": "Fortune II Upgrade", + "item.refinedstorage.fortune_upgrade.3": "Fortune III Upgrade", + "item.refinedstorage.regulator_upgrade": "Regulator Upgrade", + "item.refinedstorage.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", + "item.refinedstorage.range_upgrade": "Range Upgrade", + "item.refinedstorage.creative_range_upgrade": "Creative Range Upgrade", + "item.refinedstorage.wireless_grid": "Wireless Grid", + "item.refinedstorage.creative_wireless_grid": "Creative Wireless Grid", + "item.refinedstorage.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", + "item.refinedstorage.network_item.unbound": "Unbound.", + "item.refinedstorage.network_item.unbound.help": "Use on any storage network device to bind.", + "item.refinedstorage.network_item.bound_to": "Bound to %d, %d, %d.", + "item.refinedstorage.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", + "item.refinedstorage.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", + "item.refinedstorage.configuration_card": "Configuration Card", + "item.refinedstorage.configuration_card.empty": "Empty.", + "item.refinedstorage.configuration_card.configured": "Contains configuration for %s.", + "item.refinedstorage.configuration_card.copied_configuration": "Copied configuration for %s.", + "item.refinedstorage.configuration_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", + "item.refinedstorage.configuration_card.applied_configuration": "Applied configuration.", + "item.refinedstorage.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", + "item.refinedstorage.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", + "item.refinedstorage.network_card": "Network Card", + "item.refinedstorage.network_card.unbound_help": "Use while crouching on a Network Receiver.", + "item.refinedstorage.network_card.unbound": "Unbound.", + "item.refinedstorage.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", + "item.refinedstorage.network_card.bound": "Bound to %d, %d, %d in %s.", + "item.refinedstorage.security_card": "Security Card", + "item.refinedstorage.security_card.cleared_configuration": "Cleared configuration.", + "item.refinedstorage.security_card.unbound": "Unbound.", + "item.refinedstorage.security_card.unbound.help": "Right click to configure and bind to the current player.", + "item.refinedstorage.security_card.bound": "Bound to %s.", + "item.refinedstorage.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", + "item.refinedstorage.fallback_security_card": "Fallback Security Card", + "item.refinedstorage.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", + "misc.refinedstorage.stored": "Stored: %s", + "misc.refinedstorage.stored_with_capacity": "Stored: %s / %s (%d%%)", + "misc.refinedstorage.total": "%d total", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.resource_type.item": "Item", + "misc.refinedstorage.resource_type.fluid": "Fluid", + "misc.refinedstorage.press_shift_for_help": "Press SHIFT for help", + "misc.refinedstorage.no_permission": "No permission", + "misc.refinedstorage.no_permission.open": "You are not allowed to open the %s.", + "misc.refinedstorage.no_permission.insert": "You are not allowed to insert.", + "misc.refinedstorage.no_permission.extract": "You are not allowed to extract.", + "misc.refinedstorage.no_permission.build.place": "You are not allowed to place a %s here.", + "misc.refinedstorage.no_permission.build.break": "You are not allowed to break the %s.", + "misc.refinedstorage.no_permission.build.rotate": "You are not allowed to rotate the %s.", + "misc.refinedstorage.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", + "key.refinedstorage.focus_search_bar": "Focus search bar", + "key.refinedstorage.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", + "key.refinedstorage.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", + "key.refinedstorage.open_wireless_grid": "Open Wireless Grid", + "refinedstorage.subtitle.wrench": "Wrench used", + "permission.refinedstorage.insert": "Insert", + "permission.refinedstorage.insert.description": "Whether the player can insert resources in a network.", + "permission.refinedstorage.extract": "Extract", + "permission.refinedstorage.extract.description": "Whether the player can extract resources from a network.", + "permission.refinedstorage.autocrafting": "Autocrafting", + "permission.refinedstorage.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", + "permission.refinedstorage.open": "Open", + "permission.refinedstorage.open.description": "Whether the player can open network device GUIs.", + "permission.refinedstorage.build": "Build", + "permission.refinedstorage.build.description": "Whether the player can add or remove network devices.", + "permission.refinedstorage.security": "Security", + "permission.refinedstorage.security.description": "Whether the player can manage the security options for a network.", + "tag.item.refinedstorage.cables": "Cables", + "tag.item.refinedstorage.constructors": "Constructors", + "tag.item.refinedstorage.controllers": "Controllers", + "tag.item.refinedstorage.crafting_grids": "Crafting Grids", + "tag.item.refinedstorage.creative_controllers": "Creative Controllers", + "tag.item.refinedstorage.destructors": "Destructors", + "tag.item.refinedstorage.detectors": "Detectors", + "tag.item.refinedstorage.exporters": "Exporters", + "tag.item.refinedstorage.external_storages": "External Storages", + "tag.item.refinedstorage.fluid_storage_disks": "Fluid Storage Disks", + "tag.item.refinedstorage.grids": "Grids", + "tag.item.refinedstorage.importers": "Importers", + "tag.item.refinedstorage.network_receivers": "Network Receivers", + "tag.item.refinedstorage.network_transmitters": "Network Transmitters", + "tag.item.refinedstorage.relays": "Relays", + "tag.item.refinedstorage.security_managers": "Security Managers", + "tag.item.refinedstorage.storage_disks": "Storage Disks", + "tag.item.refinedstorage.wireless_transmitters": "Wireless Transmitters", + "tag.item.refinedstorage.disk_interfaces": "Disk Interfaces", + "text.autoconfig.refinedstorage.title": "Refined Storage", + "text.autoconfig.refinedstorage.option.smoothScrolling": "Smooth scrolling", + "text.autoconfig.refinedstorage.option.screenSize": "Screen size", + "text.autoconfig.refinedstorage.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", + "text.autoconfig.refinedstorage.option.grid": "Grid", + "text.autoconfig.refinedstorage.option.grid.largeFont": "Large font", + "text.autoconfig.refinedstorage.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", + "text.autoconfig.refinedstorage.option.grid.detailedTooltip": "Detailed tooltip", + "text.autoconfig.refinedstorage.option.grid.rememberSearchQuery": "Remember search query", + "text.autoconfig.refinedstorage.option.grid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.grid.autoSelected": "Auto selected search box", + "text.autoconfig.refinedstorage.option.grid.synchronizer": "Synchronizer", + "text.autoconfig.refinedstorage.option.grid.resourceTypeId": "Resource type", + "text.autoconfig.refinedstorage.option.grid.sortingDirection": "Sorting direction", + "text.autoconfig.refinedstorage.option.grid.sortingType": "Sorting type", + "text.autoconfig.refinedstorage.option.craftingGrid": "Crafting Grid", + "text.autoconfig.refinedstorage.option.craftingGrid.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", + "text.autoconfig.refinedstorage.option.controller": "Controller", + "text.autoconfig.refinedstorage.option.controller.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.cable": "Cable", + "text.autoconfig.refinedstorage.option.cable.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive": "Disk Drive", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.diskInterface": "Disk Interface", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", + "text.autoconfig.refinedstorage.option.storageBlock": "Storage Block", + "text.autoconfig.refinedstorage.option.storageBlock.oneKEnergyUsage": "1K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.fourKEnergyUsage": "4K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", + "text.autoconfig.refinedstorage.option.storageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock": "Fluid Storage Block", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", + "text.autoconfig.refinedstorage.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", + "text.autoconfig.refinedstorage.option.importer": "Importer", + "text.autoconfig.refinedstorage.option.importer.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.exporter": "Exporter", + "text.autoconfig.refinedstorage.option.exporter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.detector": "Detector", + "text.autoconfig.refinedstorage.option.detector.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.constructor": "Constructor", + "text.autoconfig.refinedstorage.option.constructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.destructor": "Destructor", + "text.autoconfig.refinedstorage.option.destructor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.upgrade": "Upgrade", + "text.autoconfig.refinedstorage.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", + "text.autoconfig.refinedstorage.option.upgrade.rangeUpgradeRange": "Range Upgrade range", + "text.autoconfig.refinedstorage.option.iface": "Interface", + "text.autoconfig.refinedstorage.option.iface.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.externalStorage": "External Storage", + "text.autoconfig.refinedstorage.option.externalStorage.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid": "Wireless Grid", + "text.autoconfig.refinedstorage.option.wirelessGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.wirelessGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter": "Wireless Transmitter", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.wirelessTransmitter.baseRange": "Base range", + "text.autoconfig.refinedstorage.option.storageMonitor": "Storage Monitor", + "text.autoconfig.refinedstorage.option.storageMonitor.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkReceiver": "Network Receiver", + "text.autoconfig.refinedstorage.option.networkReceiver.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.networkTransmitter": "Network Transmitter", + "text.autoconfig.refinedstorage.option.networkTransmitter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.portableGrid": "Portable Grid", + "text.autoconfig.refinedstorage.option.portableGrid.energyCapacity": "Energy capacity", + "text.autoconfig.refinedstorage.option.portableGrid.openEnergyUsage": "Open energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.insertEnergyUsage": "Insert energy usage", + "text.autoconfig.refinedstorage.option.portableGrid.extractEnergyUsage": "Extract energy usage", + "text.autoconfig.refinedstorage.option.securityCard": "Security Card", + "text.autoconfig.refinedstorage.option.securityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard": "Fallback Security Card", + "text.autoconfig.refinedstorage.option.fallbackSecurityCard.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.securityManager": "Security Manager", + "text.autoconfig.refinedstorage.option.securityManager.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.relay": "Relay", + "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage": "Input network energy usage", + "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", + "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", + "advancements.refinedstorage.connecting": "Connecting", + "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", + "advancements.refinedstorage.drives": "Drives", + "advancements.refinedstorage.drives.description": "Craft a Disk Drive to be able to store your storage disks", + "advancements.refinedstorage.interfacing_with_disks": "Interfacing with disks", + "advancements.refinedstorage.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", + "advancements.refinedstorage.storing_items": "Storing items", + "advancements.refinedstorage.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.viewing_your_storage": "Viewing your storage", + "advancements.refinedstorage.viewing_your_storage.description": "Craft a Grid to interact with your storage", + "advancements.refinedstorage.upgrading_your_grid": "Upgrading your Grid", + "advancements.refinedstorage.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", + "advancements.refinedstorage.storing_fluids": "Storing fluids", + "advancements.refinedstorage.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", + "advancements.refinedstorage.importing": "Importing", + "advancements.refinedstorage.importing.description": "Get resources into the storage network with an Importer", + "advancements.refinedstorage.exporting": "Exporting", + "advancements.refinedstorage.exporting.description": "Get resources out of the storage network with an Exporter", + "advancements.refinedstorage.upgrading": "Upgrading", + "advancements.refinedstorage.upgrading.description": "Craft an Upgrade to improve various devices", + "advancements.refinedstorage.interface_to_the_world": "Interface to the world", + "advancements.refinedstorage.interface_to_the_world.description": "Export and import items at the same time with an Interface", + "advancements.refinedstorage.storing_externally": "Storing externally", + "advancements.refinedstorage.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", + "advancements.refinedstorage.detecting": "Detecting", + "advancements.refinedstorage.detecting.description": "Use redstone to check resources stored in the storage network", + "advancements.refinedstorage.construction": "Construction", + "advancements.refinedstorage.construction.description": "Get blocks from the storage network into the world with a Constructor", + "advancements.refinedstorage.destruction": "Destruction", + "advancements.refinedstorage.destruction.description": "Get blocks from in the world into the storage network with a Destructor", + "advancements.refinedstorage.wireless": "Wireless", + "advancements.refinedstorage.wireless.description": "Access your resources wirelessly with a Wireless Grid", + "advancements.refinedstorage.better_than_a_barrel": "Better than a barrel", + "advancements.refinedstorage.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", + "advancements.refinedstorage.no_cables_required": "No cables required", + "advancements.refinedstorage.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", + "advancements.refinedstorage.portable_storage": "Portable storage", + "advancements.refinedstorage.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", + "advancements.refinedstorage.security": "Security", + "advancements.refinedstorage.security.description": "Secure your storage network with a Security Manager and a Security Card", + "advancements.refinedstorage.conditional_connecting": "Conditional connecting", + "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1024b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1024b_fluid_storage_block.json new file mode 100644 index 000000000..18c72c7b5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1024b_fluid_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/fluid_storage_block/1024b_fluid_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json new file mode 100644 index 000000000..c6d5350d0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/16k_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/storage_block/16k_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json new file mode 100644 index 000000000..7427ce605 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/1k_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/storage_block/1k_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/256b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/256b_fluid_storage_block.json new file mode 100644 index 000000000..3004aa1b9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/256b_fluid_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/fluid_storage_block/256b_fluid_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4096b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4096b_fluid_storage_block.json new file mode 100644 index 000000000..13b43a5f2 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4096b_fluid_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/fluid_storage_block/4096b_fluid_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json new file mode 100644 index 000000000..9e4dfc422 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/4k_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/storage_block/4k_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64b_fluid_storage_block.json new file mode 100644 index 000000000..331419753 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64b_fluid_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/fluid_storage_block/64b_fluid_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json new file mode 100644 index 000000000..2494dd685 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/64k_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/storage_block/64k_storage_block" + } +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/all_cutout.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/all_cutout.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/all_cutout.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/all_cutout.json diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/cable/core/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cable/core/base.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/cable/core/base.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cable/core/base.json diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/cable/extension/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cable/extension/base.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/cable/extension/base.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cable/extension/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/active.json new file mode 100644 index 000000000..a9c747dc2 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/active.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/constructor_destructor/active", + "textures": { + "border": "refinedstorage:block/cable/part_border", + "front": "refinedstorage:block/constructor/front", + "cutout": "refinedstorage:block/constructor/cutouts/active" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/inactive.json new file mode 100644 index 000000000..549d3b0e1 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor/inactive.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/constructor_destructor/inactive", + "textures": { + "border": "refinedstorage:block/cable/part_border", + "front": "refinedstorage:block/constructor/front", + "cutout": "refinedstorage:block/constructor/cutouts/inactive" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/active.json new file mode 100644 index 000000000..80c880643 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/active.json @@ -0,0 +1,165 @@ +{ + "render_type": "cutout", + "textures": { + "border": "refinedstorage:block/cable/part_border" + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#front", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 14.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 16.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 2.0, + 0.0, + 14.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 2.0, + 14.0, + 14.0, + 16.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#cutout", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ], + "neoforge_data": { + "block_light": 15, + "sky_light": 15 + } + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/inactive.json new file mode 100644 index 000000000..e1e85b591 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/constructor_destructor/inactive.json @@ -0,0 +1,161 @@ +{ + "render_type": "cutout", + "textures": { + "border": "refinedstorage:block/cable/part_border" + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#front", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 14.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 16.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 2.0, + 0.0, + 14.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 2.0, + 14.0, + 14.0, + 16.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#cutout", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_off.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_off.json new file mode 100644 index 000000000..ccdb148c1 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_off.json @@ -0,0 +1,9 @@ +{ + "parent": "refinedstorage:block/controller/nearly", + "textures": { + "particle": "refinedstorage:block/controller/off", + "all": "refinedstorage:block/controller/on", + "cutout_gray": "refinedstorage:block/controller/cutouts/nearly_off", + "cutout": "refinedstorage:block/controller/cutouts/nearly_off_gray" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_on.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_on.json new file mode 100644 index 000000000..cf6282770 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/nearly_on.json @@ -0,0 +1,9 @@ +{ + "parent": "refinedstorage:block/controller/nearly", + "textures": { + "particle": "refinedstorage:block/controller/off", + "all": "refinedstorage:block/controller/on", + "cutout_gray": "refinedstorage:block/controller/cutouts/nearly_on", + "cutout": "refinedstorage:block/controller/cutouts/nearly_on_gray" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/off.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/off.json new file mode 100644 index 000000000..4bbe04db8 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/controller/off.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/all_cutout", + "textures": { + "particle": "refinedstorage:block/controller/off", + "all": "refinedstorage:block/controller/off", + "cutout": "refinedstorage:block/controller/cutouts/off" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_fluid_storage_block.json new file mode 100644 index 000000000..dfcc98307 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_fluid_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/fluid_storage_block/creative_fluid_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_portable_grid.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_portable_grid.json new file mode 100644 index 000000000..3c68f91b6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_portable_grid.json @@ -0,0 +1,4 @@ +{ + "__comment": "Forge-only", + "loader": "refinedstorage:portable_grid" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json new file mode 100644 index 000000000..41ad8e96b --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/creative_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/storage_block/creative_storage_block" + } +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/cutout.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cutout.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/cutout.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/cutout.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/active.json new file mode 100644 index 000000000..223202d36 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/active.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/constructor_destructor/active", + "textures": { + "border": "refinedstorage:block/cable/part_border", + "front": "refinedstorage:block/destructor/front", + "cutout": "refinedstorage:block/destructor/cutouts/active" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/inactive.json new file mode 100644 index 000000000..38f36a85d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/destructor/inactive.json @@ -0,0 +1,8 @@ +{ + "parent": "refinedstorage:block/constructor_destructor/inactive", + "textures": { + "border": "refinedstorage:block/cable/part_border", + "front": "refinedstorage:block/destructor/front", + "cutout": "refinedstorage:block/destructor/cutouts/inactive" + } +} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/detector/powered.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/detector/powered.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/detector/powered.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/detector/powered.json diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/detector/unpowered.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/detector/unpowered.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/detector/unpowered.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/detector/unpowered.json index 239760f7b..679206ebc 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/detector/unpowered.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/detector/unpowered.json @@ -2,11 +2,11 @@ "render_type": "cutout", "parent": "block/cube", "textures": { - "side": "refinedstorage2:block/detector/side", - "bottom": "refinedstorage2:block/detector/bottom", - "top": "refinedstorage2:block/detector/top", - "particle": "refinedstorage2:block/detector/side", - "torch": "refinedstorage2:block/detector/cutouts/unpowered" + "side": "refinedstorage:block/detector/side", + "bottom": "refinedstorage:block/detector/bottom", + "top": "refinedstorage:block/detector/top", + "particle": "refinedstorage:block/detector/side", + "torch": "refinedstorage:block/detector/cutouts/unpowered" }, "elements": [ { diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/disk.json similarity index 98% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/disk.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/disk.json index 6c6d7f93c..a818c1152 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/disk.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/disk.json @@ -1,6 +1,6 @@ { "textures": { - "base": "refinedstorage2:block/disk/disk" + "base": "refinedstorage:block/disk/disk" }, "elements": [ { diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/fluid_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/fluid_disk.json similarity index 98% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/fluid_disk.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/fluid_disk.json index 07a270cc6..a169c896b 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/fluid_disk.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/fluid_disk.json @@ -1,6 +1,6 @@ { "textures": { - "base": "refinedstorage2:block/disk/fluid_disk" + "base": "refinedstorage:block/disk/fluid_disk" }, "elements": [ { diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_full.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_full.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json index 5576b01d8..49923d184 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_full.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_full.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "base": "refinedstorage2:block/disk/leds" + "base": "refinedstorage:block/disk/leds" }, "elements": [ { diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_inactive.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_inactive.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_inactive.json index 7443952f1..dedd8cd5d 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_inactive.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_inactive.json @@ -1,6 +1,6 @@ { "textures": { - "base": "refinedstorage2:block/disk/leds" + "base": "refinedstorage:block/disk/leds" }, "elements": [ { diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_near_capacity.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json similarity index 92% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_near_capacity.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json index d194c50fc..eb0650629 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_near_capacity.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_near_capacity.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "base": "refinedstorage2:block/disk/leds" + "base": "refinedstorage:block/disk/leds" }, "elements": [ { diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_normal.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_normal.json similarity index 91% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_normal.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_normal.json index 2a2659fde..f3f922e02 100644 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk/led_normal.json +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk/led_normal.json @@ -1,6 +1,6 @@ { "textures": { - "base": "refinedstorage2:block/disk/leds" + "base": "refinedstorage:block/disk/leds" }, "elements": [ { diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive.json new file mode 100644 index 000000000..d61ba43ad --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive.json @@ -0,0 +1,4 @@ +{ + "__comment": "Forge-only", + "loader": "refinedstorage:disk_drive" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive/base.json new file mode 100644 index 000000000..898273857 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/disk_drive/base.json @@ -0,0 +1,50 @@ +{ + "parent": "block/block", + "textures": { + "particle": "refinedstorage:block/disk_drive/front", + "front": "refinedstorage:block/disk_drive/front", + "bottom": "refinedstorage:block/disk_drive/bottom", + "top": "refinedstorage:block/disk_drive/top", + "side": "refinedstorage:block/disk_drive/side" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "texture": "#top", + "cullface": "up" + }, + "north": { + "texture": "#front", + "cullface": "north" + }, + "south": { + "texture": "#side", + "cullface": "south" + }, + "west": { + "texture": "#side", + "cullface": "west" + }, + "east": { + "texture": "#side", + "cullface": "east" + } + } + } + ] +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/emissive_all_cutout.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_all_cutout.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/emissive_all_cutout.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_all_cutout.json diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/emissive_cutout.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_cutout.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/emissive_cutout.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_cutout.json diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/emissive_north_cutout.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_north_cutout.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/emissive_north_cutout.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/emissive_north_cutout.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/exporter.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/exporter.json new file mode 100644 index 000000000..23e53f970 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/exporter.json @@ -0,0 +1,215 @@ +{ + "render_type": "cutout", + "textures": { + "border": "refinedstorage:block/cable/part_border" + }, + "elements": [ + { + "name": "Line1", + "from": [ + 6, + 6, + 0 + ], + "to": [ + 10, + 10, + 2 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4, + 4 + ], + "texture": "#border" + }, + "east": { + "uv": [ + 0, + 0, + 2, + 4 + ], + "texture": "#border" + }, + "south": { + "uv": [ + 0, + 0, + 4, + 4 + ], + "texture": "#border" + }, + "west": { + "uv": [ + 0, + 0, + 2, + 4 + ], + "texture": "#border" + }, + "up": { + "uv": [ + 0, + 0, + 4, + 2 + ], + "texture": "#border" + }, + "down": { + "uv": [ + 0, + 0, + 4, + 2 + ], + "texture": "#border" + } + } + }, + { + "name": "Line2", + "from": [ + 5, + 5, + 2 + ], + "to": [ + 11, + 11, + 4 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6, + 6 + ], + "texture": "#border" + }, + "east": { + "uv": [ + 0, + 0, + 2, + 6 + ], + "texture": "#border" + }, + "south": { + "uv": [ + 0, + 0, + 6, + 6 + ], + "texture": "#border" + }, + "west": { + "uv": [ + 0, + 0, + 2, + 6 + ], + "texture": "#border" + }, + "up": { + "uv": [ + 0, + 0, + 6, + 2 + ], + "texture": "#border" + }, + "down": { + "uv": [ + 0, + 0, + 6, + 2 + ], + "texture": "#border" + } + } + }, + { + "name": "Line3", + "from": [ + 3, + 3, + 4 + ], + "to": [ + 13, + 13, + 6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10, + 10 + ], + "texture": "#border" + }, + "east": { + "uv": [ + 0, + 0, + 2, + 10 + ], + "texture": "#border" + }, + "south": { + "uv": [ + 0, + 0, + 10, + 10 + ], + "texture": "#border" + }, + "west": { + "uv": [ + 0, + 0, + 2, + 10 + ], + "texture": "#border" + }, + "up": { + "uv": [ + 0, + 0, + 10, + 2 + ], + "texture": "#border" + }, + "down": { + "uv": [ + 0, + 0, + 10, + 2 + ], + "texture": "#border" + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/external_storage.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/external_storage.json new file mode 100644 index 000000000..992ae35bc --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/external_storage.json @@ -0,0 +1,137 @@ +{ + "render_type": "cutout", + "textures": { + "border": "refinedstorage:block/cable/part_border" + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 3.0, + 3.0, + 0.0 + ], + "to": [ + 13.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/importer.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/importer.json new file mode 100644 index 000000000..84d4f24e7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/importer.json @@ -0,0 +1,215 @@ +{ + "render_type": "cutout", + "textures": { + "border": "refinedstorage:block/cable/part_border" + }, + "elements": [ + { + "name": "Line1", + "from": [ + 6.0, + 6.0, + 4.0 + ], + "to": [ + 10.0, + 10.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 5.0, + 5.0, + 2.0 + ], + "to": [ + 11.0, + 11.0, + 4.0 + ], + "faces": { + "north": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 3.0, + 3.0, + 0.0 + ], + "to": [ + 13.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_active.json new file mode 100644 index 000000000..72ef42461 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_active.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/interface/active" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_inactive.json new file mode 100644 index 000000000..af8b71fdc --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/interface_inactive.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/interface/inactive" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/machine_casing.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/machine_casing.json new file mode 100644 index 000000000..46a97e4e6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/machine_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/machine_casing" + } +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/north_cutout.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/north_cutout.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/north_cutout.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/north_cutout.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid.json new file mode 100644 index 000000000..3c68f91b6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid.json @@ -0,0 +1,4 @@ +{ + "__comment": "Forge-only", + "loader": "refinedstorage:portable_grid" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/active.json new file mode 100644 index 000000000..fd0b2c3fc --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/active.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/portable_grid/base", + "textures": { + "texture1": "refinedstorage:block/portable_grid/portable_grid_2" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/base.json new file mode 100644 index 000000000..7fab7e15e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/base.json @@ -0,0 +1,558 @@ +{ + "render_type": "cutout", + "parent": "block/cube", + "textures": { + "particle": "refinedstorage:block/portable_grid/portable_grid_1", + "texture0": "refinedstorage:block/portable_grid/portable_grid_1", + "texture2": "refinedstorage:block/portable_grid/portable_grid_3", + "texture3": "refinedstorage:block/portable_grid/portable_grid_4", + "texture4": "refinedstorage:block/portable_grid/portable_grid_5", + "texture5": "refinedstorage:block/portable_grid/portable_grid_6", + "texture6": "refinedstorage:block/portable_grid/portable_grid_7", + "texture7": "refinedstorage:block/portable_grid/portable_grid_8" + }, + "display": { + "firstperson_lefthand": { + "rotation": [ + 10, + 130, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ], + "translation": [ + 2, + 3.5, + 0 + ] + }, + "firstperson_righthand": { + "rotation": [ + 10, + 130, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ], + "translation": [ + 2, + 3.5, + 0 + ] + }, + "thirdperson_lefthand": { + "rotation": [ + 10, + 180, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ], + "translation": [ + 0, + 3, + 1 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + 180, + 0 + ], + "scale": [ + 0.4, + 0.4, + 0.4 + ], + "translation": [ + 0, + 3, + 1 + ] + }, + "gui": { + "rotation": [ + 30, + 225, + 0 + ], + "scale": [ + 0.625, + 0.625, + 0.625 + ] + }, + "ground": { + "translation": [ + 0, + 3, + 0 + ], + "scale": [ + 0.25, + 0.25, + 0.25 + ] + }, + "fixed": { + "scale": [ + 0.75, + 0.75, + 0.75 + ] + } + }, + "elements": [ + { + "name": "cube", + "from": [ + 0, + 6, + 5 + ], + "to": [ + 16, + 13, + 7 + ], + "shade": true, + "faces": { + "north": { + "uv": [ + 0, + 7, + 16, + 14 + ], + "texture": "#texture0" + }, + "east": { + "uv": [ + 0, + 7, + 2, + 14 + ], + "texture": "#texture1" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 7 + ], + "texture": "#texture0" + }, + "west": { + "uv": [ + 0, + 0, + 2, + 7 + ], + "texture": "#texture1" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 2 + ], + "texture": "#texture0", + "rotation": 180 + }, + "down": { + "uv": [ + 0, + 13, + 16, + 15 + ], + "texture": "#texture1", + "rotation": 180 + } + }, + "rotation": { + "origin": [ + 8, + 6, + 7 + ], + "axis": "x", + "angle": 22.5 + } + }, + { + "name": "cube", + "from": [ + 0, + 4, + 7 + ], + "to": [ + 16, + 6, + 16 + ], + "shade": true, + "faces": { + "north": { + "uv": [ + 0, + 14, + 16, + 16 + ], + "texture": "#texture0" + }, + "east": { + "uv": [ + 3, + 2, + 12, + 4 + ], + "texture": "#texture1" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 2 + ], + "texture": "#texture2" + }, + "west": { + "uv": [ + 3, + 0, + 12, + 2 + ], + "texture": "#texture1" + }, + "up": { + "uv": [ + 0, + 2, + 16, + 11 + ], + "texture": "#texture2", + "rotation": 180 + }, + "down": { + "uv": [ + 0, + 0, + 16, + 9 + ], + "texture": "#texture3", + "rotation": 180 + } + } + }, + { + "name": "cube", + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 4, + 16 + ], + "shade": true, + "faces": { + "north": { + "uv": [ + 0, + 9, + 16, + 13 + ], + "texture": "#texture3" + }, + "east": { + "uv": [ + 0, + 4, + 16, + 8 + ], + "texture": "#texture4" + }, + "south": { + "uv": [ + 0, + 11, + 16, + 15 + ], + "texture": "#texture2" + }, + "west": { + "uv": [ + 0, + 0, + 16, + 4 + ], + "texture": "#texture4" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture5", + "rotation": 180 + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#texture6", + "rotation": 180 + } + } + }, + { + "name": "cube", + "from": [ + 1, + 4, + 1 + ], + "to": [ + 15, + 5, + 7 + ], + "shade": true, + "faces": { + "north": { + "uv": [ + 0, + 15, + 14, + 16 + ], + "texture": "#texture2" + }, + "east": { + "uv": [ + 4, + 9, + 10, + 10 + ], + "texture": "#texture1" + }, + "south": { + "uv": [ + 2, + 13, + 16, + 14 + ], + "texture": "#texture1" + }, + "west": { + "uv": [ + 4, + 8, + 10, + 9 + ], + "texture": "#texture1" + }, + "up": { + "uv": [ + 0, + 8, + 14, + 14 + ], + "texture": "#texture4", + "rotation": 180 + }, + "down": { + "uv": [ + 0, + 0, + 14, + 6 + ], + "texture": "#texture7", + "rotation": 180 + } + } + }, + { + "name": "cube", + "from": [ + 3, + 4.5, + 6 + ], + "to": [ + 4, + 6.5, + 8 + ], + "shade": true, + "faces": { + "north": { + "uv": [ + 5, + 10, + 6, + 12 + ], + "texture": "#texture1" + }, + "east": { + "uv": [ + 7, + 4, + 9, + 6 + ], + "texture": "#texture1" + }, + "south": { + "uv": [ + 4, + 10, + 5, + 12 + ], + "texture": "#texture1" + }, + "west": { + "uv": [ + 6, + 10, + 8, + 12 + ], + "texture": "#texture1" + }, + "up": { + "uv": [ + 7, + 6, + 8, + 8 + ], + "texture": "#texture1", + "rotation": 180 + }, + "down": { + "uv": [ + 8, + 6, + 9, + 8 + ], + "texture": "#texture1", + "rotation": 180 + } + } + }, + { + "name": "cube", + "from": [ + 12, + 4.5, + 6 + ], + "to": [ + 13, + 6.5, + 8 + ], + "shade": true, + "faces": { + "north": { + "uv": [ + 9, + 4, + 10, + 6 + ], + "texture": "#texture1" + }, + "east": { + "uv": [ + 9, + 10, + 11, + 12 + ], + "texture": "#texture1" + }, + "south": { + "uv": [ + 8, + 10, + 9, + 12 + ], + "texture": "#texture1" + }, + "west": { + "uv": [ + 9, + 6, + 11, + 8 + ], + "texture": "#texture1" + }, + "up": { + "uv": [ + 7, + 6, + 8, + 8 + ], + "texture": "#texture1", + "rotation": 180 + }, + "down": { + "uv": [ + 8, + 6, + 9, + 8 + ], + "texture": "#texture1", + "rotation": 180 + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/inactive.json new file mode 100644 index 000000000..e8816f718 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/portable_grid/inactive.json @@ -0,0 +1,6 @@ +{ + "parent": "refinedstorage:block/portable_grid/base", + "textures": { + "texture1": "refinedstorage:block/portable_grid/portable_grid_2_inactive" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json new file mode 100644 index 000000000..956b8f9a4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_copper_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/quartz_enriched_copper_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json new file mode 100644 index 000000000..64fd28d16 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/quartz_enriched_iron_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "refinedstorage:block/quartz_enriched_iron_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/storage_monitor.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/storage_monitor.json new file mode 100644 index 000000000..2c78fe2eb --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/storage_monitor.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "refinedstorage:block/side", + "north": "refinedstorage:block/storage_monitor/front", + "east": "refinedstorage:block/storage_monitor/left", + "south": "refinedstorage:block/storage_monitor/back", + "west": "refinedstorage:block/storage_monitor/right", + "up": "refinedstorage:block/storage_monitor/top", + "down": "refinedstorage:block/bottom" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/active.json new file mode 100644 index 000000000..f52dc3305 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/active.json @@ -0,0 +1,233 @@ +{ + "render_type": "cutout", + "parent": "block/cube", + "ambientocclusion": false, + "textures": { + "particle": "refinedstorage:block/wireless_transmitter/base", + "torch": "refinedstorage:block/wireless_transmitter/base" + }, + "elements": [ + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 10, + 9 + ], + "shade": false, + "faces": { + "down": { + "uv": [ + 7, + 13, + 9, + 15 + ], + "texture": "#torch" + }, + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#torch" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 16 + ], + "shade": false, + "faces": { + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + } + } + }, + { + "from": [ + 0, + 0, + 7 + ], + "to": [ + 16, + 16, + 9 + ], + "shade": false, + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + } + } + }, + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 10, + 9 + ], + "shade": false, + "faces": { + "down": { + "uv": [ + 7, + 13, + 9, + 15 + ], + "texture": "#cutout", + "neoforge_data": { + "block_light": 15, + "sky_light": 15 + } + }, + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#cutout", + "neoforge_data": { + "block_light": 15, + "sky_light": 15 + } + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 16 + ], + "shade": false, + "faces": { + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout", + "neoforge_data": { + "block_light": 15, + "sky_light": 15 + } + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout", + "neoforge_data": { + "block_light": 15, + "sky_light": 15 + } + } + } + }, + { + "from": [ + 0, + 0, + 7 + ], + "to": [ + 16, + 16, + 9 + ], + "shade": false, + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout", + "neoforge_data": { + "block_light": 15, + "sky_light": 15 + } + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout", + "neoforge_data": { + "block_light": 15, + "sky_light": 15 + } + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/inactive.json new file mode 100644 index 000000000..da182344e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter/inactive.json @@ -0,0 +1,210 @@ +{ + "render_type": "cutout", + "parent": "block/cube", + "ambientocclusion": false, + "textures": { + "particle": "refinedstorage:block/wireless_transmitter/base", + "torch": "refinedstorage:block/wireless_transmitter/base", + "cutout": "refinedstorage:block/wireless_transmitter/cutouts/inactive" + }, + "elements": [ + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 10, + 9 + ], + "shade": false, + "faces": { + "down": { + "uv": [ + 7, + 13, + 9, + 15 + ], + "texture": "#torch" + }, + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#torch" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 16 + ], + "shade": false, + "faces": { + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + } + } + }, + { + "from": [ + 0, + 0, + 7 + ], + "to": [ + 16, + 16, + 9 + ], + "shade": false, + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + } + } + }, + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 10, + 9 + ], + "shade": false, + "faces": { + "down": { + "uv": [ + 7, + 13, + 9, + 15 + ], + "texture": "#cutout" + }, + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#cutout" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 16 + ], + "shade": false, + "faces": { + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout" + } + } + }, + { + "from": [ + 0, + 0, + 7 + ], + "to": [ + 16, + 16, + 9 + ], + "shade": false, + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout" + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_block.json new file mode 100644 index 000000000..ec5d2210b --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/1024b_fluid_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_disk.json new file mode 100644 index 000000000..52b38d9be --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/1024b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_part.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_part.json new file mode 100644 index 000000000..a5ff3cf2f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1024b_fluid_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/1024b_fluid_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json new file mode 100644 index 000000000..c368ed938 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/16k_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json new file mode 100644 index 000000000..b6759e56d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/16k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json new file mode 100644 index 000000000..2ad0c597c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/16k_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json new file mode 100644 index 000000000..844b7e640 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/1k_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json new file mode 100644 index 000000000..df1b567df --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/1k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json new file mode 100644 index 000000000..7519b4912 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/1k_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_block.json new file mode 100644 index 000000000..a57d7cf86 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/256b_fluid_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_disk.json new file mode 100644 index 000000000..375ab49ab --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/256b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_part.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_part.json new file mode 100644 index 000000000..e3d885d01 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/256b_fluid_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/256b_fluid_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_block.json new file mode 100644 index 000000000..fdd112331 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/4096b_fluid_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_disk.json new file mode 100644 index 000000000..9e3821b42 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/4096b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_part.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_part.json new file mode 100644 index 000000000..bee1476c2 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4096b_fluid_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/4096b_fluid_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json new file mode 100644 index 000000000..4abaa8749 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/4k_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json new file mode 100644 index 000000000..0e46dc415 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/4k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json new file mode 100644 index 000000000..48b0f7c94 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/4k_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_block.json new file mode 100644 index 000000000..3e63b0e86 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/64b_fluid_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_disk.json new file mode 100644 index 000000000..c7698fecc --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/64b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_part.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_part.json new file mode 100644 index 000000000..faa167241 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64b_fluid_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/64b_fluid_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json new file mode 100644 index 000000000..ea14497fa --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/64k_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json new file mode 100644 index 000000000..40fea3279 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/64k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json new file mode 100644 index 000000000..754ad6f28 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/64k_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json new file mode 100644 index 000000000..44909712a --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/advanced_processor" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/basic_processor.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/basic_processor.json new file mode 100644 index 000000000..26e2c14d6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/basic_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/basic_processor" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/book.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/book.json new file mode 100644 index 000000000..8eae049b6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/book.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/book" + } +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/cable/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/cable/base.json similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/cable/base.json rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/cable/base.json diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card.json new file mode 100644 index 000000000..965d34830 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card.json @@ -0,0 +1,17 @@ +{ + "parent": "item/generated", + "overrides": [ + { + "predicate": { + "refinedstorage:configuration_card_active": 0 + }, + "model": "refinedstorage:item/configuration_card/inactive" + }, + { + "predicate": { + "refinedstorage:configuration_card_active": 1 + }, + "model": "refinedstorage:item/configuration_card/active" + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/active.json new file mode 100644 index 000000000..942d07212 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/configuration_card/active" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/inactive.json new file mode 100644 index 000000000..c9fec5b55 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/configuration_card/inactive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/configuration_card/inactive" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/construction_core.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/construction_core.json new file mode 100644 index 000000000..c8e3f8d2c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/construction_core.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/construction_core" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/constructor/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/constructor/base.json new file mode 100644 index 000000000..bec7aac9d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/constructor/base.json @@ -0,0 +1,392 @@ +{ + "parent": "block/block", + "textures": { + "border": "refinedstorage:block/cable/part_border", + "front": "refinedstorage:block/constructor/front", + "cutout": "refinedstorage:block/constructor/cutouts/active" + }, + "elements": [ + { + "name": "Core", + "from": [ + 6, + 6, + 6 + ], + "to": [ + 10, + 10, + 10 + ], + "faces": { + "north": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part1", + "from": [ + 10, + 6, + 6 + ], + "to": [ + 16, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 16, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part2", + "from": [ + 0, + 6, + 6 + ], + "to": [ + 6, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 6, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#front", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 14.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 16.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 2.0, + 0.0, + 14.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 2.0, + 14.0, + 14.0, + 16.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#cutout", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ], + "neoforge_data": { + "block_light": 15, + "sky_light": 15 + } + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_block.json new file mode 100644 index 000000000..c74005d60 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/creative_fluid_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json new file mode 100644 index 000000000..c2e7ca81f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/creative_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_portable_grid.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_portable_grid.json new file mode 100644 index 000000000..0629e6162 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_portable_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/creative_portable_grid" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_range_upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_range_upgrade.json new file mode 100644 index 000000000..c7b09569e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_range_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/creative_range_upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json new file mode 100644 index 000000000..b5959d035 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/creative_storage_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json new file mode 100644 index 000000000..b22553a75 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/creative_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json new file mode 100644 index 000000000..bd49b2c29 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json @@ -0,0 +1,17 @@ +{ + "parent": "item/generated", + "overrides": [ + { + "predicate": { + "refinedstorage:network_bound_active": 0 + }, + "model": "refinedstorage:item/wireless_grid/inactive" + }, + { + "predicate": { + "refinedstorage:network_bound_active": 1 + }, + "model": "refinedstorage:item/wireless_grid/active" + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destruction_core.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destruction_core.json new file mode 100644 index 000000000..a5cabfcd4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destruction_core.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/destruction_core" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destructor/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destructor/base.json new file mode 100644 index 000000000..06c37fbb1 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/destructor/base.json @@ -0,0 +1,392 @@ +{ + "parent": "block/block", + "textures": { + "border": "refinedstorage:block/cable/part_border", + "front": "refinedstorage:block/destructor/front", + "cutout": "refinedstorage:block/destructor/cutouts/active" + }, + "elements": [ + { + "name": "Core", + "from": [ + 6, + 6, + 6 + ], + "to": [ + 10, + 10, + 10 + ], + "faces": { + "north": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part1", + "from": [ + 10, + 6, + 6 + ], + "to": [ + 16, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 16, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part2", + "from": [ + 0, + 6, + 6 + ], + "to": [ + 6, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 6, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#front", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 14.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 16.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 2.0, + 0.0, + 14.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 2.0, + 14.0, + 14.0, + 16.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#cutout", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ], + "neoforge_data": { + "block_light": 15, + "sky_light": 15 + } + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/disk_drive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/disk_drive.json new file mode 100644 index 000000000..d61ba43ad --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/disk_drive.json @@ -0,0 +1,4 @@ +{ + "__comment": "Forge-only", + "loader": "refinedstorage:disk_drive" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/exporter/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/exporter/base.json new file mode 100644 index 000000000..f79752c09 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/exporter/base.json @@ -0,0 +1,440 @@ +{ + "parent": "block/block", + "textures": { + "border": "refinedstorage:block/cable/part_border" + }, + "elements": [ + { + "name": "Core", + "from": [ + 6, + 6, + 6 + ], + "to": [ + 10, + 10, + 10 + ], + "faces": { + "north": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part1", + "from": [ + 10, + 6, + 6 + ], + "to": [ + 16, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 16, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part2", + "from": [ + 0, + 6, + 6 + ], + "to": [ + 6, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 6, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Line1", + "from": [ + 6, + 6, + 0 + ], + "to": [ + 10, + 10, + 2 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 4, + 4 + ], + "texture": "#border" + }, + "east": { + "uv": [ + 0, + 0, + 2, + 4 + ], + "texture": "#border" + }, + "south": { + "uv": [ + 0, + 0, + 4, + 4 + ], + "texture": "#border" + }, + "west": { + "uv": [ + 0, + 0, + 2, + 4 + ], + "texture": "#border" + }, + "up": { + "uv": [ + 0, + 0, + 4, + 2 + ], + "texture": "#border" + }, + "down": { + "uv": [ + 0, + 0, + 4, + 2 + ], + "texture": "#border" + } + } + }, + { + "name": "Line2", + "from": [ + 5, + 5, + 2 + ], + "to": [ + 11, + 11, + 4 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 6, + 6 + ], + "texture": "#border" + }, + "east": { + "uv": [ + 0, + 0, + 2, + 6 + ], + "texture": "#border" + }, + "south": { + "uv": [ + 0, + 0, + 6, + 6 + ], + "texture": "#border" + }, + "west": { + "uv": [ + 0, + 0, + 2, + 6 + ], + "texture": "#border" + }, + "up": { + "uv": [ + 0, + 0, + 6, + 2 + ], + "texture": "#border" + }, + "down": { + "uv": [ + 0, + 0, + 6, + 2 + ], + "texture": "#border" + } + } + }, + { + "name": "Line3", + "from": [ + 3, + 3, + 4 + ], + "to": [ + 13, + 13, + 6 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 10, + 10 + ], + "texture": "#border" + }, + "east": { + "uv": [ + 0, + 0, + 2, + 10 + ], + "texture": "#border" + }, + "south": { + "uv": [ + 0, + 0, + 10, + 10 + ], + "texture": "#border" + }, + "west": { + "uv": [ + 0, + 0, + 2, + 10 + ], + "texture": "#border" + }, + "up": { + "uv": [ + 0, + 0, + 10, + 2 + ], + "texture": "#border" + }, + "down": { + "uv": [ + 0, + 0, + 10, + 2 + ], + "texture": "#border" + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/external_storage/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/external_storage/base.json new file mode 100644 index 000000000..f5c4b62be --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/external_storage/base.json @@ -0,0 +1,362 @@ +{ + "parent": "block/block", + "textures": { + "border": "refinedstorage:block/cable/part_border" + }, + "elements": [ + { + "name": "Core", + "from": [ + 6, + 6, + 6 + ], + "to": [ + 10, + 10, + 10 + ], + "faces": { + "north": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part1", + "from": [ + 10, + 6, + 6 + ], + "to": [ + 16, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 16, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part2", + "from": [ + 0, + 6, + 6 + ], + "to": [ + 6, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 6, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 3.0, + 3.0, + 0.0 + ], + "to": [ + 13.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fallback_security_card.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fallback_security_card.json new file mode 100644 index 000000000..afc1fd36c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fallback_security_card.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/security_card/fallback" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_1_upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_1_upgrade.json new file mode 100644 index 000000000..e14d1f386 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_1_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/fortune_upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_2_upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_2_upgrade.json new file mode 100644 index 000000000..e14d1f386 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_2_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/fortune_upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_3_upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_3_upgrade.json new file mode 100644 index 000000000..e14d1f386 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/fortune_3_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/fortune_upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/importer/base.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/importer/base.json new file mode 100644 index 000000000..808aa0cf4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/importer/base.json @@ -0,0 +1,440 @@ +{ + "parent": "block/block", + "textures": { + "border": "refinedstorage:block/cable/part_border" + }, + "elements": [ + { + "name": "Core", + "from": [ + 6, + 6, + 6 + ], + "to": [ + 10, + 10, + 10 + ], + "faces": { + "north": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part1", + "from": [ + 10, + 6, + 6 + ], + "to": [ + 16, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 16, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Part2", + "from": [ + 0, + 6, + 6 + ], + "to": [ + 6, + 10, + 10 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 6, + 8, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 10, + 6, + 16, + 10 + ], + "texture": "#cable" + }, + "east": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "south": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "west": { + "uv": [ + 6, + 6, + 10, + 10 + ], + "texture": "#cable" + }, + "up": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + }, + "down": { + "uv": [ + 0, + 6, + 6, + 10 + ], + "texture": "#cable" + } + } + }, + { + "name": "Line1", + "from": [ + 6.0, + 6.0, + 4.0 + ], + "to": [ + 10.0, + 10.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 5.0, + 5.0, + 2.0 + ], + "to": [ + 11.0, + 11.0, + 4.0 + ], + "faces": { + "north": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 3.0, + 3.0, + 0.0 + ], + "to": [ + 13.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#border", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/improved_processor.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/improved_processor.json new file mode 100644 index 000000000..c3bcd6956 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/improved_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/improved_processor" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/interface.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/interface.json new file mode 100644 index 000000000..48f8e695d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/interface.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/interface_inactive" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/machine_casing.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/machine_casing.json new file mode 100644 index 000000000..effe3052c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/machine_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/machine_casing" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card.json new file mode 100644 index 000000000..d6c6eaa8f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card.json @@ -0,0 +1,17 @@ +{ + "parent": "item/generated", + "overrides": [ + { + "predicate": { + "refinedstorage:network_card_active": 0 + }, + "model": "refinedstorage:item/network_card/inactive" + }, + { + "predicate": { + "refinedstorage:network_card_active": 1 + }, + "model": "refinedstorage:item/network_card/active" + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/active.json new file mode 100644 index 000000000..b47f95ef8 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/network_card/active" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/inactive.json new file mode 100644 index 000000000..ac374ed53 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/network_card/inactive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/network_card/inactive" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/portable_grid.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/portable_grid.json new file mode 100644 index 000000000..d81149a10 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/portable_grid.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/portable_grid" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/processor_binding.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/processor_binding.json new file mode 100644 index 000000000..0872126d4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/processor_binding.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/processor_binding" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper.json new file mode 100644 index 000000000..fe4c3a3cf --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/quartz_enriched_copper" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json new file mode 100644 index 000000000..7fa5d899a --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_copper_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/quartz_enriched_copper_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json new file mode 100644 index 000000000..cbb6c1054 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/quartz_enriched_iron" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json new file mode 100644 index 000000000..5737f1a5c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron_block.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/quartz_enriched_iron_block" +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json new file mode 100644 index 000000000..1490f23d3 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/range_upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json new file mode 100644 index 000000000..209846857 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_advanced_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/raw_advanced_processor" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json new file mode 100644 index 000000000..308b866a7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_basic_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/raw_basic_processor" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json new file mode 100644 index 000000000..daebe1c27 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/raw_improved_processor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/raw_improved_processor" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/regulator_upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/regulator_upgrade.json new file mode 100644 index 000000000..984029973 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/regulator_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/regulator_upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card.json new file mode 100644 index 000000000..eaa21ecc9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card.json @@ -0,0 +1,17 @@ +{ + "parent": "item/generated", + "overrides": [ + { + "predicate": { + "refinedstorage:security_card_active": 0 + }, + "model": "refinedstorage:item/security_card/inactive" + }, + { + "predicate": { + "refinedstorage:security_card_active": 1 + }, + "model": "refinedstorage:item/security_card/active" + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/active.json new file mode 100644 index 000000000..cb1fd76cc --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/security_card/active" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/inactive.json new file mode 100644 index 000000000..8db3c2a46 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/security_card/inactive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/security_card/inactive" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silicon.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silicon.json new file mode 100644 index 000000000..7ea1ffb01 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silicon.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/silicon" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silk_touch_upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silk_touch_upgrade.json new file mode 100644 index 000000000..33306d666 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/silk_touch_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/silk_touch_upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json new file mode 100644 index 000000000..e1b1be197 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/speed_upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/stack_upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/stack_upgrade.json new file mode 100644 index 000000000..0c6e79562 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/stack_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/stack_upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_housing.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_housing.json new file mode 100644 index 000000000..ce4d4ea76 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_housing.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/storage_housing" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_monitor.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_monitor.json new file mode 100644 index 000000000..a415c8066 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/storage_monitor.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/storage_monitor" +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/upgrade.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/upgrade.json new file mode 100644 index 000000000..a932b7251 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/upgrade" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json new file mode 100644 index 000000000..bd49b2c29 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json @@ -0,0 +1,17 @@ +{ + "parent": "item/generated", + "overrides": [ + { + "predicate": { + "refinedstorage:network_bound_active": 0 + }, + "model": "refinedstorage:item/wireless_grid/inactive" + }, + { + "predicate": { + "refinedstorage:network_bound_active": 1 + }, + "model": "refinedstorage:item/wireless_grid/active" + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/active.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/active.json new file mode 100644 index 000000000..63cabecba --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/wireless_grid/active" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/inactive.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/inactive.json new file mode 100644 index 000000000..d4fb0c5a8 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wireless_grid/inactive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/wireless_grid/inactive" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wrench.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wrench.json new file mode 100644 index 000000000..5a9fb2b48 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/models/item/wrench.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:item/wrench" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds.json b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds.json new file mode 100644 index 000000000..c431a0b99 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds.json @@ -0,0 +1,8 @@ +{ + "wrench": { + "subtitle": "refinedstorage.subtitle.wrench", + "sounds": [ + "refinedstorage:wrench" + ] + } +} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/sounds/wrench.ogg b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds/wrench.ogg similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/sounds/wrench.ogg rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/sounds/wrench.ogg diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/bottom.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/bottom.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/bottom.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/bottom.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/part_border.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/part_border.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/part_border.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/part_border.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/cable/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/cable/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/constructor/cutouts/active.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/constructor/cutouts/active.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/constructor/cutouts/active.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/constructor/cutouts/active.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/active.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/constructor/cutouts/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/constructor/cutouts/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/cutouts/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/constructor/front.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/front.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/constructor/front.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/constructor/front.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/black.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/black.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/black.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/blue.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/blue.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/blue.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/brown.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/brown.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/brown.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/cyan.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/cyan.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/cyan.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/gray.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/gray.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/gray.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/green.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/green.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/green.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/light_blue.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/light_blue.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_blue.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/light_gray.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/light_gray.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/light_gray.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/lime.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/lime.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/lime.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/magenta.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/magenta.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/magenta.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_off.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_off.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_off.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_off.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_off_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_off_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_off_gray.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_on.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_on.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_on.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_on.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_on_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_on_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/nearly_on_gray.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/off.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/off.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/off.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/off.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/on.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/on.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/on.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/on.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/orange.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/orange.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/orange.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/pink.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/pink.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/pink.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/purple.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/purple.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/purple.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/red.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/red.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/red.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/white.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/white.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/white.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/yellow.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/cutouts/yellow.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/cutouts/yellow.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/off.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/off.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/off.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/off.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/on.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/on.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/controller/on.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/controller/on.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/back.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/back.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/back.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/back.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/cutouts/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/cutouts/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/front.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/front.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/front.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/front.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/left.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/left.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/left.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/left.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/right.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/right.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/right.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/right.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/top.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/top.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/crafting_grid/top.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/crafting_grid/top.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/destructor/cutouts/active.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/destructor/cutouts/active.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/destructor/cutouts/active.png.mcmeta b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png.mcmeta similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/destructor/cutouts/active.png.mcmeta rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/active.png.mcmeta diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/destructor/cutouts/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/destructor/cutouts/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/cutouts/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/destructor/front.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/front.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/destructor/front.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/destructor/front.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/bottom.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/bottom.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/bottom.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/bottom.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/unpowered.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/unpowered.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/unpowered.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/unpowered.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/cutouts/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/cutouts/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/side.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/side.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/side.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/side.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/top.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/top.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/detector/top.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/detector/top.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk/disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk/disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk/fluid_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/fluid_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk/fluid_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/fluid_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk/leds.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/leds.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk/leds.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk/leds.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_drive/bottom.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/bottom.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_drive/bottom.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/bottom.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_drive/front.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/front.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_drive/front.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/front.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_drive/side.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/side.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_drive/side.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/side.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_drive/top.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/top.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_drive/top.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_drive/top.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/back.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/back.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/back.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/back.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/cutouts/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/cutouts/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/front.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/front.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/front.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/front.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/left.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/left.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/left.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/left.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/right.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/right.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/right.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/right.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/top.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/top.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/disk_interface/top.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/disk_interface/top.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/1024b_fluid_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/1024b_fluid_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/1024b_fluid_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/1024b_fluid_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/256b_fluid_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/256b_fluid_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/256b_fluid_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/256b_fluid_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/4096b_fluid_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/4096b_fluid_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/4096b_fluid_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/4096b_fluid_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/64b_fluid_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/64b_fluid_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/64b_fluid_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/64b_fluid_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/creative_fluid_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/creative_fluid_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/fluid_storage_block/creative_fluid_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/fluid_storage_block/creative_fluid_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/back.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/back.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/back.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/back.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/cutouts/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/cutouts/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/front.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/front.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/front.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/front.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/left.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/left.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/left.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/left.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/right.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/right.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/right.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/right.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/top.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/top.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/grid/top.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/grid/top.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/interface/active.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/interface/active.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/interface/active.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/interface/active.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/interface/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/interface/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/interface/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/interface/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/machine_casing.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/machine_casing.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/machine_casing.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/machine_casing.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/base.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/base.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/base.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/base.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_receiver/cutouts/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_receiver/cutouts/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/base.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/base.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/base.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/base.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/error.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/error.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/error.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/error.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/network_transmitter/cutouts/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/network_transmitter/cutouts/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_1.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_1.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_1.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_1.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_2.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_2.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_2_inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2_inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_2_inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_2_inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_3.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_3.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_3.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_3.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_4.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_4.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_4.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_4.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_5.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_5.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_5.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_5.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_6.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_6.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_6.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_6.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_7.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_7.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_7.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_7.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_8.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_8.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/portable_grid/portable_grid_8.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/portable_grid/portable_grid_8.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/quartz_enriched_copper_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/quartz_enriched_copper_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_copper_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/quartz_enriched_iron_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_iron_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/quartz_enriched_iron_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/quartz_enriched_iron_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/in/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/cutouts/in/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/in.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/in.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/in.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/in.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/out.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/out.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/out.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/relay/out.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/back.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/back.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/back.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/back.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/back/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/back/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/front/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/front/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/left/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/left/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/right/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/right/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/cutouts/top/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/cutouts/top/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/front.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/front.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/front.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/front.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/left.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/left.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/left.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/left.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/right.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/right.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/right.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/right.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/top.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/top.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/security_manager/top.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/security_manager/top.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/side.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/side.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/side.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/side.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/16k_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/16k_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/16k_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/16k_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/1k_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/1k_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/1k_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/1k_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/4k_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/4k_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/4k_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/4k_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/64k_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/64k_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/64k_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/64k_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/creative_storage_block.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/creative_storage_block.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_block/creative_storage_block.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_block/creative_storage_block.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/back.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/back.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/back.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/back.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/front.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/front.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/front.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/front.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/left.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/left.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/left.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/left.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/right.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/right.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/right.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/right.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/top.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/top.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/storage_monitor/top.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/storage_monitor/top.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/base.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/base.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/base.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/base.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/black.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/black.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/black.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/black.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/brown.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/brown.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/brown.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/brown.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/cyan.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/cyan.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/cyan.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/cyan.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/green.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/green.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/green.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/green.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/light_blue.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_blue.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/light_blue.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_blue.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/light_gray.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_gray.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/light_gray.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/light_gray.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/lime.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/lime.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/lime.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/lime.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/magenta.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/magenta.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/magenta.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/magenta.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/orange.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/orange.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/orange.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/orange.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/pink.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/pink.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/pink.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/pink.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/purple.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/purple.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/purple.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/purple.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/red.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/red.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/red.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/red.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/white.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/white.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/white.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/white.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/yellow.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/yellow.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/wireless_transmitter/cutouts/yellow.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/block/wireless_transmitter/cutouts/yellow.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/advancements.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/advancements.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/advancements.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/advancements.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/amount_with_inventory.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/amount_with_inventory.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/amount_with_inventory.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/amount_with_inventory.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/book.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/book.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/book.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/book.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/controller.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/controller.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/controller.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/controller.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/crafting.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/crafting.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/crafting.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/crafting.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/crafting_grid.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/crafting_grid.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/disk_drive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/disk_drive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/disk_interface.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/disk_interface.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/disk_interface.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/disk_interface.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/generic_filter.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/generic_filter.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/generic_filter.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/generic_filter.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/grid.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/grid.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/grid.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/grid.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/interface.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/interface.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/interface.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/interface.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/network_transmitter.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png old mode 100755 new mode 100644 similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/network_transmitter.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/network_transmitter.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/portable_grid.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/portable_grid.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/portable_grid.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/portable_grid.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/priority.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/priority.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/priority.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/priority.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/resource_amount.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/resource_amount.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/resource_amount.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/resource_amount.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/security_card.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/security_card.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/security_card.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/security_card.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/security_manager.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/security_manager.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/security_manager.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/security_manager.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_down.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_down.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_down_disabled.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_disabled.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_down_disabled.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_disabled.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_down_focused.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_focused.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_down_focused.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_down_focused.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_up.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_up.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_up_disabled.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_disabled.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_up_disabled.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_disabled.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_up_focused.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_focused.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/sprites/widget/move_up_focused.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/move_up_focused.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/storage.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/storage.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/storage.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/storage.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/storage_monitor.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/storage_monitor.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/storage_monitor.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/storage_monitor.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/widgets.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/widgets.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/widgets.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/widgets.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/wireless_transmitter.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/gui/wireless_transmitter.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/icons.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/icons.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/icons.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/icons.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/1024b_fluid_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/1024b_fluid_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/1024b_fluid_storage_part.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_part.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/1024b_fluid_storage_part.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1024b_fluid_storage_part.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/16k_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/16k_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/16k_storage_part.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_part.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/16k_storage_part.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/16k_storage_part.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/1k_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/1k_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/1k_storage_part.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_part.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/1k_storage_part.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/1k_storage_part.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/256b_fluid_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/256b_fluid_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/256b_fluid_storage_part.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_part.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/256b_fluid_storage_part.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/256b_fluid_storage_part.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/4096b_fluid_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/4096b_fluid_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/4096b_fluid_storage_part.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_part.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/4096b_fluid_storage_part.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4096b_fluid_storage_part.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/4k_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/4k_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/4k_storage_part.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_part.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/4k_storage_part.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/4k_storage_part.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/64b_fluid_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/64b_fluid_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/64b_fluid_storage_part.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_part.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/64b_fluid_storage_part.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64b_fluid_storage_part.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/64k_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/64k_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/64k_storage_part.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_part.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/64k_storage_part.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/64k_storage_part.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/advanced_processor.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/advanced_processor.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/advanced_processor.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/advanced_processor.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/basic_processor.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/basic_processor.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/basic_processor.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/basic_processor.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/book.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/book.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/book.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/book.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/configuration_card/active.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/active.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/configuration_card/active.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/active.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/configuration_card/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/configuration_card/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/configuration_card/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/construction_core.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/construction_core.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/construction_core.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/construction_core.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/creative_fluid_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_fluid_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/creative_fluid_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_fluid_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/creative_range_upgrade.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_range_upgrade.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/creative_range_upgrade.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_range_upgrade.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/creative_storage_disk.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_storage_disk.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/creative_storage_disk.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/creative_storage_disk.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/destruction_core.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/destruction_core.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/destruction_core.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/destruction_core.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/fortune_upgrade.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/fortune_upgrade.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/fortune_upgrade.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/fortune_upgrade.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/improved_processor.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/improved_processor.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/improved_processor.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/improved_processor.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/network_card/active.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/network_card/active.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/network_card/active.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/network_card/active.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/network_card/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/network_card/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/network_card/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/network_card/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/processor_binding.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/processor_binding.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/processor_binding.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/processor_binding.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/quartz_enriched_copper.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_copper.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/quartz_enriched_copper.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_copper.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/quartz_enriched_iron.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_iron.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/quartz_enriched_iron.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/quartz_enriched_iron.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/range_upgrade.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/range_upgrade.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/range_upgrade.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/range_upgrade.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/raw_advanced_processor.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_advanced_processor.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/raw_advanced_processor.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_advanced_processor.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/raw_basic_processor.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_basic_processor.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/raw_basic_processor.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_basic_processor.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/raw_improved_processor.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_improved_processor.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/raw_improved_processor.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/raw_improved_processor.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/regulator_upgrade.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/regulator_upgrade.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/regulator_upgrade.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/regulator_upgrade.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/security_card/active.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/active.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/security_card/active.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/active.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/security_card/fallback.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/fallback.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/security_card/fallback.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/fallback.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/security_card/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/security_card/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/security_card/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/silicon.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/silicon.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/silicon.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/silicon.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/silk_touch_upgrade.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/silk_touch_upgrade.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/silk_touch_upgrade.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/silk_touch_upgrade.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/speed_upgrade.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/speed_upgrade.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/speed_upgrade.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/speed_upgrade.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/stack_upgrade.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/stack_upgrade.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/stack_upgrade.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/stack_upgrade.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/storage_housing.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/storage_housing.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/storage_housing.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/storage_housing.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/upgrade.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/upgrade.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/upgrade.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/upgrade.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/wireless_grid/active.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/active.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/wireless_grid/active.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/active.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/wireless_grid/inactive.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/inactive.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/wireless_grid/inactive.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wireless_grid/inactive.png diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/wrench.png b/refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wrench.png similarity index 100% rename from refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/item/wrench.png rename to refinedstorage-platform-common/src/main/resources/assets/refinedstorage/textures/item/wrench.png diff --git a/refinedstorage-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json b/refinedstorage-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json new file mode 100644 index 000000000..e2d735652 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "refinedstorage:wrench" + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/better_than_a_barrel.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/better_than_a_barrel.json new file mode 100644 index 000000000..e9254bf59 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/better_than_a_barrel.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:storage_monitor" + }, + "title": { + "translate": "advancements.refinedstorage.better_than_a_barrel" + }, + "description": { + "translate": "advancements.refinedstorage.better_than_a_barrel.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "storage_monitor_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "refinedstorage:storage_monitor" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/conditional_connecting.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/conditional_connecting.json new file mode 100644 index 000000000..078c8f4c0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/conditional_connecting.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:relay" + }, + "title": { + "translate": "advancements.refinedstorage.conditional_connecting" + }, + "description": { + "translate": "advancements.refinedstorage.conditional_connecting.description" + } + }, + "parent": "refinedstorage:connecting", + "criteria": { + "relay_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:relays" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/connecting.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/connecting.json new file mode 100644 index 000000000..1d5d2e52b --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/connecting.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:cable" + }, + "title": { + "translate": "advancements.refinedstorage.connecting" + }, + "description": { + "translate": "advancements.refinedstorage.connecting.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "cable_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:cables" + } + ] + } + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/construction.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/construction.json new file mode 100644 index 000000000..3710ec4d5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/construction.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:constructor" + }, + "title": { + "translate": "advancements.refinedstorage.construction" + }, + "description": { + "translate": "advancements.refinedstorage.construction.description" + } + }, + "parent": "refinedstorage:exporting", + "criteria": { + "constructor_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:constructors" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/destruction.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/destruction.json new file mode 100644 index 000000000..036b46d50 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/destruction.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:destructor" + }, + "title": { + "translate": "advancements.refinedstorage.destruction" + }, + "description": { + "translate": "advancements.refinedstorage.destruction.description" + } + }, + "parent": "refinedstorage:importing", + "criteria": { + "destructor_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:destructors" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/detecting.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/detecting.json new file mode 100644 index 000000000..3599247f0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/detecting.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:detector" + }, + "title": { + "translate": "advancements.refinedstorage.detecting" + }, + "description": { + "translate": "advancements.refinedstorage.detecting.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "detector_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:detectors" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/drives.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/drives.json new file mode 100644 index 000000000..7bc7e26f3 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/drives.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:disk_drive" + }, + "title": { + "translate": "advancements.refinedstorage.drives" + }, + "description": { + "translate": "advancements.refinedstorage.drives.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "disk_drive_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "refinedstorage:disk_drive" + } + ] + } + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/exporting.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/exporting.json new file mode 100644 index 000000000..f20a83e10 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/exporting.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:exporter" + }, + "title": { + "translate": "advancements.refinedstorage.exporting" + }, + "description": { + "translate": "advancements.refinedstorage.exporting.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "exporter_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:exporters" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/importing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/importing.json new file mode 100644 index 000000000..6390b3f60 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/importing.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:importer" + }, + "title": { + "translate": "advancements.refinedstorage.importing" + }, + "description": { + "translate": "advancements.refinedstorage.importing.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "importer_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:importers" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interface_to_the_world.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interface_to_the_world.json new file mode 100644 index 000000000..9612d705d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interface_to_the_world.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:interface" + }, + "title": { + "translate": "advancements.refinedstorage.interface_to_the_world" + }, + "description": { + "translate": "advancements.refinedstorage.interface_to_the_world.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "interface_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "refinedstorage:interface" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interfacing_with_disks.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interfacing_with_disks.json new file mode 100644 index 000000000..cde0a011d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/interfacing_with_disks.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:disk_interface" + }, + "title": { + "translate": "advancements.refinedstorage.interfacing_with_disks" + }, + "description": { + "translate": "advancements.refinedstorage.interfacing_with_disks.description" + } + }, + "parent": "refinedstorage:drives", + "criteria": { + "disk_interface_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:disk_interfaces" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/no_cables_required.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/no_cables_required.json new file mode 100644 index 000000000..19504e1ec --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/no_cables_required.json @@ -0,0 +1,34 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:network_transmitter" + }, + "title": { + "translate": "advancements.refinedstorage.no_cables_required" + }, + "description": { + "translate": "advancements.refinedstorage.no_cables_required.description" + } + }, + "parent": "refinedstorage:wireless", + "criteria": { + "network_transmitter_receiver_card_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:network_transmitters" + }, + { + "items": "#refinedstorage:network_receivers" + }, + { + "items": [ + "refinedstorage:network_card" + ] + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/portable_storage.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/portable_storage.json new file mode 100644 index 000000000..828c0df83 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/portable_storage.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:portable_grid" + }, + "title": { + "translate": "advancements.refinedstorage.portable_storage" + }, + "description": { + "translate": "advancements.refinedstorage.portable_storage.description" + } + }, + "parent": "refinedstorage:viewing_your_storage", + "criteria": { + "portable_grid_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "refinedstorage:portable_grid" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/root.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/root.json new file mode 100644 index 000000000..b8e946f93 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/root.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:creative_controller" + }, + "title": { + "translate": "mod.refinedstorage" + }, + "description": { + "translate": "advancements.refinedstorage.root.description" + }, + "background": "refinedstorage:textures/gui/advancements.png" + }, + "criteria": { + "controller_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:controllers" + } + ] + } + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/security.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/security.json new file mode 100644 index 000000000..f59ca44b6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/security.json @@ -0,0 +1,32 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:security_manager" + }, + "title": { + "translate": "advancements.refinedstorage.security" + }, + "description": { + "translate": "advancements.refinedstorage.security.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "security_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:security_managers" + }, + { + "items": [ + "refinedstorage:security_card", + "refinedstorage:fallback_security_card" + ] + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_externally.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_externally.json new file mode 100644 index 000000000..75378eaf0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_externally.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:external_storage" + }, + "title": { + "translate": "advancements.refinedstorage.storing_externally" + }, + "description": { + "translate": "advancements.refinedstorage.storing_externally.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "external_storage_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:external_storages" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_fluids.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_fluids.json new file mode 100644 index 000000000..66d7f1ced --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_fluids.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:64b_fluid_storage_disk" + }, + "title": { + "translate": "advancements.refinedstorage.storing_fluids" + }, + "description": { + "translate": "advancements.refinedstorage.storing_fluids.description" + } + }, + "parent": "refinedstorage:drives", + "criteria": { + "fluid_storage_disk_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:fluid_storage_disks" + } + ] + } + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_items.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_items.json new file mode 100644 index 000000000..c869e643c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/storing_items.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:1k_storage_disk" + }, + "title": { + "translate": "advancements.refinedstorage.storing_items" + }, + "description": { + "translate": "advancements.refinedstorage.storing_items.description" + } + }, + "parent": "refinedstorage:drives", + "criteria": { + "storage_disk_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:storage_disks" + } + ] + } + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading.json new file mode 100644 index 000000000..dbfabe0de --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:upgrade" + }, + "title": { + "translate": "advancements.refinedstorage.upgrading" + }, + "description": { + "translate": "advancements.refinedstorage.upgrading.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "upgrade_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "refinedstorage:upgrade" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading_your_grid.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading_your_grid.json new file mode 100644 index 000000000..a39cb5dcf --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/upgrading_your_grid.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:crafting_grid" + }, + "title": { + "translate": "advancements.refinedstorage.upgrading_your_grid" + }, + "description": { + "translate": "advancements.refinedstorage.upgrading_your_grid.description" + } + }, + "parent": "refinedstorage:viewing_your_storage", + "criteria": { + "crafting_grid_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:crafting_grids" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/viewing_your_storage.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/viewing_your_storage.json new file mode 100644 index 000000000..cdc2db158 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/viewing_your_storage.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:grid" + }, + "title": { + "translate": "advancements.refinedstorage.viewing_your_storage" + }, + "description": { + "translate": "advancements.refinedstorage.viewing_your_storage.description" + } + }, + "parent": "refinedstorage:storing_items", + "criteria": { + "grid_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "#refinedstorage:grids" + } + ] + } + } + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/wireless.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/wireless.json new file mode 100644 index 000000000..234f23d61 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/advancement/wireless.json @@ -0,0 +1,31 @@ +{ + "display": { + "icon": { + "id": "refinedstorage:wireless_grid" + }, + "title": { + "translate": "advancements.refinedstorage.wireless" + }, + "description": { + "translate": "advancements.refinedstorage.wireless.description" + } + }, + "parent": "refinedstorage:root", + "criteria": { + "wireless_grid_in_inventory": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "refinedstorage:wireless_grid" + ] + }, + { + "items": "#refinedstorage:wireless_transmitters" + } + ] + } + } + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1024b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1024b_fluid_storage_block.json new file mode 100644 index 000000000..e1249ca23 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1024b_fluid_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:1024b_fluid_storage_block", + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/16k_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/16k_storage_block.json new file mode 100644 index 000000000..f1382ec5f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/16k_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:16k_storage_block" + } + ], + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1k_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1k_storage_block.json new file mode 100644 index 000000000..a29c5192d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/1k_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:1k_storage_block" + } + ], + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/256b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/256b_fluid_storage_block.json new file mode 100644 index 000000000..a5424a30f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/256b_fluid_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:256b_fluid_storage_block", + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4096b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4096b_fluid_storage_block.json new file mode 100644 index 000000000..2ff734543 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4096b_fluid_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:4096b_fluid_storage_block", + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4k_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4k_storage_block.json new file mode 100644 index 000000000..c30f61de3 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/4k_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:4k_storage_block" + } + ], + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64b_fluid_storage_block.json new file mode 100644 index 000000000..3912817f5 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64b_fluid_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:64b_fluid_storage_block", + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64k_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64k_storage_block.json new file mode 100644 index 000000000..aa8bbd677 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/64k_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:64k_storage_block" + } + ], + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_fluid_storage_block.json new file mode 100644 index 000000000..829e9de35 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_fluid_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:creative_fluid_storage_block", + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_portable_grid.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_portable_grid.json new file mode 100644 index 000000000..8847a0627 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_portable_grid.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:creative_portable_grid", + "functions": [ + { + "function": "refinedstorage:portable_grid" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_storage_block.json new file mode 100644 index 000000000..1472b7692 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/creative_storage_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:creative_storage_block" + } + ], + "functions": [ + { + "function": "refinedstorage:storage_block" + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/disk_drive.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/disk_drive.json new file mode 100644 index 000000000..99c8c6f34 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/disk_drive.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:disk_drive" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/exporter.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/exporter.json new file mode 100644 index 000000000..b27651dc7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/exporter.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:exporter" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/external_storage.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/external_storage.json new file mode 100644 index 000000000..3b8bb9058 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/external_storage.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:external_storage" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/importer.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/importer.json new file mode 100644 index 000000000..0b7e38e4f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/importer.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:importer" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/interface.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/interface.json new file mode 100644 index 000000000..123a5f704 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/interface.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:interface" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/machine_casing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/machine_casing.json new file mode 100644 index 000000000..7f4bb72cf --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/machine_casing.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:machine_casing" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/portable_grid.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/portable_grid.json new file mode 100644 index 000000000..3970f8e98 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/portable_grid.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:portable_grid", + "functions": [ + { + "function": "refinedstorage:portable_grid" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json new file mode 100644 index 000000000..1ca63eacc --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/quartz_enriched_iron_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:quartz_enriched_iron_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/storage_monitor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/storage_monitor.json new file mode 100644 index 000000000..6e79b8f3c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/loot_table/blocks/storage_monitor.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:storage_monitor" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_block.json new file mode 100644 index 000000000..a7502ef6a --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_block.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EME", + "ERE" + ], + "key": { + "M": { + "item": "refinedstorage:machine_casing" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:1024b_fluid_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:1024b_fluid_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk.json new file mode 100644 index 000000000..8c81e0b7c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:1024b_fluid_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:1024b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk_from_storage_housing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..023e81d09 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_disk_from_storage_housing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:1024b_fluid_storage_part" + } + ], + "result": { + "id": "refinedstorage:1024b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_part.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_part.json new file mode 100644 index 000000000..a61de6dad --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1024b_fluid_storage_part.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "refinedstorage:improved_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:256b_fluid_storage_part" + }, + "R": { + "tag": "c:buckets/empty" + } + }, + "result": { + "id": "refinedstorage:1024b_fluid_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_block.json new file mode 100644 index 000000000..69cae4b69 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_block.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EME", + "ERE" + ], + "key": { + "M": { + "item": "refinedstorage:machine_casing" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:16k_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:16k_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk.json new file mode 100644 index 000000000..ec83965fc --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:16k_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:16k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk_from_storage_housing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..2bfb50d1b --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_disk_from_storage_housing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:16k_storage_part" + } + ], + "result": { + "id": "refinedstorage:16k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_part.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_part.json new file mode 100644 index 000000000..727aaab2d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/16k_storage_part.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "refinedstorage:improved_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:4k_storage_part" + }, + "R": { + "tag": "c:dusts/redstone" + } + }, + "result": { + "id": "refinedstorage:16k_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_block.json new file mode 100644 index 000000000..a1d0064c0 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_block.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EME", + "ERE" + ], + "key": { + "M": { + "item": "refinedstorage:machine_casing" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:1k_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:1k_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk.json new file mode 100644 index 000000000..a2c191c72 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:1k_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:1k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk_from_storage_housing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..b691b1d7e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_disk_from_storage_housing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:1k_storage_part" + } + ], + "result": { + "id": "refinedstorage:1k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json new file mode 100644 index 000000000..ed749ef7a --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/1k_storage_part.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SES", + "GRG", + "SGS" + ], + "key": { + "S": { + "item": "refinedstorage:silicon" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + } + }, + "result": { + "id": "refinedstorage:1k_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_block.json new file mode 100644 index 000000000..328093d2d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_block.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EME", + "ERE" + ], + "key": { + "M": { + "item": "refinedstorage:machine_casing" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:256b_fluid_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:256b_fluid_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk.json new file mode 100644 index 000000000..4a8a97c52 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:256b_fluid_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:256b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk_from_storage_housing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..641631aa9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_disk_from_storage_housing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:256b_fluid_storage_part" + } + ], + "result": { + "id": "refinedstorage:256b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_part.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_part.json new file mode 100644 index 000000000..95c4de6b8 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/256b_fluid_storage_part.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "refinedstorage:basic_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:64b_fluid_storage_part" + }, + "R": { + "tag": "c:buckets/empty" + } + }, + "result": { + "id": "refinedstorage:256b_fluid_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_block.json new file mode 100644 index 000000000..24525637e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_block.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EME", + "ERE" + ], + "key": { + "M": { + "item": "refinedstorage:machine_casing" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:4096b_fluid_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:4096b_fluid_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk.json new file mode 100644 index 000000000..bb9bc0e4e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:4096b_fluid_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:4096b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk_from_storage_housing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..d95708032 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_disk_from_storage_housing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:4096b_fluid_storage_part" + } + ], + "result": { + "id": "refinedstorage:4096b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_part.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_part.json new file mode 100644 index 000000000..44ffb81c1 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4096b_fluid_storage_part.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "refinedstorage:advanced_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:1024b_fluid_storage_part" + }, + "R": { + "tag": "c:buckets/empty" + } + }, + "result": { + "id": "refinedstorage:4096b_fluid_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_block.json new file mode 100644 index 000000000..ade056698 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_block.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EME", + "ERE" + ], + "key": { + "M": { + "item": "refinedstorage:machine_casing" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:4k_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:4k_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk.json new file mode 100644 index 000000000..ee8333b27 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:4k_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:4k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk_from_storage_housing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..1f5f4dd8f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_disk_from_storage_housing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:4k_storage_part" + } + ], + "result": { + "id": "refinedstorage:4k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_part.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_part.json new file mode 100644 index 000000000..2268e3bb4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/4k_storage_part.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "refinedstorage:basic_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:1k_storage_part" + }, + "R": { + "tag": "c:dusts/redstone" + } + }, + "result": { + "id": "refinedstorage:4k_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_block.json new file mode 100644 index 000000000..9dc3208c7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_block.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EME", + "ERE" + ], + "key": { + "M": { + "item": "refinedstorage:machine_casing" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:64b_fluid_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:64b_fluid_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk.json new file mode 100644 index 000000000..6bf117cb2 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:64b_fluid_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:64b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk_from_storage_housing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..ec503d934 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_disk_from_storage_housing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:64b_fluid_storage_part" + } + ], + "result": { + "id": "refinedstorage:64b_fluid_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json new file mode 100644 index 000000000..36ff7f29c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64b_fluid_storage_part.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SES", + "GRG", + "SGS" + ], + "key": { + "S": { + "item": "refinedstorage:silicon" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:buckets/empty" + } + }, + "result": { + "id": "refinedstorage:64b_fluid_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_block.json new file mode 100644 index 000000000..f89a7b027 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_block.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EME", + "ERE" + ], + "key": { + "M": { + "item": "refinedstorage:machine_casing" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:64k_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:64k_storage_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk.json new file mode 100644 index 000000000..baef96ecc --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "RPR", + "EEE" + ], + "key": { + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "P": { + "item": "refinedstorage:64k_storage_part" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:64k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk_from_storage_housing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk_from_storage_housing.json new file mode 100644 index 000000000..ef942cc48 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_disk_from_storage_housing.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:storage_housing" + }, + { + "item": "refinedstorage:64k_storage_part" + } + ], + "result": { + "id": "refinedstorage:64k_storage_disk" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_part.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_part.json new file mode 100644 index 000000000..360d64263 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/64k_storage_part.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PEP", + "SRS", + "PSP" + ], + "key": { + "P": { + "item": "refinedstorage:advanced_processor" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:16k_storage_part" + }, + "R": { + "tag": "c:dusts/redstone" + } + }, + "result": { + "id": "refinedstorage:64k_storage_part" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/advanced_processor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/advanced_processor.json new file mode 100644 index 000000000..abaecfc50 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/advanced_processor.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "refinedstorage:raw_advanced_processor" + }, + "result": { + "id": "refinedstorage:advanced_processor" + }, + "experience": 0.5 +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/basic_processor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/basic_processor.json new file mode 100644 index 000000000..6de5e7fba --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/basic_processor.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "refinedstorage:raw_basic_processor" + }, + "result": { + "id": "refinedstorage:basic_processor" + }, + "experience": 0.5 +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/cable.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/cable.json new file mode 100644 index 000000000..764a33912 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/cable.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EEE", + "GRG", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_copper" + }, + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + } + }, + "result": { + "id": "refinedstorage:cable", + "count": 12 + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/configuration_card.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/configuration_card.json new file mode 100644 index 000000000..72286ad62 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/configuration_card.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EEE", + "PAP", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "P": { + "item": "minecraft:paper" + }, + "A": { + "item": "refinedstorage:improved_processor" + } + }, + "result": { + "id": "refinedstorage:configuration_card" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/construction_core.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/construction_core.json new file mode 100644 index 000000000..a71ed9b68 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/construction_core.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:basic_processor" + }, + { + "tag": "c:dusts/glowstone" + } + ], + "result": { + "id": "refinedstorage:construction_core" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/constructor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/constructor.json new file mode 100644 index 000000000..878b9042e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/constructor.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ECE", + "RMR", + "EIE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "C": { + "item": "refinedstorage:construction_core" + }, + "R": { + "tag": "c:gems/diamond" + }, + "M": { + "item": "refinedstorage:cable" + }, + "I": { + "item": "refinedstorage:improved_processor" + } + }, + "result": { + "id": "refinedstorage:constructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/controller.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/controller.json new file mode 100644 index 000000000..70ef12fd8 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/controller.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "SMS", + "ESE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "P": { + "item": "refinedstorage:advanced_processor" + }, + "S": { + "item": "refinedstorage:silicon" + }, + "M": { + "item": "refinedstorage:machine_casing" + } + }, + "result": { + "id": "refinedstorage:controller" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/crafting_grid.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/crafting_grid.json new file mode 100644 index 000000000..c3a4aca71 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/crafting_grid.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:grid" + }, + { + "item": "refinedstorage:advanced_processor" + }, + { + "tag": "c:player_workstations/crafting_tables" + } + ], + "result": { + "id": "refinedstorage:crafting_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destruction_core.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destruction_core.json new file mode 100644 index 000000000..f5914228c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destruction_core.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:basic_processor" + }, + { + "tag": "c:gems/quartz" + } + ], + "result": { + "id": "refinedstorage:destruction_core" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destructor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destructor.json new file mode 100644 index 000000000..8ba2e07ce --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/destructor.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EDE", + "ICI", + "EPE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "D": { + "item": "refinedstorage:destruction_core" + }, + "I": { + "tag": "c:gems/diamond" + }, + "C": { + "item": "refinedstorage:cable" + }, + "P": { + "item": "refinedstorage:improved_processor" + } + }, + "result": { + "id": "refinedstorage:destructor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/detector.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/detector.json new file mode 100644 index 000000000..facfe2b51 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/detector.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ERE", + "CMC", + "EPE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "C": { + "item": "minecraft:comparator" + }, + "R": { + "item": "minecraft:redstone_torch" + }, + "M": { + "item": "refinedstorage:machine_casing" + }, + "P": { + "item": "refinedstorage:improved_processor" + } + }, + "result": { + "id": "refinedstorage:detector" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_drive.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_drive.json new file mode 100644 index 000000000..f0752e9d4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_drive.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ECE", + "EME", + "EPE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "C": { + "tag": "c:chests" + }, + "M": { + "item": "refinedstorage:machine_casing" + }, + "P": { + "item": "refinedstorage:advanced_processor" + } + }, + "result": { + "id": "refinedstorage:disk_drive" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_interface.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_interface.json new file mode 100644 index 000000000..a0b1fe163 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/disk_interface.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ESE", + "CMD", + "ESE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "refinedstorage:storage_housing" + }, + "C": { + "item": "refinedstorage:construction_core" + }, + "M": { + "item": "refinedstorage:machine_casing" + }, + "D": { + "item": "refinedstorage:destruction_core" + } + }, + "result": { + "id": "refinedstorage:disk_interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/exporter.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/exporter.json new file mode 100644 index 000000000..30b690119 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/exporter.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:cable" + }, + { + "item": "refinedstorage:construction_core" + }, + { + "item": "refinedstorage:improved_processor" + } + ], + "result": { + "id": "refinedstorage:exporter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/external_storage.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/external_storage.json new file mode 100644 index 000000000..5a80c561f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/external_storage.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "CED", + "HMH", + "EPE" + ], + "key": { + "C": { + "item": "refinedstorage:construction_core" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "D": { + "item": "refinedstorage:destruction_core" + }, + "H": { + "tag": "c:chests" + }, + "M": { + "item": "refinedstorage:cable" + }, + "P": { + "item": "refinedstorage:improved_processor" + } + }, + "result": { + "id": "refinedstorage:external_storage" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fallback_security_card.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fallback_security_card.json new file mode 100644 index 000000000..df5926393 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fallback_security_card.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:security_card" + }, + { + "item": "minecraft:paper" + } + ], + "result": { + "id": "refinedstorage:fallback_security_card" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_1_upgrade.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_1_upgrade.json new file mode 100644 index 000000000..9161fac24 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_1_upgrade.json @@ -0,0 +1,8 @@ +{ + "type": "refinedstorage:upgrade_with_enchanted_book", + "enchantment": "minecraft:fortune", + "level": 1, + "result": { + "id": "refinedstorage:fortune_1_upgrade" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_2_upgrade.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_2_upgrade.json new file mode 100644 index 000000000..a557b407e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_2_upgrade.json @@ -0,0 +1,8 @@ +{ + "type": "refinedstorage:upgrade_with_enchanted_book", + "enchantment": "minecraft:fortune", + "level": 2, + "result": { + "id": "refinedstorage:fortune_2_upgrade" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_3_upgrade.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_3_upgrade.json new file mode 100644 index 000000000..a530d5d5a --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/fortune_3_upgrade.json @@ -0,0 +1,8 @@ +{ + "type": "refinedstorage:upgrade_with_enchanted_book", + "enchantment": "minecraft:fortune", + "level": 3, + "result": { + "id": "refinedstorage:fortune_3_upgrade" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/grid.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/grid.json new file mode 100644 index 000000000..3ee005f07 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/grid.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PCG", + "EMG", + "PDG" + ], + "key": { + "P": { + "item": "refinedstorage:improved_processor" + }, + "C": { + "item": "refinedstorage:construction_core" + }, + "G": { + "tag": "c:glass_blocks" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "M": { + "item": "refinedstorage:machine_casing" + }, + "D": { + "item": "refinedstorage:destruction_core" + } + }, + "result": { + "id": "refinedstorage:grid" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/importer.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/importer.json new file mode 100644 index 000000000..06bd2d883 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/importer.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:cable" + }, + { + "item": "refinedstorage:destruction_core" + }, + { + "item": "refinedstorage:improved_processor" + } + ], + "result": { + "id": "refinedstorage:importer" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/improved_processor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/improved_processor.json new file mode 100644 index 000000000..3bb9c61d6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/improved_processor.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "refinedstorage:raw_improved_processor" + }, + "result": { + "id": "refinedstorage:improved_processor" + }, + "experience": 0.5 +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/interface.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/interface.json new file mode 100644 index 000000000..b21bcbb23 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/interface.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "UIU", + "RMR", + "UEU" + ], + "key": { + "I": { + "item": "refinedstorage:importer" + }, + "E": { + "item": "refinedstorage:exporter" + }, + "M": { + "item": "refinedstorage:machine_casing" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "U": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:interface" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/machine_casing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/machine_casing.json new file mode 100644 index 000000000..ef2ba08dd --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/machine_casing.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EEE", + "ESE", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "tag": "c:stones" + } + }, + "result": { + "id": "refinedstorage:machine_casing" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_card.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_card.json new file mode 100644 index 000000000..2a67dcc30 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_card.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EEE", + "PAP", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "P": { + "item": "minecraft:paper" + }, + "A": { + "item": "refinedstorage:advanced_processor" + } + }, + "result": { + "id": "refinedstorage:network_card" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_receiver.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_receiver.json new file mode 100644 index 000000000..81b60032f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_receiver.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ANA", + "CMD", + "EEE" + ], + "key": { + "E": { + "tag": "c:ender_pearls" + }, + "C": { + "item": "refinedstorage:construction_core" + }, + "M": { + "item": "refinedstorage:machine_casing" + }, + "D": { + "item": "refinedstorage:destruction_core" + }, + "A": { + "item": "refinedstorage:advanced_processor" + }, + "N": { + "tag": "c:ingots/netherite" + } + }, + "result": { + "id": "refinedstorage:network_receiver" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_transmitter.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_transmitter.json new file mode 100644 index 000000000..90dad2bf4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/network_transmitter.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EEE", + "CMD", + "ANA" + ], + "key": { + "E": { + "tag": "c:ender_pearls" + }, + "C": { + "item": "refinedstorage:construction_core" + }, + "M": { + "item": "refinedstorage:machine_casing" + }, + "D": { + "item": "refinedstorage:destruction_core" + }, + "A": { + "item": "refinedstorage:advanced_processor" + }, + "N": { + "tag": "c:ingots/netherite" + } + }, + "result": { + "id": "refinedstorage:network_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/portable_grid.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/portable_grid.json new file mode 100644 index 000000000..74900ab01 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/portable_grid.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EGE", + "ECE", + "EGE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "G": { + "tag": "refinedstorage:grids" + }, + "C": { + "tag": "refinedstorage:controllers" + } + }, + "result": { + "id": "refinedstorage:portable_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json new file mode 100644 index 000000000..f2802cdb8 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "SLS", + " " + ], + "key": { + "S": { + "tag": "c:strings" + }, + "L": { + "tag": "c:slimeballs" + } + }, + "result": { + "id": "refinedstorage:processor_binding", + "count": 8 + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper.json new file mode 100644 index 000000000..6bccdbbd6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "CC", + "CQ" + ], + "key": { + "C": { + "tag": "c:ingots/copper" + }, + "Q": { + "tag": "c:gems/quartz" + } + }, + "result": { + "id": "refinedstorage:quartz_enriched_copper", + "count": 4 + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json new file mode 100644 index 000000000..e741d7f1f --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EEE", + "EEE", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_copper" + } + }, + "result": { + "id": "refinedstorage:quartz_enriched_copper_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json new file mode 100644 index 000000000..c66e0f771 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_copper_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:quartz_enriched_copper_block" + } + ], + "result": { + "id": "refinedstorage:quartz_enriched_copper", + "count": 9 + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron.json new file mode 100644 index 000000000..2f03c6a0e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "II", + "IQ" + ], + "key": { + "I": { + "tag": "c:ingots/iron" + }, + "Q": { + "tag": "c:gems/quartz" + } + }, + "result": { + "id": "refinedstorage:quartz_enriched_iron", + "count": 4 + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json new file mode 100644 index 000000000..0a9f2dc9a --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EEE", + "EEE", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:quartz_enriched_iron_block" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json new file mode 100644 index 000000000..7704a50f7 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/quartz_enriched_iron_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:quartz_enriched_iron_block" + } + ], + "result": { + "id": "refinedstorage:quartz_enriched_iron", + "count": 9 + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/range_upgrade.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/range_upgrade.json new file mode 100644 index 000000000..265a5c7f9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/range_upgrade.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "PUP", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "P": { + "tag": "c:ender_pearls" + }, + "U": { + "item": "refinedstorage:upgrade" + } + }, + "result": { + "id": "refinedstorage:range_upgrade" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json new file mode 100644 index 000000000..b7e4bb07e --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_advanced_processor.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:processor_binding" + }, + { + "tag": "c:gems/diamond" + }, + { + "item": "refinedstorage:silicon" + }, + { + "tag": "c:dusts/redstone" + } + ], + "result": { + "id": "refinedstorage:raw_advanced_processor" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json new file mode 100644 index 000000000..813373564 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_basic_processor.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:processor_binding" + }, + { + "tag": "c:ingots/iron" + }, + { + "item": "refinedstorage:silicon" + }, + { + "tag": "c:dusts/redstone" + } + ], + "result": { + "id": "refinedstorage:raw_basic_processor" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json new file mode 100644 index 000000000..7e59524f6 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/raw_improved_processor.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:processor_binding" + }, + { + "tag": "c:ingots/gold" + }, + { + "item": "refinedstorage:silicon" + }, + { + "tag": "c:dusts/redstone" + } + ], + "result": { + "id": "refinedstorage:raw_improved_processor" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/regulator_upgrade.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/regulator_upgrade.json new file mode 100644 index 000000000..71f926de4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/regulator_upgrade.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ECE", + "RUR", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "C": { + "item": "minecraft:comparator" + }, + "U": { + "item": "refinedstorage:upgrade" + } + }, + "result": { + "id": "refinedstorage:regulator_upgrade" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/relay.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/relay.json new file mode 100644 index 000000000..68036ed1a --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/relay.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "refinedstorage:machine_casing" + }, + { + "item": "refinedstorage:cable" + }, + { + "item": "refinedstorage:advanced_processor" + }, + { + "item": "minecraft:redstone_torch" + } + ], + "result": { + "id": "refinedstorage:relay" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_card.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_card.json new file mode 100644 index 000000000..b205f941d --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_card.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EEE", + "CAC", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "C": { + "item": "refinedstorage:network_card" + }, + "A": { + "item": "refinedstorage:advanced_processor" + } + }, + "result": { + "id": "refinedstorage:security_card" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_manager.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_manager.json new file mode 100644 index 000000000..2b10b862b --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/security_manager.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ECE", + "SMS", + "EFE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "C": { + "tag": "c:chests" + }, + "S": { + "item": "refinedstorage:security_card" + }, + "F": { + "item": "refinedstorage:fallback_security_card" + }, + "M": { + "item": "refinedstorage:machine_casing" + } + }, + "result": { + "id": "refinedstorage:security_manager" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silicon.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silicon.json new file mode 100644 index 000000000..9f122c80c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silicon.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "tag": "c:gems/quartz" + }, + "result": { + "id": "refinedstorage:silicon" + }, + "experience": 0.5 +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silk_touch_upgrade.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silk_touch_upgrade.json new file mode 100644 index 000000000..b31aa9f74 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/silk_touch_upgrade.json @@ -0,0 +1,7 @@ +{ + "type": "refinedstorage:upgrade_with_enchanted_book", + "enchantment": "minecraft:silk_touch", + "result": { + "id": "refinedstorage:silk_touch_upgrade" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/speed_upgrade.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/speed_upgrade.json new file mode 100644 index 000000000..575a6f330 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/speed_upgrade.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ESE", + "SUS", + "EEE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "S": { + "item": "minecraft:sugar" + }, + "U": { + "item": "refinedstorage:upgrade" + } + }, + "result": { + "id": "refinedstorage:speed_upgrade" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/stack_upgrade.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/stack_upgrade.json new file mode 100644 index 000000000..cf2aea193 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/stack_upgrade.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "USU", + "SUS", + "USU" + ], + "key": { + "U": { + "item": "minecraft:sugar" + }, + "S": { + "item": "refinedstorage:speed_upgrade" + } + }, + "result": { + "id": "refinedstorage:stack_upgrade" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_housing.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_housing.json new file mode 100644 index 000000000..f22f41c12 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_housing.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRG", + "R R", + "EEE" + ], + "key": { + "G": { + "tag": "c:glass_blocks" + }, + "R": { + "tag": "c:dusts/redstone" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + } + }, + "result": { + "id": "refinedstorage:storage_housing" + } +} diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_monitor.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_monitor.json new file mode 100644 index 000000000..0a730f7c9 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/storage_monitor.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PCG", + "EMG", + "PDG" + ], + "key": { + "P": { + "item": "refinedstorage:basic_processor" + }, + "C": { + "item": "refinedstorage:construction_core" + }, + "G": { + "tag": "c:glass_blocks" + }, + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "M": { + "item": "refinedstorage:machine_casing" + }, + "D": { + "item": "refinedstorage:destruction_core" + } + }, + "result": { + "id": "refinedstorage:storage_monitor" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/upgrade.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/upgrade.json new file mode 100644 index 000000000..c0c3e9f85 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/upgrade.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EGE", + "EPE", + "EGE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "G": { + "tag": "c:glass_blocks" + }, + "P": { + "item": "refinedstorage:improved_processor" + } + }, + "result": { + "id": "refinedstorage:upgrade" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_grid.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_grid.json new file mode 100644 index 000000000..968718966 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_grid.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EGE", + "EAE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "P": { + "tag": "c:ender_pearls" + }, + "G": { + "tag": "refinedstorage:grids" + }, + "A": { + "item": "refinedstorage:advanced_processor" + } + }, + "result": { + "id": "refinedstorage:wireless_grid" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_transmitter.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_transmitter.json new file mode 100644 index 000000000..45dd844e4 --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wireless_transmitter.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EME", + "EAE" + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "A": { + "item": "refinedstorage:advanced_processor" + }, + "M": { + "item": "refinedstorage:machine_casing" + }, + "P": { + "tag": "c:ender_pearls" + } + }, + "result": { + "id": "refinedstorage:wireless_transmitter" + } +} \ No newline at end of file diff --git a/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wrench.json b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wrench.json new file mode 100644 index 000000000..f9be7c00c --- /dev/null +++ b/refinedstorage-platform-common/src/main/resources/data/refinedstorage/recipe/wrench.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "EPE", + "EEE", + " E " + ], + "key": { + "E": { + "item": "refinedstorage:quartz_enriched_iron" + }, + "P": { + "item": "refinedstorage:basic_processor" + } + }, + "result": { + "id": "refinedstorage:wrench" + } +} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SetupMinecraft.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/SetupMinecraft.java similarity index 87% rename from refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SetupMinecraft.java rename to refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/SetupMinecraft.java index 0ccc45f97..eaf1044bf 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/SetupMinecraft.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/SetupMinecraft.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common; +package com.refinedmods.refinedstorage.platform.common; import net.minecraft.SharedConstants; import net.minecraft.server.Bootstrap; diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/TestPlatform.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java similarity index 89% rename from refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/TestPlatform.java rename to refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java index 7b7e33730..5aa7118d1 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/TestPlatform.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/TestPlatform.java @@ -1,14 +1,14 @@ -package com.refinedmods.refinedstorage2.platform.common; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage2.platform.common.support.render.FluidRenderer; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +package com.refinedmods.refinedstorage.platform.common; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategyFactory; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.platform.common.support.render.FluidRenderer; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.List; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypesTest.java similarity index 85% rename from refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java rename to refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypesTest.java index 83d298742..367c0be1c 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/GridSortingTypesTest.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; -import com.refinedmods.refinedstorage2.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage2.api.grid.view.GridView; -import com.refinedmods.refinedstorage2.api.grid.view.GridViewBuilder; -import com.refinedmods.refinedstorage2.api.grid.view.GridViewBuilderImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.common.SetupMinecraft; -import com.refinedmods.refinedstorage2.platform.common.grid.view.AbstractItemGridResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +package com.refinedmods.refinedstorage.platform.common.grid; + +import com.refinedmods.refinedstorage.api.grid.view.GridResource; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; +import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; +import com.refinedmods.refinedstorage.api.grid.view.GridView; +import com.refinedmods.refinedstorage.api.grid.view.GridViewBuilder; +import com.refinedmods.refinedstorage.api.grid.view.GridViewBuilderImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.platform.common.SetupMinecraft; +import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractItemGridResourceFactory; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.Comparator; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/LastModifiedTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModifiedTest.java similarity index 98% rename from refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/LastModifiedTest.java rename to refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModifiedTest.java index 1679ba1e4..2f50d9b97 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/LastModifiedTest.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/grid/screen/LastModifiedTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; +package com.refinedmods.refinedstorage.platform.common.grid.screen; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepositoryTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepositoryTest.java similarity index 91% rename from refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepositoryTest.java rename to refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepositoryTest.java index 01219b777..beb96e358 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/ClientStorageRepositoryTest.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/ClientStorageRepositoryTest.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; +package com.refinedmods.refinedstorage.platform.common.storage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; +import com.refinedmods.refinedstorage.platform.api.storage.StorageInfo; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorageTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorageTest.java new file mode 100644 index 000000000..a37e37fba --- /dev/null +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/storage/LimitedPlatformStorageTest.java @@ -0,0 +1,29 @@ +package com.refinedmods.refinedstorage.platform.common.storage; + +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +class LimitedPlatformStorageTest { + LimitedPlatformStorage sut; + + @BeforeEach + @SuppressWarnings("ConstantConditions") + void setUp() { + final LimitedStorageImpl delegate = new LimitedStorageImpl(new InMemoryStorageImpl(), 100); + sut = new LimitedPlatformStorage(delegate, StorageTypes.ITEM, null, null); + } + + @Test + void testSetup() { + // Assert + assertThat(sut.getType()).isEqualTo(StorageTypes.ITEM); + assertThat(sut).isInstanceOf(LimitedStorage.class); + assertThat(sut.getCapacity()).isEqualTo(100); + } +} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImplTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java similarity index 95% rename from refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImplTest.java rename to refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java index 6ad212381..104b7cda0 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/registry/PlatformRegistryImplTest.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/registry/PlatformRegistryImplTest.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.common.support.registry; +package com.refinedmods.refinedstorage.platform.common.support.registry; -import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; +import com.refinedmods.refinedstorage.platform.api.support.registry.PlatformRegistry; import java.util.List; diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceRenderingTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRenderingTest.java similarity index 89% rename from refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceRenderingTest.java rename to refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRenderingTest.java index ac09a1cd5..ed9367865 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceRenderingTest.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/FluidResourceRenderingTest.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; +package com.refinedmods.refinedstorage.platform.common.support.resource; -import com.refinedmods.refinedstorage2.platform.common.PlatformProxy; -import com.refinedmods.refinedstorage2.platform.common.TestPlatform; +import com.refinedmods.refinedstorage.platform.common.PlatformProxy; +import com.refinedmods.refinedstorage.platform.common.TestPlatform; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java similarity index 94% rename from refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java rename to refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java index dd2a21cfc..83de1f629 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/FuzzyResourceListImplTest.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/resource/list/FuzzyResourceListImplTest.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource.list; +package com.refinedmods.refinedstorage.platform.common.support.resource.list; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.platform.api.support.resource.list.FuzzyResourceList; -import com.refinedmods.refinedstorage2.platform.common.SetupMinecraft; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.platform.api.support.resource.list.FuzzyResourceList; +import com.refinedmods.refinedstorage.platform.common.SetupMinecraft; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.Collection; import java.util.Optional; diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/widget/HistoryTest.java b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/widget/HistoryTest.java similarity index 97% rename from refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/widget/HistoryTest.java rename to refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/widget/HistoryTest.java index b98e5ca62..647c35726 100644 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/support/widget/HistoryTest.java +++ b/refinedstorage-platform-common/src/test/java/com/refinedmods/refinedstorage/platform/common/support/widget/HistoryTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; +package com.refinedmods.refinedstorage.platform.common.support.widget; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-platform-fabric/.gitignore b/refinedstorage-platform-fabric/.gitignore similarity index 100% rename from refinedstorage2-platform-fabric/.gitignore rename to refinedstorage-platform-fabric/.gitignore diff --git a/refinedstorage-platform-fabric/build.gradle b/refinedstorage-platform-fabric/build.gradle new file mode 100644 index 000000000..1eb0f41ff --- /dev/null +++ b/refinedstorage-platform-fabric/build.gradle @@ -0,0 +1,31 @@ +archivesBaseName = 'refinedstorage-platform-fabric' + +repositories { + maven { + name = 'ModMenu' + url 'https://maven.terraformersmc.com/' + } + maven { + name = 'Cloth Config' + url 'https://maven.shedaniel.me/' + } +} + +fabricProject("refinedstorage", project(":refinedstorage-platform-common"), apis, compileApis) + +dependencies { + modApi(libs.cloth.config) { + exclude(group: 'net.fabricmc.fabric-api') + } + include libs.cloth.config + + modApi(libs.teamreborn.energy) { + exclude(group: 'net.fabricmc.fabric-api') + } + include libs.teamreborn.energy + + modApi libs.modmenu +} + +enablePublishing() + diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ClientModInitializerImpl.java similarity index 82% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ClientModInitializerImpl.java index dd7573283..e393957b5 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ClientModInitializerImpl.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ClientModInitializerImpl.java @@ -1,46 +1,46 @@ -package com.refinedmods.refinedstorage2.platform.fabric; +package com.refinedmods.refinedstorage.platform.fabric; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.AbstractClientModInitializer; -import com.refinedmods.refinedstorage2.platform.common.configurationcard.ConfigurationCardItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.content.KeyMappings; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkCardItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntityRenderer; -import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketHandler; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.EnergyInfoPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridActivePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridClearPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridUpdatePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NoPermissionPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.StorageInfoResponsePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.CompositeClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.ResourceClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinationClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; -import com.refinedmods.refinedstorage2.platform.fabric.mixin.ItemPropertiesAccessor; -import com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive.DiskDriveBlockEntityRendererImpl; -import com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive.DiskDriveUnbakedModel; -import com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface.DiskInterfaceBlockEntityRendererImpl; -import com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface.DiskInterfaceUnbakedModel; -import com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid.PortableGridBlockEntityRendererImpl; -import com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid.PortableGridUnbakedModel; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.EmissiveModelRegistry; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.AbstractClientModInitializer; +import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkCardItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.EnergyInfoPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridActivePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridClearPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridUpdatePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NoPermissionPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.StorageInfoResponsePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.CompositeClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.ResourceClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinationClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.platform.fabric.mixin.ItemPropertiesAccessor; +import com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive.DiskDriveBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive.DiskDriveUnbakedModel; +import com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface.DiskInterfaceBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface.DiskInterfaceUnbakedModel; +import com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid.PortableGridBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid.PortableGridUnbakedModel; +import com.refinedmods.refinedstorage.platform.fabric.support.render.EmissiveModelRegistry; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; import java.util.List; @@ -68,8 +68,8 @@ import net.minecraft.world.level.block.Block; import org.lwjgl.glfw.GLFW; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslationKey; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationKey; public class ClientModInitializerImpl extends AbstractClientModInitializer implements ClientModInitializer { private static final String BLOCK_PREFIX = "block"; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java new file mode 100644 index 000000000..92ea07790 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ConfigImpl.java @@ -0,0 +1,695 @@ +package com.refinedmods.refinedstorage.platform.fabric; + +import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; +import com.refinedmods.refinedstorage.platform.common.content.DefaultEnergyUsage; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridMatrixCloseBehavior; +import com.refinedmods.refinedstorage.platform.common.grid.GridSortingTypes; +import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSize; +import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; + +import java.util.Optional; + +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.ConfigData; +import me.shedaniel.autoconfig.annotation.Config; +import me.shedaniel.autoconfig.annotation.ConfigEntry; +import net.minecraft.resources.ResourceLocation; + +@Config(name = IdentifierUtil.MOD_ID) +public class ConfigImpl implements ConfigData, com.refinedmods.refinedstorage.platform.common.Config { + private ScreenSize screenSize = ScreenSize.STRETCH; + + private boolean smoothScrolling = true; + + @ConfigEntry.BoundedDiscrete(min = 3L, max = 256) + private int maxRowsStretch = 256; + + @ConfigEntry.Gui.CollapsibleObject + private GridEntryImpl grid = new GridEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private CraftingGridEntryImpl craftingGrid = new CraftingGridEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private ControllerEntryImpl controller = new ControllerEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private DiskDriveEntryImpl diskDrive = new DiskDriveEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private DiskInterfaceEntryImpl diskInterface = new DiskInterfaceEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl cable = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.CABLE); + + @ConfigEntry.Gui.CollapsibleObject + private StorageBlockEntryImpl storageBlock = new StorageBlockEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private FluidStorageBlockEntryImpl fluidStorageBlock = new FluidStorageBlockEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl importer = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.IMPORTER); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl exporter = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.EXPORTER); + + @ConfigEntry.Gui.CollapsibleObject + private UpgradeEntryImpl upgrade = new UpgradeEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl iface = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.INTERFACE); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl externalStorage = new SimpleEnergyUsageEntryImpl( + DefaultEnergyUsage.EXTERNAL_STORAGE + ); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl detector = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.DETECTOR); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl destructor = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.DESTRUCTOR); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl constructor = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.CONSTRUCTOR); + + @ConfigEntry.Gui.CollapsibleObject + private WirelessGridEntryImpl wirelessGrid = new WirelessGridEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private WirelessTransmitterEntryImpl wirelessTransmitter = new WirelessTransmitterEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl storageMonitor = new SimpleEnergyUsageEntryImpl( + DefaultEnergyUsage.STORAGE_MONITOR + ); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl networkReceiver = new SimpleEnergyUsageEntryImpl( + DefaultEnergyUsage.NETWORK_RECEIVER + ); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl networkTransmitter = new SimpleEnergyUsageEntryImpl( + DefaultEnergyUsage.NETWORK_TRANSMITTER + ); + + @ConfigEntry.Gui.CollapsibleObject + private PortableGridEntryImpl portableGrid = new PortableGridEntryImpl(); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl securityCard = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.SECURITY_CARD); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl fallbackSecurityCard = new SimpleEnergyUsageEntryImpl( + DefaultEnergyUsage.FALLBACK_SECURITY_CARD + ); + + @ConfigEntry.Gui.CollapsibleObject + private SimpleEnergyUsageEntryImpl securityManager = new SimpleEnergyUsageEntryImpl( + DefaultEnergyUsage.SECURITY_MANAGER + ); + + @ConfigEntry.Gui.CollapsibleObject + private RelayEntryImpl relay = new RelayEntryImpl(); + + public static ConfigImpl get() { + return AutoConfig.getConfigHolder(ConfigImpl.class).getConfig(); + } + + @Override + public ScreenSize getScreenSize() { + return screenSize; + } + + @Override + public void setScreenSize(final ScreenSize screenSize) { + this.screenSize = screenSize; + AutoConfig.getConfigHolder(ConfigImpl.class).save(); + } + + @Override + public boolean isSmoothScrolling() { + return smoothScrolling; + } + + @Override + public int getMaxRowsStretch() { + return maxRowsStretch; + } + + @Override + public GridEntry getGrid() { + return grid; + } + + @Override + public CraftingGridEntry getCraftingGrid() { + return craftingGrid; + } + + @Override + public ControllerEntry getController() { + return controller; + } + + @Override + public DiskDriveEntry getDiskDrive() { + return diskDrive; + } + + @Override + public DiskInterfaceEntry getDiskInterface() { + return diskInterface; + } + + @Override + public SimpleEnergyUsageEntry getCable() { + return cable; + } + + @Override + public StorageBlockEntry getStorageBlock() { + return storageBlock; + } + + @Override + public FluidStorageBlockEntry getFluidStorageBlock() { + return fluidStorageBlock; + } + + @Override + public SimpleEnergyUsageEntry getImporter() { + return importer; + } + + @Override + public SimpleEnergyUsageEntry getExporter() { + return exporter; + } + + @Override + public UpgradeEntry getUpgrade() { + return upgrade; + } + + @Override + public SimpleEnergyUsageEntry getInterface() { + return iface; + } + + @Override + public SimpleEnergyUsageEntry getExternalStorage() { + return externalStorage; + } + + @Override + public SimpleEnergyUsageEntry getDetector() { + return detector; + } + + @Override + public SimpleEnergyUsageEntry getDestructor() { + return destructor; + } + + @Override + public SimpleEnergyUsageEntry getConstructor() { + return constructor; + } + + @Override + public WirelessGridEntry getWirelessGrid() { + return wirelessGrid; + } + + @Override + public WirelessTransmitterEntry getWirelessTransmitter() { + return wirelessTransmitter; + } + + @Override + public SimpleEnergyUsageEntry getStorageMonitor() { + return storageMonitor; + } + + @Override + public SimpleEnergyUsageEntry getNetworkReceiver() { + return networkReceiver; + } + + @Override + public SimpleEnergyUsageEntry getNetworkTransmitter() { + return networkTransmitter; + } + + @Override + public PortableGridEntry getPortableGrid() { + return portableGrid; + } + + @Override + public SimpleEnergyUsageEntry getSecurityCard() { + return securityCard; + } + + @Override + public SimpleEnergyUsageEntry getFallbackSecurityCard() { + return fallbackSecurityCard; + } + + @Override + public SimpleEnergyUsageEntry getSecurityManager() { + return securityManager; + } + + @Override + public RelayEntry getRelay() { + return relay; + } + + private static class GridEntryImpl implements GridEntry { + private boolean largeFont = false; + + private long energyUsage = DefaultEnergyUsage.GRID; + + private boolean preventSortingWhileShiftIsDown = true; + + private boolean detailedTooltip = true; + + private boolean rememberSearchQuery = false; + + private boolean autoSelected = false; + + private String synchronizer = ""; + + private String resourceTypeId = ""; + + private GridSortingDirection sortingDirection = GridSortingDirection.ASCENDING; + + private GridSortingTypes sortingType = GridSortingTypes.QUANTITY; + + @Override + public boolean isLargeFont() { + return largeFont; + } + + @Override + public boolean isPreventSortingWhileShiftIsDown() { + return preventSortingWhileShiftIsDown; + } + + @Override + public boolean isDetailedTooltip() { + return detailedTooltip; + } + + @Override + public boolean isRememberSearchQuery() { + return rememberSearchQuery; + } + + @Override + public long getEnergyUsage() { + return energyUsage; + } + + @Override + public boolean isAutoSelected() { + return autoSelected; + } + + @Override + public void setAutoSelected(final boolean autoSelected) { + this.autoSelected = autoSelected; + save(); + } + + @Override + public Optional getSynchronizer() { + if (synchronizer == null || synchronizer.trim().isBlank()) { + return Optional.empty(); + } + return Optional.of(synchronizer).map(ResourceLocation::tryParse); + } + + @Override + public void setSynchronizer(final ResourceLocation synchronizerId) { + this.synchronizer = synchronizerId.toString(); + save(); + } + + @Override + public void clearSynchronizer() { + this.synchronizer = ""; + save(); + } + + @Override + public GridSortingDirection getSortingDirection() { + return sortingDirection; + } + + @Override + public void setSortingDirection(final GridSortingDirection sortingDirection) { + this.sortingDirection = sortingDirection; + save(); + } + + @Override + public GridSortingTypes getSortingType() { + return sortingType; + } + + @Override + public void setSortingType(final GridSortingTypes sortingType) { + this.sortingType = sortingType; + save(); + } + + @Override + public Optional getResourceTypeId() { + if (resourceTypeId == null || resourceTypeId.trim().isBlank()) { + return Optional.empty(); + } + return Optional.of(resourceTypeId).map(ResourceLocation::tryParse); + } + + @Override + public void setResourceTypeId(final ResourceLocation resourceTypeId) { + this.resourceTypeId = resourceTypeId.toString(); + save(); + } + + @Override + public void clearResourceType() { + this.resourceTypeId = ""; + save(); + } + + private static void save() { + AutoConfig.getConfigHolder(ConfigImpl.class).save(); + } + } + + private static class CraftingGridEntryImpl implements CraftingGridEntry { + private long energyUsage = DefaultEnergyUsage.CRAFTING_GRID; + + private CraftingGridMatrixCloseBehavior craftingMatrixCloseBehavior = CraftingGridMatrixCloseBehavior.NONE; + + @Override + public long getEnergyUsage() { + return energyUsage; + } + + @Override + public CraftingGridMatrixCloseBehavior getCraftingMatrixCloseBehavior() { + return craftingMatrixCloseBehavior; + } + } + + private static class DiskDriveEntryImpl implements DiskDriveEntry { + private long energyUsage = DefaultEnergyUsage.DISK_DRIVE; + + private long energyUsagePerDisk = DefaultEnergyUsage.DISK_DRIVE_PER_DISK; + + @Override + public long getEnergyUsage() { + return energyUsage; + } + + @Override + public long getEnergyUsagePerDisk() { + return energyUsagePerDisk; + } + } + + private static class DiskInterfaceEntryImpl implements DiskInterfaceEntry { + private long energyUsage = DefaultEnergyUsage.DISK_INTERFACE; + + private long energyUsagePerDisk = DefaultEnergyUsage.DISK_INTERFACE_PER_DISK; + + @Override + public long getEnergyUsage() { + return energyUsage; + } + + @Override + public long getEnergyUsagePerDisk() { + return energyUsagePerDisk; + } + } + + private static class SimpleEnergyUsageEntryImpl implements SimpleEnergyUsageEntry { + private long energyUsage; + + SimpleEnergyUsageEntryImpl(final long energyUsage) { + this.energyUsage = energyUsage; + } + + @Override + public long getEnergyUsage() { + return energyUsage; + } + } + + private static class ControllerEntryImpl implements ControllerEntry { + private long energyCapacity = DefaultEnergyUsage.CONTROLLER_CAPACITY; + + public long getEnergyCapacity() { + return energyCapacity; + } + } + + private static class StorageBlockEntryImpl implements StorageBlockEntry { + private long oneKEnergyUsage = DefaultEnergyUsage.ONE_K_STORAGE_BLOCK; + private long fourKEnergyUsage = DefaultEnergyUsage.FOUR_K_STORAGE_BLOCK; + private long sixteenKEnergyUsage = DefaultEnergyUsage.SIXTEEN_K_STORAGE_BLOCK; + private long sixtyFourKEnergyUsage = DefaultEnergyUsage.SIXTY_FOUR_K_STORAGE_BLOCK; + private long creativeEnergyUsage = DefaultEnergyUsage.CREATIVE_STORAGE_BLOCK; + + @Override + public long get1kEnergyUsage() { + return oneKEnergyUsage; + } + + @Override + public long get4kEnergyUsage() { + return fourKEnergyUsage; + } + + @Override + public long get16kEnergyUsage() { + return sixteenKEnergyUsage; + } + + @Override + public long get64kEnergyUsage() { + return sixtyFourKEnergyUsage; + } + + @Override + public long getCreativeEnergyUsage() { + return creativeEnergyUsage; + } + } + + private static class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { + private long sixtyFourBEnergyUsage = DefaultEnergyUsage.SIXTY_FOUR_B_FLUID_STORAGE_BLOCK; + private long twoHundredFiftySixBEnergyUsage = DefaultEnergyUsage.TWO_HUNDRED_FIFTY_SIX_B_FLUID_STORAGE_BLOCK; + private long thousandTwentyFourBEnergyUsage = DefaultEnergyUsage.THOUSAND_TWENTY_FOUR_B_FLUID_STORAGE_BLOCK; + private long fourThousandNinetySixBEnergyUsage = + DefaultEnergyUsage.FOUR_THOUSAND_NINETY_SIX_B_FLUID_STORAGE_BLOCK; + private long creativeEnergyUsage = DefaultEnergyUsage.CREATIVE_FLUID_STORAGE_BLOCK; + + @Override + public long get64bEnergyUsage() { + return sixtyFourBEnergyUsage; + } + + @Override + public long get256bEnergyUsage() { + return twoHundredFiftySixBEnergyUsage; + } + + @Override + public long get1024bEnergyUsage() { + return thousandTwentyFourBEnergyUsage; + } + + @Override + public long get4096bEnergyUsage() { + return fourThousandNinetySixBEnergyUsage; + } + + @Override + public long getCreativeEnergyUsage() { + return creativeEnergyUsage; + } + } + + private static class UpgradeEntryImpl implements UpgradeEntry { + private long speedUpgradeEnergyUsage = DefaultEnergyUsage.SPEED_UPGRADE; + + private long stackUpgradeEnergyUsage = DefaultEnergyUsage.STACK_UPGRADE; + + private long fortune1UpgradeEnergyUsage = DefaultEnergyUsage.FORTUNE_1_UPGRADE; + + private long fortune2UpgradeEnergyUsage = DefaultEnergyUsage.FORTUNE_2_UPGRADE; + + private long fortune3UpgradeEnergyUsage = DefaultEnergyUsage.FORTUNE_3_UPGRADE; + + private long silkTouchUpgradeEnergyUsage = DefaultEnergyUsage.SILK_TOUCH_UPGRADE; + + private long regulatorUpgradeEnergyUsage = DefaultEnergyUsage.REGULATOR_UPGRADE; + + private long rangeUpgradeEnergyUsage = DefaultEnergyUsage.RANGE_UPGRADE; + + private long creativeRangeUpgradeEnergyUsage = DefaultEnergyUsage.CREATIVE_RANGE_UPGRADE; + + private int rangeUpgradeRange = DefaultEnergyUsage.RANGE_UPGRADE_RANGE; + + @Override + public long getSpeedUpgradeEnergyUsage() { + return speedUpgradeEnergyUsage; + } + + @Override + public long getStackUpgradeEnergyUsage() { + return stackUpgradeEnergyUsage; + } + + @Override + public long getFortune1UpgradeEnergyUsage() { + return fortune1UpgradeEnergyUsage; + } + + @Override + public long getFortune2UpgradeEnergyUsage() { + return fortune2UpgradeEnergyUsage; + } + + @Override + public long getFortune3UpgradeEnergyUsage() { + return fortune3UpgradeEnergyUsage; + } + + @Override + public long getSilkTouchUpgradeEnergyUsage() { + return silkTouchUpgradeEnergyUsage; + } + + @Override + public long getRegulatorUpgradeEnergyUsage() { + return regulatorUpgradeEnergyUsage; + } + + @Override + public long getRangeUpgradeEnergyUsage() { + return rangeUpgradeEnergyUsage; + } + + @Override + public long getCreativeRangeUpgradeEnergyUsage() { + return creativeRangeUpgradeEnergyUsage; + } + + @Override + public int getRangeUpgradeRange() { + return rangeUpgradeRange; + } + } + + private static class WirelessGridEntryImpl implements WirelessGridEntry { + private long energyCapacity = DefaultEnergyUsage.WIRELESS_GRID_CAPACITY; + + private long openEnergyUsage = DefaultEnergyUsage.WIRELESS_GRID_OPEN; + + private long insertEnergyUsage = DefaultEnergyUsage.WIRELESS_GRID_INSERT; + + private long extractEnergyUsage = DefaultEnergyUsage.WIRELESS_GRID_EXTRACT; + + @Override + public long getEnergyCapacity() { + return energyCapacity; + } + + @Override + public long getOpenEnergyUsage() { + return openEnergyUsage; + } + + @Override + public long getInsertEnergyUsage() { + return insertEnergyUsage; + } + + @Override + public long getExtractEnergyUsage() { + return extractEnergyUsage; + } + } + + private static class WirelessTransmitterEntryImpl implements WirelessTransmitterEntry { + private long energyUsage = DefaultEnergyUsage.WIRELESS_TRANSMITTER; + + private int baseRange = DefaultEnergyUsage.WIRELESS_TRANSMITTER_BASE_RANGE; + + @Override + public long getEnergyUsage() { + return energyUsage; + } + + @Override + public int getBaseRange() { + return baseRange; + } + } + + private static class PortableGridEntryImpl implements PortableGridEntry { + private long energyCapacity = DefaultEnergyUsage.PORTABLE_GRID_CAPACITY; + + private long openEnergyUsage = DefaultEnergyUsage.PORTABLE_GRID_OPEN; + + private long insertEnergyUsage = DefaultEnergyUsage.PORTABLE_GRID_INSERT; + + private long extractEnergyUsage = DefaultEnergyUsage.PORTABLE_GRID_EXTRACT; + + @Override + public long getEnergyCapacity() { + return energyCapacity; + } + + @Override + public long getOpenEnergyUsage() { + return openEnergyUsage; + } + + @Override + public long getInsertEnergyUsage() { + return insertEnergyUsage; + } + + @Override + public long getExtractEnergyUsage() { + return extractEnergyUsage; + } + } + + private static class RelayEntryImpl implements RelayEntry { + private long inputNetworkEnergyUsage = DefaultEnergyUsage.RELAY_INPUT_NETWORK; + + private long outputNetworkEnergyUsage = DefaultEnergyUsage.RELAY_OUTPUT_NETWORK; + + @Override + public long getInputNetworkEnergyUsage() { + return inputNetworkEnergyUsage; + } + + @Override + public long getOutputNetworkEnergyUsage() { + return outputNetworkEnergyUsage; + } + } +} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java similarity index 76% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java index 32191e1e6..640f5c6b8 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ModInitializerImpl.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/ModInitializerImpl.java @@ -1,612 +1,612 @@ -package com.refinedmods.refinedstorage2.platform.fabric; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.RefinedStoragePlugin; -import com.refinedmods.refinedstorage2.platform.common.AbstractModInitializer; -import com.refinedmods.refinedstorage2.platform.common.PlatformProxy; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntityTypeFactory; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.content.CreativeModeTabItems; -import com.refinedmods.refinedstorage2.platform.common.content.DirectRegistryCallback; -import com.refinedmods.refinedstorage2.platform.common.content.ExtendedMenuTypeFactory; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.content.MenuTypeFactory; -import com.refinedmods.refinedstorage2.platform.common.content.RegistryCallback; -import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridItem; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfacePlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.common.security.FallbackSecurityCardItem; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardItem; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketHandler; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.CraftingGridClearPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.CraftingGridRecipeTransferPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridExtractPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridInsertPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridScrollPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.PropertyChangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceFilterSlotChangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceSlotAmountChangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceSlotChangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardBoundPlayerPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardPermissionPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardResetPermissionPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SingleAmountChangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.StorageInfoRequestPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.UseNetworkBoundItemPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.EnergyInfoPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridActivePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridClearPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridUpdatePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NoPermissionPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.StorageInfoResponsePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.util.ServerEventQueue; -import com.refinedmods.refinedstorage2.platform.fabric.exporter.FabricStorageExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.fabric.grid.strategy.FluidGridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.fabric.grid.strategy.FluidGridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.fabric.grid.strategy.ItemGridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.fabric.grid.strategy.ItemGridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.fabric.importer.FabricStorageImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.fabric.security.NetworkNodeBreakSecurityEventListener; -import com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive.FabricDiskDriveBlockEntity; -import com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface.FabricDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.fabric.storage.externalstorage.FabricStoragePlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid.FabricPortableGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.fabric.support.energy.EnergyStorageAdapter; -import com.refinedmods.refinedstorage2.platform.fabric.support.resource.ResourceContainerFluidStorageAdapter; -import com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; - -import me.shedaniel.autoconfig.AutoConfig; -import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer; -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; -import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; -import net.fabricmc.fabric.api.event.player.UseBlockCallback; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; -import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedStorage; -import net.fabricmc.fabric.api.transfer.v1.storage.base.FilteringStorage; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.world.Container; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.flag.FeatureFlags; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import team.reborn.energy.api.EnergyStorage; - -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CREATIVE_WIRELESS_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PORTABLE_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.REGULATOR_UPGRADE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.SECURITY_CARD; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.WIRELESS_GRID; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public class ModInitializerImpl extends AbstractModInitializer implements ModInitializer { - private static final Logger LOGGER = LoggerFactory.getLogger(ModInitializerImpl.class); - private static final String PLUGIN_ENTRYPOINT_KEY = "refinedstorage_plugin"; - - @Override - public void onInitialize() { - AutoConfig.register(ConfigImpl.class, Toml4jConfigSerializer::new); - - PlatformProxy.loadPlatform(new PlatformImpl()); - initializePlatformApi(); - registerAdditionalGridInsertionStrategyFactories(); - registerGridExtractionStrategyFactories(); - registerGridScrollingStrategyFactories(); - registerImporterTransferStrategyFactories(); - registerExporterTransferStrategyFactories(); - registerExternalStorageProviderFactories(); - registerContent(); - registerPackets(); - registerPacketHandlers(); - registerSounds(new DirectRegistryCallback<>(BuiltInRegistries.SOUND_EVENT)); - registerRecipeSerializers(new DirectRegistryCallback<>(BuiltInRegistries.RECIPE_SERIALIZER)); - registerSidedHandlers(); - registerTickHandler(); - registerWrenchingEvent(); - registerSecurityBlockBreakEvent(); - - final List pluginEntrypoints = FabricLoader.getInstance() - .getEntrypoints(PLUGIN_ENTRYPOINT_KEY, RefinedStoragePlugin.class); - LOGGER.debug("Loading {} Refined Storage plugin entrypoints.", pluginEntrypoints.size()); - pluginEntrypoints.forEach(plugin -> plugin.onPlatformApiAvailable(PlatformApi.INSTANCE)); - - LOGGER.debug("Refined Storage 2 has loaded."); - } - - private void registerAdditionalGridInsertionStrategyFactories() { - PlatformApi.INSTANCE.addGridInsertionStrategyFactory(FluidGridInsertionStrategy::new); - } - - private void registerGridExtractionStrategyFactories() { - PlatformApi.INSTANCE.addGridExtractionStrategyFactory(ItemGridExtractionStrategy::new); - PlatformApi.INSTANCE.addGridExtractionStrategyFactory(FluidGridExtractionStrategy::new); - } - - private void registerGridScrollingStrategyFactories() { - PlatformApi.INSTANCE.addGridScrollingStrategyFactory(ItemGridScrollingStrategy::new); - } - - private void registerImporterTransferStrategyFactories() { - PlatformApi.INSTANCE.getImporterTransferStrategyRegistry().register( - createIdentifier("item"), - new FabricStorageImporterTransferStrategyFactory<>( - ItemStorage.SIDED, - VariantUtil::ofItemVariant, - resource -> resource instanceof ItemResource itemResource - ? VariantUtil.toItemVariant(itemResource) : null, - 1 - ) - ); - PlatformApi.INSTANCE.getImporterTransferStrategyRegistry().register( - createIdentifier("fluid"), - new FabricStorageImporterTransferStrategyFactory<>( - FluidStorage.SIDED, - VariantUtil::ofFluidVariant, - resource -> resource instanceof FluidResource fluidResource - ? VariantUtil.toFluidVariant(fluidResource) : null, - FluidConstants.BUCKET - ) - ); - } - - private void registerExporterTransferStrategyFactories() { - PlatformApi.INSTANCE.getExporterTransferStrategyRegistry().register( - createIdentifier("item"), - new FabricStorageExporterTransferStrategyFactory<>( - ItemStorage.SIDED, - resource -> resource instanceof ItemResource itemResource - ? VariantUtil.toItemVariant(itemResource) : null, - 1 - ) - ); - PlatformApi.INSTANCE.getExporterTransferStrategyRegistry().register( - createIdentifier("fluid"), - new FabricStorageExporterTransferStrategyFactory<>( - FluidStorage.SIDED, - resource -> resource instanceof FluidResource fluidResource - ? VariantUtil.toFluidVariant(fluidResource) : null, - FluidConstants.BUCKET - ) - ); - } - - private void registerExternalStorageProviderFactories() { - PlatformApi.INSTANCE.addExternalStorageProviderFactory(new InterfacePlatformExternalStorageProviderFactory()); - PlatformApi.INSTANCE.addExternalStorageProviderFactory( - new FabricStoragePlatformExternalStorageProviderFactory<>( - ItemStorage.SIDED, - VariantUtil::ofItemVariant, - resource -> resource instanceof ItemResource itemResource - ? VariantUtil.toItemVariant(itemResource) : null - )); - PlatformApi.INSTANCE.addExternalStorageProviderFactory( - new FabricStoragePlatformExternalStorageProviderFactory<>( - FluidStorage.SIDED, - VariantUtil::ofFluidVariant, - resource -> resource instanceof FluidResource fluidResource - ? VariantUtil.toFluidVariant(fluidResource) : null - )); - } - - private void registerContent() { - registerBlocks( - new DirectRegistryCallback<>(BuiltInRegistries.BLOCK), - FabricDiskDriveBlockEntity::new, - (pos, state) -> new FabricPortableGridBlockEntity(PortableGridType.NORMAL, pos, state), - (pos, state) -> new FabricPortableGridBlockEntity(PortableGridType.CREATIVE, pos, state), - FabricDiskInterfaceBlockEntity::new - ); - final DirectRegistryCallback itemRegistryCallback = new DirectRegistryCallback<>(BuiltInRegistries.ITEM); - registerItems(itemRegistryCallback); - registerCustomItems(itemRegistryCallback); - registerUpgradeMappings(); - registerCreativeModeTab(); - registerBlockEntities( - new DirectRegistryCallback<>(BuiltInRegistries.BLOCK_ENTITY_TYPE), - new BlockEntityTypeFactory() { - @Override - public BlockEntityType create(final BlockEntitySupplier factory, - final Block... allowedBlocks) { - return new BlockEntityType<>(factory::create, new HashSet<>(Arrays.asList(allowedBlocks)), null); - } - }, - FabricDiskDriveBlockEntity::new, - (pos, state) -> new FabricPortableGridBlockEntity(PortableGridType.NORMAL, pos, state), - (pos, state) -> new FabricPortableGridBlockEntity(PortableGridType.CREATIVE, pos, state), - FabricDiskInterfaceBlockEntity::new - ); - registerMenus(new DirectRegistryCallback<>(BuiltInRegistries.MENU), new MenuTypeFactory() { - @Override - public MenuType create(final MenuSupplier supplier) { - return new MenuType<>(supplier::create, FeatureFlags.DEFAULT_FLAGS); - } - }, new ExtendedMenuTypeFactory() { - @Override - public MenuType create(final MenuSupplier supplier, - final StreamCodec - streamCodec) { - return new ExtendedScreenHandlerType<>(supplier::create, streamCodec); - } - }); - registerLootFunctions(new DirectRegistryCallback<>(BuiltInRegistries.LOOT_FUNCTION_TYPE)); - registerDataComponents(new DirectRegistryCallback<>(BuiltInRegistries.DATA_COMPONENT_TYPE)); - } - - private void registerCustomItems(final RegistryCallback callback) { - Items.INSTANCE.setRegulatorUpgrade(callback.register(REGULATOR_UPGRADE, () -> new RegulatorUpgradeItem( - PlatformApi.INSTANCE.getUpgradeRegistry() - ) { - @Override - public boolean allowComponentsUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); - } - })); - Items.INSTANCE.setWirelessGrid(callback.register(WIRELESS_GRID, () -> new WirelessGridItem() { - @Override - public boolean allowComponentsUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); - } - })); - Items.INSTANCE.setCreativeWirelessGrid(callback.register( - CREATIVE_WIRELESS_GRID, - () -> new WirelessGridItem() { - @Override - public boolean allowComponentsUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); - } - } - )); - Items.INSTANCE.setPortableGrid(callback.register(PORTABLE_GRID, () -> new PortableGridBlockItem( - Blocks.INSTANCE.getPortableGrid(), PortableGridType.NORMAL - ) { - @Override - public boolean allowComponentsUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); - } - })); - Items.INSTANCE.setCreativePortableGrid(callback.register( - CREATIVE_PORTABLE_GRID, - () -> new PortableGridBlockItem(Blocks.INSTANCE.getCreativePortableGrid(), PortableGridType.CREATIVE) { - @Override - public boolean allowComponentsUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); - } - } - )); - Items.INSTANCE.setSecurityCard(callback.register(SECURITY_CARD, () -> new SecurityCardItem() { - @Override - public boolean allowComponentsUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); - } - })); - Items.INSTANCE.setFallbackSecurityCard(callback.register( - FALLBACK_SECURITY_CARD, - () -> new FallbackSecurityCardItem() { - @Override - public boolean allowComponentsUpdateAnimation(final Player player, - final InteractionHand hand, - final ItemStack oldStack, - final ItemStack newStack) { - return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); - } - } - )); - } - - private void registerCreativeModeTab() { - Registry.register( - BuiltInRegistries.CREATIVE_MODE_TAB, - createIdentifier("general"), - CreativeModeTab.builder(CreativeModeTab.Row.TOP, 0) - .title(ContentNames.MOD) - .icon(() -> new ItemStack(Blocks.INSTANCE.getCreativeController().getDefault())) - .displayItems((params, output) -> CreativeModeTabItems.append(output::accept)) - .build() - ); - } - - private void registerPackets() { - registerServerToClientPackets(); - registerClientToServerPackets(); - } - - private void registerServerToClientPackets() { - PayloadTypeRegistry.playS2C().register(EnergyInfoPacket.PACKET_TYPE, EnergyInfoPacket.STREAM_CODEC); - PayloadTypeRegistry.playS2C().register( - WirelessTransmitterRangePacket.PACKET_TYPE, - WirelessTransmitterRangePacket.STREAM_CODEC - ); - PayloadTypeRegistry.playS2C().register(GridActivePacket.PACKET_TYPE, GridActivePacket.STREAM_CODEC); - PayloadTypeRegistry.playS2C().register(GridClearPacket.PACKET_TYPE, GridClearPacket.STREAM_CODEC); - PayloadTypeRegistry.playS2C().register(GridUpdatePacket.PACKET_TYPE, GridUpdatePacket.STREAM_CODEC); - PayloadTypeRegistry.playS2C().register( - NetworkTransmitterStatusPacket.PACKET_TYPE, - NetworkTransmitterStatusPacket.STREAM_CODEC - ); - PayloadTypeRegistry.playS2C().register( - NoPermissionPacket.PACKET_TYPE, - NoPermissionPacket.STREAM_CODEC - ); - PayloadTypeRegistry.playS2C().register( - ResourceSlotUpdatePacket.PACKET_TYPE, - ResourceSlotUpdatePacket.STREAM_CODEC - ); - PayloadTypeRegistry.playS2C().register( - StorageInfoResponsePacket.PACKET_TYPE, - StorageInfoResponsePacket.STREAM_CODEC - ); - } - - private void registerClientToServerPackets() { - PayloadTypeRegistry.playC2S().register( - CraftingGridClearPacket.PACKET_TYPE, - CraftingGridClearPacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register( - CraftingGridRecipeTransferPacket.PACKET_TYPE, - CraftingGridRecipeTransferPacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register(GridExtractPacket.PACKET_TYPE, GridExtractPacket.STREAM_CODEC); - PayloadTypeRegistry.playC2S().register(GridInsertPacket.PACKET_TYPE, GridInsertPacket.STREAM_CODEC); - PayloadTypeRegistry.playC2S().register(GridScrollPacket.PACKET_TYPE, GridScrollPacket.STREAM_CODEC); - PayloadTypeRegistry.playC2S().register(PropertyChangePacket.PACKET_TYPE, PropertyChangePacket.STREAM_CODEC); - PayloadTypeRegistry.playC2S().register( - ResourceFilterSlotChangePacket.PACKET_TYPE, - ResourceFilterSlotChangePacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register( - ResourceSlotAmountChangePacket.PACKET_TYPE, - ResourceSlotAmountChangePacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register( - ResourceSlotChangePacket.PACKET_TYPE, - ResourceSlotChangePacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register( - SecurityCardBoundPlayerPacket.PACKET_TYPE, - SecurityCardBoundPlayerPacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register( - SecurityCardPermissionPacket.PACKET_TYPE, - SecurityCardPermissionPacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register( - SecurityCardResetPermissionPacket.PACKET_TYPE, - SecurityCardResetPermissionPacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register( - SingleAmountChangePacket.PACKET_TYPE, - SingleAmountChangePacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register( - StorageInfoRequestPacket.PACKET_TYPE, - StorageInfoRequestPacket.STREAM_CODEC - ); - PayloadTypeRegistry.playC2S().register( - UseNetworkBoundItemPacket.PACKET_TYPE, - UseNetworkBoundItemPacket.STREAM_CODEC - ); - } - - private void registerPacketHandlers() { - ServerPlayNetworking.registerGlobalReceiver( - StorageInfoRequestPacket.PACKET_TYPE, - wrapHandler(StorageInfoRequestPacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - GridInsertPacket.PACKET_TYPE, - wrapHandler(GridInsertPacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - GridExtractPacket.PACKET_TYPE, - wrapHandler(GridExtractPacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - GridScrollPacket.PACKET_TYPE, - wrapHandler(GridScrollPacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - CraftingGridClearPacket.PACKET_TYPE, - wrapHandler(CraftingGridClearPacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - CraftingGridRecipeTransferPacket.PACKET_TYPE, - wrapHandler(CraftingGridRecipeTransferPacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - PropertyChangePacket.PACKET_TYPE, - wrapHandler(PropertyChangePacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - ResourceSlotAmountChangePacket.PACKET_TYPE, - wrapHandler(ResourceSlotAmountChangePacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - ResourceFilterSlotChangePacket.PACKET_TYPE, - wrapHandler(ResourceFilterSlotChangePacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - ResourceSlotChangePacket.PACKET_TYPE, - wrapHandler(ResourceSlotChangePacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - SingleAmountChangePacket.PACKET_TYPE, - wrapHandler(SingleAmountChangePacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - UseNetworkBoundItemPacket.PACKET_TYPE, - wrapHandler(UseNetworkBoundItemPacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - SecurityCardPermissionPacket.PACKET_TYPE, - wrapHandler(SecurityCardPermissionPacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - SecurityCardResetPermissionPacket.PACKET_TYPE, - wrapHandler(SecurityCardResetPermissionPacket::handle) - ); - ServerPlayNetworking.registerGlobalReceiver( - SecurityCardBoundPlayerPacket.PACKET_TYPE, - wrapHandler(SecurityCardBoundPlayerPacket::handle) - ); - } - - private static ServerPlayNetworking.PlayPayloadHandler wrapHandler( - final PacketHandler handler - ) { - return (packet, ctx) -> handler.handle(packet, ctx::player); - } - - private void registerSidedHandlers() { - registerItemStorage( - AbstractDiskDriveBlockEntity.class::isInstance, - AbstractDiskDriveBlockEntity.class::cast, - AbstractDiskDriveBlockEntity::getDiskInventory, - BlockEntities.INSTANCE.getDiskDrive() - ); - registerItemStorage( - InterfaceBlockEntity.class::isInstance, - InterfaceBlockEntity.class::cast, - InterfaceBlockEntity::getExportedResourcesAsContainer, - BlockEntities.INSTANCE.getInterface() - ); - ItemStorage.SIDED.registerForBlockEntity((blockEntity, context) -> { - final InventoryStorage storage = InventoryStorage.of(blockEntity.getDiskInventory(), context); - final List> parts = new ArrayList<>(); - for (int i = 0; i < AbstractDiskInterfaceBlockEntity.AMOUNT_OF_DISKS; ++i) { - final var slot = storage.getSlot(i); - parts.add(i < 3 ? FilteringStorage.insertOnlyOf(slot) : FilteringStorage.extractOnlyOf(slot)); - } - return new CombinedStorage<>(parts); - }, BlockEntities.INSTANCE.getDiskInterface()); - FluidStorage.SIDED.registerForBlockEntity( - (blockEntity, context) -> new ResourceContainerFluidStorageAdapter(blockEntity.getExportedResources()), - BlockEntities.INSTANCE.getInterface() - ); - registerEnergyBlockEntityProviders(); - registerEnergyItemProviders(); - } - - private void registerItemStorage(final Predicate test, - final Function caster, - final Function containerSupplier, - final BlockEntityType type) { - ItemStorage.SIDED.registerForBlockEntities((blockEntity, context) -> { - if (test.test(blockEntity)) { - final T casted = caster.apply(blockEntity); - return InventoryStorage.of(containerSupplier.apply(casted), context); - } - return null; - }, type); - } - - private void registerEnergyBlockEntityProviders() { - EnergyStorage.SIDED.registerForBlockEntity( - (blockEntity, context) -> new EnergyStorageAdapter(blockEntity.getEnergyStorage()), - BlockEntities.INSTANCE.getController() - ); - EnergyStorage.SIDED.registerForBlockEntity( - (blockEntity, context) -> new EnergyStorageAdapter(blockEntity.getEnergyStorage()), - BlockEntities.INSTANCE.getPortableGrid() - ); - } - - private void registerEnergyItemProviders() { - EnergyStorage.ITEM.registerForItems( - (stack, context) -> new EnergyStorageAdapter(Items.INSTANCE.getWirelessGrid().createEnergyStorage(stack)), - Items.INSTANCE.getWirelessGrid() - ); - Items.INSTANCE.getControllers().forEach(controller -> EnergyStorage.ITEM.registerForItems( - (stack, context) -> new EnergyStorageAdapter(controller.get().createEnergyStorage(stack)), - controller.get() - )); - EnergyStorage.ITEM.registerForItems( - (stack, context) -> new EnergyStorageAdapter(PortableGridBlockItem.createEnergyStorage(stack)), - Items.INSTANCE.getPortableGrid() - ); - } - - private void registerTickHandler() { - ServerTickEvents.START_SERVER_TICK.register(server -> ServerEventQueue.runQueuedActions()); - } - - private void registerWrenchingEvent() { - UseBlockCallback.EVENT.register((player, level, hand, hitResult) -> { - final BlockState state = level.getBlockState(hitResult.getBlockPos()); - if (!(state.getBlock() instanceof AbstractBaseBlock block)) { - return InteractionResult.PASS; - } - return block.tryUseWrench(state, level, hitResult, player, hand) - .or(() -> block.tryUpdateColor(state, level, hitResult.getBlockPos(), player, hand)) - .orElse(InteractionResult.PASS); - }); - } - - private void registerSecurityBlockBreakEvent() { - PlayerBlockBreakEvents.BEFORE.register(new NetworkNodeBreakSecurityEventListener()); - } -} +package com.refinedmods.refinedstorage.platform.fabric; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.RefinedStoragePlugin; +import com.refinedmods.refinedstorage.platform.common.AbstractModInitializer; +import com.refinedmods.refinedstorage.platform.common.PlatformProxy; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntityTypeFactory; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.content.CreativeModeTabItems; +import com.refinedmods.refinedstorage.platform.common.content.DirectRegistryCallback; +import com.refinedmods.refinedstorage.platform.common.content.ExtendedMenuTypeFactory; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.content.MenuTypeFactory; +import com.refinedmods.refinedstorage.platform.common.content.RegistryCallback; +import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridItem; +import com.refinedmods.refinedstorage.platform.common.iface.InterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.iface.InterfacePlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardItem; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItem; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.CraftingGridClearPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.CraftingGridRecipeTransferPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridExtractPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridInsertPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridScrollPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.PropertyChangePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceFilterSlotChangePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceSlotAmountChangePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceSlotChangePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardBoundPlayerPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardPermissionPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardResetPermissionPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SingleAmountChangePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.StorageInfoRequestPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.UseNetworkBoundItemPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.EnergyInfoPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridActivePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridClearPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridUpdatePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NoPermissionPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.StorageInfoResponsePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.util.ServerEventQueue; +import com.refinedmods.refinedstorage.platform.fabric.exporter.FabricStorageExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.FluidGridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.FluidGridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.ItemGridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.ItemGridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.fabric.importer.FabricStorageImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.fabric.security.NetworkNodeBreakSecurityEventListener; +import com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive.FabricDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface.FabricDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.fabric.storage.externalstorage.FabricStoragePlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid.FabricPortableGridBlockEntity; +import com.refinedmods.refinedstorage.platform.fabric.support.energy.EnergyStorageAdapter; +import com.refinedmods.refinedstorage.platform.fabric.support.resource.ResourceContainerFluidStorageAdapter; +import com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.function.Function; +import java.util.function.Predicate; + +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; +import net.fabricmc.fabric.api.event.player.UseBlockCallback; +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; +import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.fabricmc.fabric.api.transfer.v1.storage.base.CombinedStorage; +import net.fabricmc.fabric.api.transfer.v1.storage.base.FilteringStorage; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.world.Container; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.flag.FeatureFlags; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import team.reborn.energy.api.EnergyStorage; + +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_WIRELESS_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PORTABLE_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.REGULATOR_UPGRADE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SECURITY_CARD; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WIRELESS_GRID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; + +public class ModInitializerImpl extends AbstractModInitializer implements ModInitializer { + private static final Logger LOGGER = LoggerFactory.getLogger(ModInitializerImpl.class); + private static final String PLUGIN_ENTRYPOINT_KEY = "refinedstorage_plugin"; + + @Override + public void onInitialize() { + AutoConfig.register(ConfigImpl.class, Toml4jConfigSerializer::new); + + PlatformProxy.loadPlatform(new PlatformImpl()); + initializePlatformApi(); + registerAdditionalGridInsertionStrategyFactories(); + registerGridExtractionStrategyFactories(); + registerGridScrollingStrategyFactories(); + registerImporterTransferStrategyFactories(); + registerExporterTransferStrategyFactories(); + registerExternalStorageProviderFactories(); + registerContent(); + registerPackets(); + registerPacketHandlers(); + registerSounds(new DirectRegistryCallback<>(BuiltInRegistries.SOUND_EVENT)); + registerRecipeSerializers(new DirectRegistryCallback<>(BuiltInRegistries.RECIPE_SERIALIZER)); + registerSidedHandlers(); + registerTickHandler(); + registerWrenchingEvent(); + registerSecurityBlockBreakEvent(); + + final List pluginEntrypoints = FabricLoader.getInstance() + .getEntrypoints(PLUGIN_ENTRYPOINT_KEY, RefinedStoragePlugin.class); + LOGGER.debug("Loading {} Refined Storage plugin entrypoints.", pluginEntrypoints.size()); + pluginEntrypoints.forEach(plugin -> plugin.onPlatformApiAvailable(PlatformApi.INSTANCE)); + + LOGGER.debug("Refined Storage has loaded."); + } + + private void registerAdditionalGridInsertionStrategyFactories() { + PlatformApi.INSTANCE.addGridInsertionStrategyFactory(FluidGridInsertionStrategy::new); + } + + private void registerGridExtractionStrategyFactories() { + PlatformApi.INSTANCE.addGridExtractionStrategyFactory(ItemGridExtractionStrategy::new); + PlatformApi.INSTANCE.addGridExtractionStrategyFactory(FluidGridExtractionStrategy::new); + } + + private void registerGridScrollingStrategyFactories() { + PlatformApi.INSTANCE.addGridScrollingStrategyFactory(ItemGridScrollingStrategy::new); + } + + private void registerImporterTransferStrategyFactories() { + PlatformApi.INSTANCE.getImporterTransferStrategyRegistry().register( + createIdentifier("item"), + new FabricStorageImporterTransferStrategyFactory<>( + ItemStorage.SIDED, + VariantUtil::ofItemVariant, + resource -> resource instanceof ItemResource itemResource + ? VariantUtil.toItemVariant(itemResource) : null, + 1 + ) + ); + PlatformApi.INSTANCE.getImporterTransferStrategyRegistry().register( + createIdentifier("fluid"), + new FabricStorageImporterTransferStrategyFactory<>( + FluidStorage.SIDED, + VariantUtil::ofFluidVariant, + resource -> resource instanceof FluidResource fluidResource + ? VariantUtil.toFluidVariant(fluidResource) : null, + FluidConstants.BUCKET + ) + ); + } + + private void registerExporterTransferStrategyFactories() { + PlatformApi.INSTANCE.getExporterTransferStrategyRegistry().register( + createIdentifier("item"), + new FabricStorageExporterTransferStrategyFactory<>( + ItemStorage.SIDED, + resource -> resource instanceof ItemResource itemResource + ? VariantUtil.toItemVariant(itemResource) : null, + 1 + ) + ); + PlatformApi.INSTANCE.getExporterTransferStrategyRegistry().register( + createIdentifier("fluid"), + new FabricStorageExporterTransferStrategyFactory<>( + FluidStorage.SIDED, + resource -> resource instanceof FluidResource fluidResource + ? VariantUtil.toFluidVariant(fluidResource) : null, + FluidConstants.BUCKET + ) + ); + } + + private void registerExternalStorageProviderFactories() { + PlatformApi.INSTANCE.addExternalStorageProviderFactory(new InterfacePlatformExternalStorageProviderFactory()); + PlatformApi.INSTANCE.addExternalStorageProviderFactory( + new FabricStoragePlatformExternalStorageProviderFactory<>( + ItemStorage.SIDED, + VariantUtil::ofItemVariant, + resource -> resource instanceof ItemResource itemResource + ? VariantUtil.toItemVariant(itemResource) : null + )); + PlatformApi.INSTANCE.addExternalStorageProviderFactory( + new FabricStoragePlatformExternalStorageProviderFactory<>( + FluidStorage.SIDED, + VariantUtil::ofFluidVariant, + resource -> resource instanceof FluidResource fluidResource + ? VariantUtil.toFluidVariant(fluidResource) : null + )); + } + + private void registerContent() { + registerBlocks( + new DirectRegistryCallback<>(BuiltInRegistries.BLOCK), + FabricDiskDriveBlockEntity::new, + (pos, state) -> new FabricPortableGridBlockEntity(PortableGridType.NORMAL, pos, state), + (pos, state) -> new FabricPortableGridBlockEntity(PortableGridType.CREATIVE, pos, state), + FabricDiskInterfaceBlockEntity::new + ); + final DirectRegistryCallback itemRegistryCallback = new DirectRegistryCallback<>(BuiltInRegistries.ITEM); + registerItems(itemRegistryCallback); + registerCustomItems(itemRegistryCallback); + registerUpgradeMappings(); + registerCreativeModeTab(); + registerBlockEntities( + new DirectRegistryCallback<>(BuiltInRegistries.BLOCK_ENTITY_TYPE), + new BlockEntityTypeFactory() { + @Override + public BlockEntityType create(final BlockEntitySupplier factory, + final Block... allowedBlocks) { + return new BlockEntityType<>(factory::create, new HashSet<>(Arrays.asList(allowedBlocks)), null); + } + }, + FabricDiskDriveBlockEntity::new, + (pos, state) -> new FabricPortableGridBlockEntity(PortableGridType.NORMAL, pos, state), + (pos, state) -> new FabricPortableGridBlockEntity(PortableGridType.CREATIVE, pos, state), + FabricDiskInterfaceBlockEntity::new + ); + registerMenus(new DirectRegistryCallback<>(BuiltInRegistries.MENU), new MenuTypeFactory() { + @Override + public MenuType create(final MenuSupplier supplier) { + return new MenuType<>(supplier::create, FeatureFlags.DEFAULT_FLAGS); + } + }, new ExtendedMenuTypeFactory() { + @Override + public MenuType create(final MenuSupplier supplier, + final StreamCodec + streamCodec) { + return new ExtendedScreenHandlerType<>(supplier::create, streamCodec); + } + }); + registerLootFunctions(new DirectRegistryCallback<>(BuiltInRegistries.LOOT_FUNCTION_TYPE)); + registerDataComponents(new DirectRegistryCallback<>(BuiltInRegistries.DATA_COMPONENT_TYPE)); + } + + private void registerCustomItems(final RegistryCallback callback) { + Items.INSTANCE.setRegulatorUpgrade(callback.register(REGULATOR_UPGRADE, () -> new RegulatorUpgradeItem( + PlatformApi.INSTANCE.getUpgradeRegistry() + ) { + @Override + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); + } + })); + Items.INSTANCE.setWirelessGrid(callback.register(WIRELESS_GRID, () -> new WirelessGridItem() { + @Override + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); + } + })); + Items.INSTANCE.setCreativeWirelessGrid(callback.register( + CREATIVE_WIRELESS_GRID, + () -> new WirelessGridItem() { + @Override + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); + } + } + )); + Items.INSTANCE.setPortableGrid(callback.register(PORTABLE_GRID, () -> new PortableGridBlockItem( + Blocks.INSTANCE.getPortableGrid(), PortableGridType.NORMAL + ) { + @Override + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); + } + })); + Items.INSTANCE.setCreativePortableGrid(callback.register( + CREATIVE_PORTABLE_GRID, + () -> new PortableGridBlockItem(Blocks.INSTANCE.getCreativePortableGrid(), PortableGridType.CREATIVE) { + @Override + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); + } + } + )); + Items.INSTANCE.setSecurityCard(callback.register(SECURITY_CARD, () -> new SecurityCardItem() { + @Override + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); + } + })); + Items.INSTANCE.setFallbackSecurityCard(callback.register( + FALLBACK_SECURITY_CARD, + () -> new FallbackSecurityCardItem() { + @Override + public boolean allowComponentsUpdateAnimation(final Player player, + final InteractionHand hand, + final ItemStack oldStack, + final ItemStack newStack) { + return AbstractModInitializer.allowComponentsUpdateAnimation(oldStack, newStack); + } + } + )); + } + + private void registerCreativeModeTab() { + Registry.register( + BuiltInRegistries.CREATIVE_MODE_TAB, + createIdentifier("general"), + CreativeModeTab.builder(CreativeModeTab.Row.TOP, 0) + .title(ContentNames.MOD) + .icon(() -> new ItemStack(Blocks.INSTANCE.getCreativeController().getDefault())) + .displayItems((params, output) -> CreativeModeTabItems.append(output::accept)) + .build() + ); + } + + private void registerPackets() { + registerServerToClientPackets(); + registerClientToServerPackets(); + } + + private void registerServerToClientPackets() { + PayloadTypeRegistry.playS2C().register(EnergyInfoPacket.PACKET_TYPE, EnergyInfoPacket.STREAM_CODEC); + PayloadTypeRegistry.playS2C().register( + WirelessTransmitterRangePacket.PACKET_TYPE, + WirelessTransmitterRangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playS2C().register(GridActivePacket.PACKET_TYPE, GridActivePacket.STREAM_CODEC); + PayloadTypeRegistry.playS2C().register(GridClearPacket.PACKET_TYPE, GridClearPacket.STREAM_CODEC); + PayloadTypeRegistry.playS2C().register(GridUpdatePacket.PACKET_TYPE, GridUpdatePacket.STREAM_CODEC); + PayloadTypeRegistry.playS2C().register( + NetworkTransmitterStatusPacket.PACKET_TYPE, + NetworkTransmitterStatusPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playS2C().register( + NoPermissionPacket.PACKET_TYPE, + NoPermissionPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playS2C().register( + ResourceSlotUpdatePacket.PACKET_TYPE, + ResourceSlotUpdatePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playS2C().register( + StorageInfoResponsePacket.PACKET_TYPE, + StorageInfoResponsePacket.STREAM_CODEC + ); + } + + private void registerClientToServerPackets() { + PayloadTypeRegistry.playC2S().register( + CraftingGridClearPacket.PACKET_TYPE, + CraftingGridClearPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + CraftingGridRecipeTransferPacket.PACKET_TYPE, + CraftingGridRecipeTransferPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register(GridExtractPacket.PACKET_TYPE, GridExtractPacket.STREAM_CODEC); + PayloadTypeRegistry.playC2S().register(GridInsertPacket.PACKET_TYPE, GridInsertPacket.STREAM_CODEC); + PayloadTypeRegistry.playC2S().register(GridScrollPacket.PACKET_TYPE, GridScrollPacket.STREAM_CODEC); + PayloadTypeRegistry.playC2S().register(PropertyChangePacket.PACKET_TYPE, PropertyChangePacket.STREAM_CODEC); + PayloadTypeRegistry.playC2S().register( + ResourceFilterSlotChangePacket.PACKET_TYPE, + ResourceFilterSlotChangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + ResourceSlotAmountChangePacket.PACKET_TYPE, + ResourceSlotAmountChangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + ResourceSlotChangePacket.PACKET_TYPE, + ResourceSlotChangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + SecurityCardBoundPlayerPacket.PACKET_TYPE, + SecurityCardBoundPlayerPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + SecurityCardPermissionPacket.PACKET_TYPE, + SecurityCardPermissionPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + SecurityCardResetPermissionPacket.PACKET_TYPE, + SecurityCardResetPermissionPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + SingleAmountChangePacket.PACKET_TYPE, + SingleAmountChangePacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + StorageInfoRequestPacket.PACKET_TYPE, + StorageInfoRequestPacket.STREAM_CODEC + ); + PayloadTypeRegistry.playC2S().register( + UseNetworkBoundItemPacket.PACKET_TYPE, + UseNetworkBoundItemPacket.STREAM_CODEC + ); + } + + private void registerPacketHandlers() { + ServerPlayNetworking.registerGlobalReceiver( + StorageInfoRequestPacket.PACKET_TYPE, + wrapHandler(StorageInfoRequestPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + GridInsertPacket.PACKET_TYPE, + wrapHandler(GridInsertPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + GridExtractPacket.PACKET_TYPE, + wrapHandler(GridExtractPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + GridScrollPacket.PACKET_TYPE, + wrapHandler(GridScrollPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + CraftingGridClearPacket.PACKET_TYPE, + wrapHandler(CraftingGridClearPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + CraftingGridRecipeTransferPacket.PACKET_TYPE, + wrapHandler(CraftingGridRecipeTransferPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + PropertyChangePacket.PACKET_TYPE, + wrapHandler(PropertyChangePacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + ResourceSlotAmountChangePacket.PACKET_TYPE, + wrapHandler(ResourceSlotAmountChangePacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + ResourceFilterSlotChangePacket.PACKET_TYPE, + wrapHandler(ResourceFilterSlotChangePacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + ResourceSlotChangePacket.PACKET_TYPE, + wrapHandler(ResourceSlotChangePacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + SingleAmountChangePacket.PACKET_TYPE, + wrapHandler(SingleAmountChangePacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + UseNetworkBoundItemPacket.PACKET_TYPE, + wrapHandler(UseNetworkBoundItemPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + SecurityCardPermissionPacket.PACKET_TYPE, + wrapHandler(SecurityCardPermissionPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + SecurityCardResetPermissionPacket.PACKET_TYPE, + wrapHandler(SecurityCardResetPermissionPacket::handle) + ); + ServerPlayNetworking.registerGlobalReceiver( + SecurityCardBoundPlayerPacket.PACKET_TYPE, + wrapHandler(SecurityCardBoundPlayerPacket::handle) + ); + } + + private static ServerPlayNetworking.PlayPayloadHandler wrapHandler( + final PacketHandler handler + ) { + return (packet, ctx) -> handler.handle(packet, ctx::player); + } + + private void registerSidedHandlers() { + registerItemStorage( + AbstractDiskDriveBlockEntity.class::isInstance, + AbstractDiskDriveBlockEntity.class::cast, + AbstractDiskDriveBlockEntity::getDiskInventory, + BlockEntities.INSTANCE.getDiskDrive() + ); + registerItemStorage( + InterfaceBlockEntity.class::isInstance, + InterfaceBlockEntity.class::cast, + InterfaceBlockEntity::getExportedResourcesAsContainer, + BlockEntities.INSTANCE.getInterface() + ); + ItemStorage.SIDED.registerForBlockEntity((blockEntity, context) -> { + final InventoryStorage storage = InventoryStorage.of(blockEntity.getDiskInventory(), context); + final List> parts = new ArrayList<>(); + for (int i = 0; i < AbstractDiskInterfaceBlockEntity.AMOUNT_OF_DISKS; ++i) { + final var slot = storage.getSlot(i); + parts.add(i < 3 ? FilteringStorage.insertOnlyOf(slot) : FilteringStorage.extractOnlyOf(slot)); + } + return new CombinedStorage<>(parts); + }, BlockEntities.INSTANCE.getDiskInterface()); + FluidStorage.SIDED.registerForBlockEntity( + (blockEntity, context) -> new ResourceContainerFluidStorageAdapter(blockEntity.getExportedResources()), + BlockEntities.INSTANCE.getInterface() + ); + registerEnergyBlockEntityProviders(); + registerEnergyItemProviders(); + } + + private void registerItemStorage(final Predicate test, + final Function caster, + final Function containerSupplier, + final BlockEntityType type) { + ItemStorage.SIDED.registerForBlockEntities((blockEntity, context) -> { + if (test.test(blockEntity)) { + final T casted = caster.apply(blockEntity); + return InventoryStorage.of(containerSupplier.apply(casted), context); + } + return null; + }, type); + } + + private void registerEnergyBlockEntityProviders() { + EnergyStorage.SIDED.registerForBlockEntity( + (blockEntity, context) -> new EnergyStorageAdapter(blockEntity.getEnergyStorage()), + BlockEntities.INSTANCE.getController() + ); + EnergyStorage.SIDED.registerForBlockEntity( + (blockEntity, context) -> new EnergyStorageAdapter(blockEntity.getEnergyStorage()), + BlockEntities.INSTANCE.getPortableGrid() + ); + } + + private void registerEnergyItemProviders() { + EnergyStorage.ITEM.registerForItems( + (stack, context) -> new EnergyStorageAdapter(Items.INSTANCE.getWirelessGrid().createEnergyStorage(stack)), + Items.INSTANCE.getWirelessGrid() + ); + Items.INSTANCE.getControllers().forEach(controller -> EnergyStorage.ITEM.registerForItems( + (stack, context) -> new EnergyStorageAdapter(controller.get().createEnergyStorage(stack)), + controller.get() + )); + EnergyStorage.ITEM.registerForItems( + (stack, context) -> new EnergyStorageAdapter(PortableGridBlockItem.createEnergyStorage(stack)), + Items.INSTANCE.getPortableGrid() + ); + } + + private void registerTickHandler() { + ServerTickEvents.START_SERVER_TICK.register(server -> ServerEventQueue.runQueuedActions()); + } + + private void registerWrenchingEvent() { + UseBlockCallback.EVENT.register((player, level, hand, hitResult) -> { + final BlockState state = level.getBlockState(hitResult.getBlockPos()); + if (!(state.getBlock() instanceof AbstractBaseBlock block)) { + return InteractionResult.PASS; + } + return block.tryUseWrench(state, level, hitResult, player, hand) + .or(() -> block.tryUpdateColor(state, level, hitResult.getBlockPos(), player, hand)) + .orElse(InteractionResult.PASS); + }); + } + + private void registerSecurityBlockBreakEvent() { + PlayerBlockBreakEvents.BEFORE.register(new NetworkNodeBreakSecurityEventListener()); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java new file mode 100644 index 000000000..a867c2e0a --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/PlatformImpl.java @@ -0,0 +1,369 @@ +package com.refinedmods.refinedstorage.platform.fabric; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.platform.common.AbstractPlatform; +import com.refinedmods.refinedstorage.platform.common.Config; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.util.CustomBlockPlaceContext; +import com.refinedmods.refinedstorage.platform.fabric.grid.strategy.ItemGridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.fabric.grid.view.FabricFluidGridResourceFactory; +import com.refinedmods.refinedstorage.platform.fabric.grid.view.FabricItemGridResourceFactory; +import com.refinedmods.refinedstorage.platform.fabric.mixin.EditBoxAccessor; +import com.refinedmods.refinedstorage.platform.fabric.mixin.KeyMappingAccessor; +import com.refinedmods.refinedstorage.platform.fabric.support.containermenu.ContainerTransferDestination; +import com.refinedmods.refinedstorage.platform.fabric.support.containermenu.MenuOpenerImpl; +import com.refinedmods.refinedstorage.platform.fabric.support.energy.EnergyStorageAdapter; +import com.refinedmods.refinedstorage.platform.fabric.support.render.FluidVariantFluidRenderer; +import com.refinedmods.refinedstorage.platform.fabric.util.SimpleSingleStackStorage; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; +import javax.annotation.Nullable; + +import com.mojang.blaze3d.platform.InputConstants; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.entity.FakePlayer; +import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; +import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.fabricmc.fabric.impl.transfer.context.ConstantContainerItemContext; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.NonNullList; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.Container; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.crafting.CraftingInput; +import net.minecraft.world.item.crafting.CraftingRecipe; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; +import net.minecraft.world.level.block.LiquidBlockContainer; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.gameevent.GameEvent; +import net.minecraft.world.level.material.FlowingFluid; +import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.material.Fluids; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.Vec3; + +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofFluidVariant; +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toItemVariant; + +public final class PlatformImpl extends AbstractPlatform { + public PlatformImpl() { + super(new MenuOpenerImpl(), new FluidVariantFluidRenderer(), ItemGridInsertionStrategy::new); + } + + @Override + public long getBucketAmount() { + return FluidConstants.BUCKET; + } + + @Override + public Config getConfig() { + return ConfigImpl.get(); + } + + @Override + public boolean canEditBoxLoseFocus(final EditBox editBox) { + return ((EditBoxAccessor) editBox).getCanLoseFocus(); + } + + @Override + public boolean isKeyDown(final KeyMapping keyMapping) { + return !keyMapping.isUnbound() && InputConstants.isKeyDown( + Minecraft.getInstance().getWindow().getWindow(), + ((KeyMappingAccessor) keyMapping).getKey().getValue() + ); + } + + @Override + public GridResourceFactory getItemGridResourceFactory() { + return new FabricItemGridResourceFactory(); + } + + @Override + public GridResourceFactory getFluidGridResourceFactory() { + return new FabricFluidGridResourceFactory(); + } + + @Override + public Optional getContainedFluid(final ItemStack stack) { + if (stack.isEmpty()) { + return Optional.empty(); + } + final SimpleSingleStackStorage interceptingStorage = new SimpleSingleStackStorage(stack); + final Storage storage = FluidStorage.ITEM.find(stack, ContainerItemContext.ofSingleSlot( + interceptingStorage + )); + try (Transaction tx = Transaction.openOuter()) { + final var extracted = StorageUtil.extractAny(storage, Long.MAX_VALUE, tx); + if (extracted == null) { + return Optional.empty(); + } + return Optional.of(new ContainedFluid( + interceptingStorage.getStack(), + ofFluidVariant(extracted.resource()), + extracted.amount() + )); + } + } + + @Override + public Optional convertToBucket(final FluidResource fluidResource) { + final SimpleSingleStackStorage interceptingStorage = SimpleSingleStackStorage.forEmptyBucket(); + final Storage destination = FluidStorage.ITEM.find( + interceptingStorage.getStack(), + ContainerItemContext.ofSingleSlot(interceptingStorage) + ); + if (destination == null) { + return Optional.empty(); + } + try (Transaction tx = Transaction.openOuter()) { + destination.insert(toFluidVariant(fluidResource), FluidConstants.BUCKET, tx); + return Optional.of(interceptingStorage.getStack()); + } + } + + @Override + public TransferManager createTransferManager(final AbstractContainerMenu containerMenu) { + return new TransferManager(containerMenu, ContainerTransferDestination::new); + } + + @Override + public long insertIntoContainer(final Container container, + final ItemResource itemResource, + final long amount, + final Action action) { + try (Transaction tx = Transaction.openOuter()) { + final long inserted = InventoryStorage + .of(container, null) + .insert(toItemVariant(itemResource), amount, tx); + if (action == Action.EXECUTE) { + tx.commit(); + } + return inserted; + } + } + + @Override + public ItemStack getCloneItemStack(final BlockState state, + final Level level, + final BlockHitResult hitResult, + final Player player) { + return state.getBlock().getCloneItemStack(level, hitResult.getBlockPos(), state); + } + + + @Override + public NonNullList getRemainingCraftingItems(final Player player, + final CraftingRecipe craftingRecipe, + final CraftingInput input) { + return craftingRecipe.getRemainingItems(input); + } + + @Override + public void onItemCrafted(final Player player, final ItemStack craftedStack, final CraftingContainer container) { + // no op + } + + @Override + public Player getFakePlayer(final ServerLevel level, @Nullable final UUID playerId) { + return Optional.ofNullable(playerId) + .flatMap(id -> level.getServer().getProfileCache().get(id)) + .map(profile -> FakePlayer.get(level, profile)) + .orElseGet(() -> FakePlayer.get(level)); + } + + @Override + public boolean canBreakBlock(final Level level, final BlockPos pos, final BlockState state, final Player player) { + return PlayerBlockBreakEvents.BEFORE.invoker().beforeBlockBreak( + level, + player, + pos, + state, + level.getBlockEntity(pos) + ); + } + + @Override + public boolean placeBlock( + final Level level, + final BlockPos pos, + final Direction direction, + final Player player, + final ItemStack stack + ) { + final BlockPlaceContext ctx = new CustomBlockPlaceContext( + level, + player, + InteractionHand.MAIN_HAND, + stack, + new BlockHitResult(Vec3.ZERO, direction, pos, false) + ); + final InteractionResult result = stack.useOn(ctx); + return result.consumesAction(); + } + + @Override + public boolean placeFluid( + final Level level, + final BlockPos pos, + final Direction direction, + final Player player, + final FluidResource fluidResource + ) { + // Stolen from BucketItem#emptyContents + final Fluid content = fluidResource.fluid(); + if (!(content instanceof FlowingFluid)) { + return false; + } + final BlockState blockState = level.getBlockState(pos); + final Block block = blockState.getBlock(); + final boolean replaceable = blockState.canBeReplaced(content); + final boolean canPlace = blockState.isAir() + || replaceable + || (block instanceof LiquidBlockContainer lbc + && lbc.canPlaceLiquid(player, level, pos, blockState, content)); + if (!canPlace || blockState.getFluidState().isSource()) { + return false; + } else if (block instanceof LiquidBlockContainer lbc && content == Fluids.WATER) { + lbc.placeLiquid(level, pos, blockState, ((FlowingFluid) content).getSource(false)); + playEmptySound(content, player, level, pos); + return true; + } + return doPlaceFluid(level, pos, player, content, blockState, replaceable); + } + + @SuppressWarnings("deprecation") + private boolean doPlaceFluid(final Level level, + final BlockPos pos, + final Player player, + final Fluid content, + final BlockState blockState, + final boolean replaceable) { + if (replaceable && !blockState.liquid()) { + level.destroyBlock(pos, true); + } + if (!level.setBlock(pos, content.defaultFluidState().createLegacyBlock(), 11) + && !blockState.getFluidState().isSource()) { + return false; + } + playEmptySound(content, player, level, pos); + return true; + } + + @SuppressWarnings("deprecation") + private void playEmptySound(final Fluid content, final Player player, final LevelAccessor level, + final BlockPos pos) { + final SoundEvent soundEvent = content.is(FluidTags.LAVA) + ? SoundEvents.BUCKET_EMPTY_LAVA + : SoundEvents.BUCKET_EMPTY; + level.playSound(player, pos, soundEvent, SoundSource.BLOCKS, 1.0F, 1.0F); + level.gameEvent(player, GameEvent.FLUID_PLACE, pos); + } + + @Override + public ItemStack getBlockAsItemStack(final Block block, + final BlockState state, + final Direction direction, + final LevelReader level, + final BlockPos position, + final Player player) { + return block.getCloneItemStack(level, position, state); + } + + @Override + public Optional getBucketPickupSound(final LiquidBlock liquidBlock, final BlockState state) { + return liquidBlock.getPickupSound(); + } + + @Override + public List processTooltipComponents(final ItemStack stack, + final GuiGraphics graphics, + final int mouseX, + final Optional imageComponent, + final List components) { + final List processedComponents = components + .stream() + .map(Component::getVisualOrderText) + .map(ClientTooltipComponent::create) + .collect(Collectors.toList()); + imageComponent.ifPresent(image -> processedComponents.add(1, ClientTooltipComponent.create(image))); + return processedComponents; + } + + @Override + public void renderTooltip(final GuiGraphics graphics, + final List components, + final int x, + final int y) { + graphics.renderTooltipInternal( + Minecraft.getInstance().font, + components, + x, + y, + DefaultTooltipPositioner.INSTANCE + ); + } + + @Override + public Optional getEnergyStorage(final ItemStack stack) { + final ConstantContainerItemContext ctx = new ConstantContainerItemContext( + ItemVariant.of(stack), + stack.getCount() + ); + return Optional.ofNullable(team.reborn.energy.api.EnergyStorage.ITEM.find(stack, ctx)) + .filter(EnergyStorageAdapter.class::isInstance) + .map(EnergyStorageAdapter.class::cast) + .map(EnergyStorageAdapter::getEnergyStorage); + } + + @Override + public void sendPacketToServer(final T packet) { + ClientPlayNetworking.send(packet); + } + + @Override + public void sendPacketToClient(final ServerPlayer player, final T packet) { + ServerPlayNetworking.send(player, packet); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java new file mode 100644 index 000000000..d8b7465cc --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java @@ -0,0 +1,63 @@ +package com.refinedmods.refinedstorage.platform.fabric.exporter; + +import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.exporter.FuzzyExporterTransferStrategy; +import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageInsertableStorage; + +import java.util.function.Function; + +import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class FabricStorageExporterTransferStrategyFactory implements ExporterTransferStrategyFactory { + private final BlockApiLookup, Direction> lookup; + private final Function toPlatformMapper; + private final long singleAmount; + + public FabricStorageExporterTransferStrategyFactory(final BlockApiLookup, Direction> lookup, + final Function toPlatformMapper, + final long singleAmount) { + this.lookup = lookup; + this.toPlatformMapper = toPlatformMapper; + this.singleAmount = singleAmount; + } + + @Override + public ExporterTransferStrategy create(final ServerLevel level, + final BlockPos pos, + final Direction direction, + final UpgradeState upgradeState, + final AmountOverride amountOverride, + final boolean fuzzyMode) { + final FabricStorageInsertableStorage insertTarget = new FabricStorageInsertableStorage<>( + lookup, + toPlatformMapper, + level, + pos, + direction, + amountOverride + ); + final long transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) + ? singleAmount * 64 + : singleAmount; + return create(fuzzyMode, insertTarget, transferQuota); + } + + private ExporterTransferStrategyImpl create(final boolean fuzzyMode, + final FabricStorageInsertableStorage insertTarget, + final long transferQuota) { + if (fuzzyMode) { + return new FuzzyExporterTransferStrategy(insertTarget, transferQuota); + } + return new ExporterTransferStrategyImpl(insertTarget, transferQuota); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/package-info.java new file mode 100644 index 000000000..4c99249a9 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java new file mode 100644 index 000000000..4bc97ff42 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java @@ -0,0 +1,149 @@ +package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.platform.fabric.util.SimpleSingleStackStorage; + +import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.Items; + +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; + +public class FluidGridExtractionStrategy implements GridExtractionStrategy { + private static final ItemVariant BUCKET_ITEM_VARIANT = ItemVariant.of(Items.BUCKET); + private static final ItemResource BUCKET_ITEM_RESOURCE = new ItemResource(Items.BUCKET); + + private final GridOperations gridOperations; + private final PlayerInventoryStorage playerInventoryStorage; + private final net.fabricmc.fabric.api.transfer.v1.storage.Storage playerCursorStorage; + private final Storage itemStorage; + + public FluidGridExtractionStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + this.gridOperations = grid.createOperations(ResourceTypes.FLUID, player); + this.playerInventoryStorage = PlayerInventoryStorage.of(player.getInventory()); + this.playerCursorStorage = PlayerInventoryStorage.getCursorStorage(containerMenu); + this.itemStorage = grid.getItemStorage(); + } + + @Override + public boolean onExtract(final PlatformResourceKey resource, + final GridExtractMode extractMode, + final boolean cursor) { + if (resource instanceof FluidResource fluidResource) { + final boolean bucketInInventory = hasBucketInInventory(); + final boolean bucketInStorageChannel = hasBucketInStorage(); + if (bucketInInventory) { + extractWithBucketInInventory(fluidResource, extractMode, cursor); + } else if (bucketInStorageChannel) { + extractWithBucketInStorage(fluidResource, extractMode, cursor); + } + return true; + } + return false; + } + + private void extractWithBucketInStorage(final FluidResource fluidResource, + final GridExtractMode mode, + final boolean cursor) { + final SimpleSingleStackStorage interceptingStorage = SimpleSingleStackStorage.forEmptyBucket(); + final net.fabricmc.fabric.api.transfer.v1.storage.Storage destination = FluidStorage.ITEM.find( + interceptingStorage.getStack(), + ContainerItemContext.ofSingleSlot(interceptingStorage) + ); + if (destination == null) { + return; + } + gridOperations.extract(fluidResource, mode, (resource, amount, action, source) -> { + if (!(resource instanceof FluidResource fluidResource2)) { + return 0; + } + try (Transaction tx = Transaction.openOuter()) { + final long inserted = destination.insert(toFluidVariant(fluidResource2), amount, tx); + final boolean couldInsertBucket = insertResultingBucketIntoInventory(interceptingStorage, cursor, tx); + if (!couldInsertBucket) { + return 0; + } + if (action == Action.EXECUTE) { + itemStorage.extract(BUCKET_ITEM_RESOURCE, 1, Action.EXECUTE, source); + tx.commit(); + } + return inserted; + } + }); + } + + private void extractWithBucketInInventory(final FluidResource fluidResource, + final GridExtractMode mode, + final boolean cursor) { + try (Transaction tx = Transaction.openOuter()) { + playerInventoryStorage.extract(BUCKET_ITEM_VARIANT, 1, tx); + final SimpleSingleStackStorage interceptingStorage = SimpleSingleStackStorage.forEmptyBucket(); + final net.fabricmc.fabric.api.transfer.v1.storage.Storage dest = FluidStorage.ITEM.find( + interceptingStorage.getStack(), + ContainerItemContext.ofSingleSlot(interceptingStorage) + ); + if (dest == null) { + return; + } + gridOperations.extract(fluidResource, mode, (resource, amount, action, source) -> { + if (!(resource instanceof FluidResource fluidResource2)) { + return 0; + } + try (Transaction innerTx = tx.openNested()) { + final long inserted = dest.insert(toFluidVariant(fluidResource2), amount, innerTx); + final boolean couldInsertBucket = insertResultingBucketIntoInventory( + interceptingStorage, + cursor, + innerTx + ); + if (!couldInsertBucket) { + return 0; + } + if (action == Action.EXECUTE) { + innerTx.commit(); + tx.commit(); + } + return inserted; + } + }); + } + } + + private boolean insertResultingBucketIntoInventory(final SimpleSingleStackStorage interceptingStorage, + final boolean cursor, + final Transaction innerTx) { + final net.fabricmc.fabric.api.transfer.v1.storage.Storage relevantStorage = cursor + ? playerCursorStorage + : playerInventoryStorage; + final ItemVariant itemVariant = ItemVariant.of(interceptingStorage.getStack()); + return relevantStorage.insert(itemVariant, 1, innerTx) != 0; + } + + private boolean hasBucketInInventory() { + try (Transaction tx = Transaction.openOuter()) { + return playerInventoryStorage.extract(BUCKET_ITEM_VARIANT, 1, tx) == 1; + } + } + + private boolean hasBucketInStorage() { + return itemStorage.extract(BUCKET_ITEM_RESOURCE, 1, Action.SIMULATE, EmptyActor.INSTANCE) == 1; + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java new file mode 100644 index 000000000..bdf9c18b4 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java @@ -0,0 +1,112 @@ +package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; + +import javax.annotation.Nullable; + +import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; +import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; + +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofFluidVariant; +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; + +public class FluidGridInsertionStrategy implements GridInsertionStrategy { + private final AbstractContainerMenu containerMenu; + private final GridOperations gridOperations; + private final Player player; + private final PlayerInventoryStorage playerInventoryStorage; + + public FluidGridInsertionStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + this.containerMenu = containerMenu; + this.gridOperations = grid.createOperations(ResourceTypes.FLUID, player); + this.player = player; + this.playerInventoryStorage = PlayerInventoryStorage.of(player.getInventory()); + } + + @Override + public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { + final Storage cursorStorage = getFluidCursorStorage(); + if (cursorStorage == null) { + return false; + } + final FluidVariant extractableResource = StorageUtil.findExtractableResource(cursorStorage, null); + if (extractableResource == null) { + return false; + } + final FluidResource fluidResource = ofFluidVariant(extractableResource); + gridOperations.insert(fluidResource, insertMode, (resource, amount, action, source) -> { + if (!(resource instanceof FluidResource fluidResource2)) { + return 0; + } + final FluidVariant fluidVariant = toFluidVariant(fluidResource2); + try (Transaction tx = Transaction.openOuter()) { + final long extracted = cursorStorage.extract(fluidVariant, amount, tx); + if (action == Action.EXECUTE) { + tx.commit(); + } + return extracted; + } + }); + return true; + } + + @Nullable + private Storage getFluidCursorStorage() { + return FluidStorage.ITEM.find( + containerMenu.getCarried(), + ContainerItemContext.ofPlayerCursor(player, containerMenu) + ); + } + + @Override + public boolean onTransfer(final int slotIndex) { + final SingleSlotStorage itemSlotStorage = playerInventoryStorage.getSlot(slotIndex); + if (itemSlotStorage == null) { + return false; + } + final Storage fluidSlotStorage = FluidStorage.ITEM.find( + itemSlotStorage.getResource().toStack(), + ContainerItemContext.ofPlayerSlot(player, itemSlotStorage) + ); + if (fluidSlotStorage == null) { + return false; + } + final FluidVariant extractableResource = StorageUtil.findExtractableResource(fluidSlotStorage, null); + if (extractableResource == null) { + return false; + } + final FluidResource fluidResource = ofFluidVariant(extractableResource); + gridOperations.insert(fluidResource, GridInsertMode.ENTIRE_RESOURCE, (resource, amount, action, source) -> { + if (!(resource instanceof FluidResource fluidResource2)) { + return 0; + } + final FluidVariant fluidVariant = toFluidVariant(fluidResource2); + try (Transaction tx = Transaction.openOuter()) { + final long extracted = fluidSlotStorage.extract(fluidVariant, amount, tx); + if (action == Action.EXECUTE) { + tx.commit(); + } + return extracted; + } + }); + return true; + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java new file mode 100644 index 000000000..68e4d19e2 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java @@ -0,0 +1,62 @@ +package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; + +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; + +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toItemVariant; + +public class ItemGridExtractionStrategy implements GridExtractionStrategy { + private final GridOperations gridOperations; + private final PlayerInventoryStorage playerInventoryStorage; + private final SingleSlotStorage playerCursorStorage; + + public ItemGridExtractionStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); + this.playerInventoryStorage = PlayerInventoryStorage.of(player.getInventory()); + this.playerCursorStorage = PlayerInventoryStorage.getCursorStorage(containerMenu); + } + + @Override + public boolean onExtract(final PlatformResourceKey resource, + final GridExtractMode extractMode, + final boolean cursor) { + if (resource instanceof ItemResource itemResource) { + gridOperations.extract(itemResource, extractMode, (r, amount, action, source) -> { + if (!(r instanceof ItemResource itemResource2)) { + return 0; + } + final ItemVariant itemVariant = toItemVariant(itemResource2); + try (Transaction tx = Transaction.openOuter()) { + final long inserted = insert(itemVariant, amount, tx, cursor); + if (action == Action.EXECUTE) { + tx.commit(); + } + return inserted; + } + }); + return true; + } + return false; + } + + private long insert(final ItemVariant itemVariant, final long amount, final Transaction tx, final boolean cursor) { + final Storage relevantStorage = cursor ? playerCursorStorage : playerInventoryStorage; + return relevantStorage.insert(itemVariant, amount, tx); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java new file mode 100644 index 000000000..27e130588 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java @@ -0,0 +1,86 @@ +package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; + +import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; +import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; + +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofItemVariant; +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toItemVariant; + +public class ItemGridInsertionStrategy implements GridInsertionStrategy { + private final AbstractContainerMenu containerMenu; + private final GridOperations gridOperations; + private final SingleSlotStorage playerCursorStorage; + + public ItemGridInsertionStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + this.containerMenu = containerMenu; + this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); + this.playerCursorStorage = PlayerInventoryStorage.getCursorStorage(containerMenu); + } + + @Override + public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { + final ItemStack carried = containerMenu.getCarried(); + if (carried.isEmpty()) { + return false; + } + final ItemResource itemResource = ItemResource.ofItemStack(carried); + gridOperations.insert(itemResource, insertMode, (resource, amount, action, source) -> { + if (!(resource instanceof ItemResource itemResource2)) { + return 0; + } + try (Transaction tx = Transaction.openOuter()) { + final ItemVariant itemVariant = toItemVariant(itemResource2); + final long extracted = playerCursorStorage.extract(itemVariant, amount, tx); + if (action == Action.EXECUTE) { + tx.commit(); + } + return extracted; + } + }); + return true; + } + + @Override + public boolean onTransfer(final int slotIndex) { + final Slot slot = containerMenu.getSlot(slotIndex); + final InventoryStorage inventoryStorage = InventoryStorage.of(slot.container, null); + final SingleSlotStorage storage = inventoryStorage.getSlot(slot.getContainerSlot()); + final ItemVariant itemVariantInSlot = StorageUtil.findExtractableResource(storage, null); + if (itemVariantInSlot == null) { + return false; + } + final ItemResource itemResource = ofItemVariant(itemVariantInSlot); + gridOperations.insert(itemResource, GridInsertMode.ENTIRE_RESOURCE, (resource, amount, action, source) -> { + if (!(resource instanceof ItemResource itemResource2)) { + return 0; + } + try (Transaction tx = Transaction.openOuter()) { + final ItemVariant itemVariant = toItemVariant(itemResource2); + final long extracted = storage.extract(itemVariant, amount, tx); + if (action == Action.EXECUTE) { + tx.commit(); + } + return extracted; + } + }); + return true; + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java new file mode 100644 index 000000000..f59b5c80e --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java @@ -0,0 +1,86 @@ +package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; + +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; + +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toItemVariant; + +public class ItemGridScrollingStrategy implements GridScrollingStrategy { + private final GridOperations gridOperations; + private final PlayerInventoryStorage playerInventoryStorage; + private final SingleSlotStorage playerCursorStorage; + + public ItemGridScrollingStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); + this.playerInventoryStorage = PlayerInventoryStorage.of(player.getInventory()); + this.playerCursorStorage = PlayerInventoryStorage.getCursorStorage(containerMenu); + } + + @Override + public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { + if (resource instanceof ItemResource itemResource) { + final Storage playerStorage = slotIndex >= 0 + ? playerInventoryStorage.getSlot(slotIndex) + : playerInventoryStorage; + switch (scrollMode) { + case GRID_TO_INVENTORY -> handleGridToInventoryScroll(itemResource, playerStorage); + case INVENTORY_TO_GRID -> handleInventoryToGridScroll(itemResource, playerStorage); + case GRID_TO_CURSOR -> handleGridToInventoryScroll(itemResource, playerCursorStorage); + } + return true; + } + return false; + } + + private void handleInventoryToGridScroll(final ItemResource itemResource, + final Storage sourceStorage) { + gridOperations.insert(itemResource, GridInsertMode.SINGLE_RESOURCE, (resource, amount, action, source) -> { + if (!(resource instanceof ItemResource itemResource2)) { + return 0; + } + try (Transaction tx = Transaction.openOuter()) { + final ItemVariant itemVariant = toItemVariant(itemResource2); + final long extracted = sourceStorage.extract(itemVariant, amount, tx); + if (action == Action.EXECUTE) { + tx.commit(); + } + return extracted; + } + }); + } + + private void handleGridToInventoryScroll(final ItemResource itemResource, + final Storage destinationStorage) { + gridOperations.extract(itemResource, GridExtractMode.SINGLE_RESOURCE, (resource, amount, action, source) -> { + if (!(resource instanceof ItemResource itemResource2)) { + return 0; + } + final ItemVariant itemVariant = toItemVariant(itemResource2); + try (Transaction tx = Transaction.openOuter()) { + final long inserted = destinationStorage.insert(itemVariant, amount, tx); + if (action == Action.EXECUTE) { + tx.commit(); + } + return inserted; + } + }); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/package-info.java new file mode 100644 index 000000000..a9269ac18 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/strategy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/FabricFluidGridResourceFactory.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricFluidGridResourceFactory.java similarity index 76% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/FabricFluidGridResourceFactory.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricFluidGridResourceFactory.java index 21eb541e1..f9fb4b98a 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/FabricFluidGridResourceFactory.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricFluidGridResourceFactory.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.fabric.grid.view; +package com.refinedmods.refinedstorage.platform.fabric.grid.view; -import com.refinedmods.refinedstorage2.platform.common.grid.view.AbstractFluidGridResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractFluidGridResourceFactory; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import java.util.stream.Collectors; @@ -12,7 +12,7 @@ import net.fabricmc.loader.api.metadata.ModMetadata; import net.minecraft.network.chat.Component; -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toFluidVariant; +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; public class FabricFluidGridResourceFactory extends AbstractFluidGridResourceFactory { @Override diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/FabricItemGridResourceFactory.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricItemGridResourceFactory.java similarity index 82% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/FabricItemGridResourceFactory.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricItemGridResourceFactory.java index def6b3975..20807aefc 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/FabricItemGridResourceFactory.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/FabricItemGridResourceFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.fabric.grid.view; +package com.refinedmods.refinedstorage.platform.fabric.grid.view; -import com.refinedmods.refinedstorage2.platform.common.grid.view.AbstractItemGridResourceFactory; +import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractItemGridResourceFactory; import java.util.Optional; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/package-info.java new file mode 100644 index 000000000..7f1778746 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/grid/view/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.grid.view; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/FabricStorageImporterSource.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterSource.java similarity index 83% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/FabricStorageImporterSource.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterSource.java index b441c3775..ce716f89f 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/FabricStorageImporterSource.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterSource.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.platform.fabric.importer; +package com.refinedmods.refinedstorage.platform.fabric.importer; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterSource; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.fabric.storage.FabricStorageExtractableStorage; -import com.refinedmods.refinedstorage2.platform.fabric.storage.FabricStorageInsertableStorage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageExtractableStorage; +import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageInsertableStorage; import java.util.Collections; import java.util.Iterator; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java new file mode 100644 index 000000000..dd30ebd6f --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java @@ -0,0 +1,56 @@ +package com.refinedmods.refinedstorage.platform.fabric.importer; + +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; +import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.common.content.Items; + +import java.util.function.Function; + +import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class FabricStorageImporterTransferStrategyFactory

implements ImporterTransferStrategyFactory { + private final BlockApiLookup, Direction> lookup; + private final Function fromPlatformMapper; + private final Function toPlatformMapper; + private final long singleAmount; + + public FabricStorageImporterTransferStrategyFactory(final BlockApiLookup, Direction> lookup, + final Function fromPlatformMapper, + final Function toPlatformMapper, + final long singleAmount) { + this.lookup = lookup; + this.fromPlatformMapper = fromPlatformMapper; + this.toPlatformMapper = toPlatformMapper; + this.singleAmount = singleAmount; + } + + @Override + public ImporterTransferStrategy create(final ServerLevel level, + final BlockPos pos, + final Direction direction, + final UpgradeState upgradeState, + final AmountOverride amountOverride) { + final ImporterSource source = new FabricStorageImporterSource<>( + lookup, + fromPlatformMapper, + toPlatformMapper, + level, + pos, + direction, + amountOverride + ); + final long transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) + ? singleAmount * 64 + : singleAmount; + return new ImporterTransferStrategyImpl(source, transferQuota); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/package-info.java new file mode 100644 index 000000000..a38cc6870 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/AbstractModelBakerImplMixin.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/AbstractModelBakerImplMixin.java similarity index 85% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/AbstractModelBakerImplMixin.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/AbstractModelBakerImplMixin.java index d85291bfe..25846afc7 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/AbstractModelBakerImplMixin.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/AbstractModelBakerImplMixin.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.fabric.mixin; +package com.refinedmods.refinedstorage.platform.fabric.mixin; -import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.EmissiveModelRegistry; +import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.platform.fabric.support.render.EmissiveModelRegistry; import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.resources.model.BakedModel; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/EditBoxAccessor.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/EditBoxAccessor.java similarity index 80% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/EditBoxAccessor.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/EditBoxAccessor.java index 3e9b7f38a..6762f6ad8 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/EditBoxAccessor.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/EditBoxAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.mixin; +package com.refinedmods.refinedstorage.platform.fabric.mixin; import net.minecraft.client.gui.components.EditBox; import org.spongepowered.asm.mixin.Mixin; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/ItemPropertiesAccessor.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ItemPropertiesAccessor.java similarity index 89% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/ItemPropertiesAccessor.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ItemPropertiesAccessor.java index d78659a93..960690ccc 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/ItemPropertiesAccessor.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ItemPropertiesAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.mixin; +package com.refinedmods.refinedstorage.platform.fabric.mixin; import net.minecraft.client.renderer.item.ClampedItemPropertyFunction; import net.minecraft.client.renderer.item.ItemProperties; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/KeyMappingAccessor.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/KeyMappingAccessor.java similarity index 82% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/KeyMappingAccessor.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/KeyMappingAccessor.java index 8c7f83db6..e2f156577 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/KeyMappingAccessor.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/KeyMappingAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.mixin; +package com.refinedmods.refinedstorage.platform.fabric.mixin; import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/ModelBakeryAccessor.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ModelBakeryAccessor.java similarity index 86% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/ModelBakeryAccessor.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ModelBakeryAccessor.java index 1f964782d..d1b188ad2 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/ModelBakeryAccessor.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/ModelBakeryAccessor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.mixin; +package com.refinedmods.refinedstorage.platform.fabric.mixin; import java.util.Map; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/package-info.java new file mode 100644 index 000000000..515cc2dd4 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/mixin/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.mixin; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/modmenu/ModMenuApiImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/ModMenuApiImpl.java similarity index 78% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/modmenu/ModMenuApiImpl.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/ModMenuApiImpl.java index e9d43d3e1..b5b032811 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/modmenu/ModMenuApiImpl.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/ModMenuApiImpl.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.fabric.modmenu; +package com.refinedmods.refinedstorage.platform.fabric.modmenu; -import com.refinedmods.refinedstorage2.platform.fabric.ConfigImpl; +import com.refinedmods.refinedstorage.platform.fabric.ConfigImpl; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/package-info.java new file mode 100644 index 000000000..6f7aff03b --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/modmenu/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.modmenu; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/package-info.java new file mode 100644 index 000000000..f9ffc5d33 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java similarity index 79% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java index b39693f10..3b51cdff8 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/NetworkNodeBreakSecurityEventListener.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.fabric.security; +package com.refinedmods.refinedstorage.platform.fabric.security; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; import javax.annotation.Nullable; @@ -13,7 +13,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; public class NetworkNodeBreakSecurityEventListener implements PlayerBlockBreakEvents.Before { @Override diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/package-info.java new file mode 100644 index 000000000..3cd0fc46c --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/security/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.security; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/AbstractDiskContainerBakedModel.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/AbstractDiskContainerBakedModel.java similarity index 92% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/AbstractDiskContainerBakedModel.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/AbstractDiskContainerBakedModel.java index fe8b8f3dc..ff40801cf 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/AbstractDiskContainerBakedModel.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/AbstractDiskContainerBakedModel.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage; +package com.refinedmods.refinedstorage.platform.fabric.storage; -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractDiskContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadTranslator; +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.common.storage.AbstractDiskContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadTranslator; import java.util.Map; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/FabricStorageExtractableStorage.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageExtractableStorage.java similarity index 86% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/FabricStorageExtractableStorage.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageExtractableStorage.java index 086ff1250..ad0c0839f 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/FabricStorageExtractableStorage.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageExtractableStorage.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage; +package com.refinedmods.refinedstorage.platform.fabric.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; import java.util.function.Function; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/FabricStorageInsertableStorage.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java similarity index 86% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/FabricStorageInsertableStorage.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java index 36ec5c2e4..4285c2d17 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/FabricStorageInsertableStorage.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageInsertableStorage.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage; +package com.refinedmods.refinedstorage.platform.fabric.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; import java.util.function.Function; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/FabricStorageUtil.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageUtil.java similarity index 89% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/FabricStorageUtil.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageUtil.java index e253caa2c..1a5a2b244 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/FabricStorageUtil.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/FabricStorageUtil.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage; +package com.refinedmods.refinedstorage.platform.fabric.storage; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; import net.fabricmc.fabric.api.transfer.v1.storage.StorageView; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java new file mode 100644 index 000000000..27d1dfa92 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java @@ -0,0 +1,74 @@ +package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; + +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.fabric.storage.AbstractDiskContainerBakedModel; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadTranslator; + +import java.util.Map; +import java.util.function.Supplier; + +import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.core.BlockPos; +import net.minecraft.util.RandomSource; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.block.state.BlockState; + +class DiskDriveBakedModel extends AbstractDiskContainerBakedModel { + private final QuadRotators quadRotators; + + DiskDriveBakedModel(final BakedModel baseModel, + final Map diskModels, + final BakedModel inactiveLedModel, + final QuadRotators quadRotators) { + super(diskModels, inactiveLedModel, getDiskTranslations()); + this.wrapped = baseModel; + this.quadRotators = quadRotators; + } + + private static QuadTranslator[] getDiskTranslations() { + final QuadTranslator[] translations = new QuadTranslator[8]; + int i = 0; + for (int y = 0; y < 4; ++y) { + for (int x = 0; x < 2; ++x) { + translations[i++] = new QuadTranslator( + x == 0 ? -(2F / 16F) : -(9F / 16F), + -((y * 3F) / 16F) - (2F / 16F), + 0 + ); + } + } + return translations; + } + + @Override + public void emitItemQuads(final ItemStack stack, + final Supplier randomSupplier, + final RenderContext context) { + wrapped.emitItemQuads(stack, randomSupplier, context); + super.emitItemQuads(stack, randomSupplier, context); + } + + @Override + public void emitBlockQuads(final BlockAndTintGetter blockView, + final BlockState state, + final BlockPos pos, + final Supplier randomSupplier, + final RenderContext context) { + if (!(state.getBlock() instanceof DiskDriveBlock diskDriveBlock)) { + return; + } + final BiDirection direction = diskDriveBlock.getDirection(state); + if (direction == null) { + return; + } + context.pushTransform(quadRotators.forDirection(direction)); + wrapped.emitBlockQuads(blockView, state, pos, randomSupplier, context); + super.emitBlockQuads(blockView, state, pos, randomSupplier, context); + context.popTransform(); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java new file mode 100644 index 000000000..299cf29d7 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; + +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.fabric.support.render.RenderTypes; + +public class DiskDriveBlockEntityRendererImpl + extends AbstractDiskDriveBlockEntityRenderer { + public DiskDriveBlockEntityRendererImpl() { + super(RenderTypes.DISK_LED); + } + + @Override + protected Disk[] getDisks(final AbstractDiskDriveBlockEntity blockEntity) { + if (!(blockEntity instanceof FabricDiskDriveBlockEntity fabricBlockEntity)) { + return null; + } + if (fabricBlockEntity.getRenderData() instanceof Disk[] disks) { + return disks; + } + return null; + } +} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java similarity index 89% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java index 1d8cec172..fc8a0e901 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/DiskDriveUnbakedModel.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive; +package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; import java.util.Collection; import java.util.HashSet; @@ -20,7 +20,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class DiskDriveUnbakedModel implements UnbakedModel { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java new file mode 100644 index 000000000..a47217bad --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; + +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; + +public class FabricDiskDriveBlockEntity extends AbstractDiskDriveBlockEntity { + public FabricDiskDriveBlockEntity(final BlockPos pos, final BlockState state) { + super(pos, state); + } + + @Override + @Nullable + public Object getRenderData() { + return disks; + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/package-info.java new file mode 100644 index 000000000..0563688e5 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskdrive/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.storage.diskdrive; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java new file mode 100644 index 000000000..2d00a3bf3 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java @@ -0,0 +1,92 @@ +package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; + +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceBlock; +import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.fabric.storage.AbstractDiskContainerBakedModel; +import com.refinedmods.refinedstorage.platform.fabric.support.render.EmissiveTransform; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadTranslator; + +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; + +import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.core.BlockPos; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.RandomSource; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.block.state.BlockState; + +class DiskInterfaceBakedModel extends AbstractDiskContainerBakedModel { + private final BakedModel inactiveModel; + private final QuadRotators quadRotators; + private final EmissiveTransform emissiveTransform; + + DiskInterfaceBakedModel(final BakedModel baseModel, + final BakedModel inactiveModel, + final Map diskModels, + final BakedModel inactiveLedModel, + final QuadRotators quadRotators, + final ResourceLocation emissiveSprite) { + super(diskModels, inactiveLedModel, getDiskTranslations()); + this.wrapped = baseModel; + this.inactiveModel = inactiveModel; + this.quadRotators = quadRotators; + this.emissiveTransform = new EmissiveTransform(Set.of(emissiveSprite)); + } + + private static QuadTranslator[] getDiskTranslations() { + final QuadTranslator[] translations = new QuadTranslator[6]; + for (int i = 0; i < translations.length; ++i) { + final int x = i < 3 ? 0 : 1; + final int y = i % 3; + translations[i] = new QuadTranslator( + x == 0 ? -(2F / 16F) : -(9F / 16F), + -((y * 3F) / 16F) - (6F / 16F), + 0 + ); + } + return translations; + } + + @Override + public void emitItemQuads(final ItemStack stack, + final Supplier randomSupplier, + final RenderContext context) { + context.pushTransform(emissiveTransform); + wrapped.emitItemQuads(stack, randomSupplier, context); + context.popTransform(); + super.emitItemQuads(stack, randomSupplier, context); + } + + @Override + public void emitBlockQuads(final BlockAndTintGetter blockView, + final BlockState state, + final BlockPos pos, + final Supplier randomSupplier, + final RenderContext context) { + if (!(state.getBlock() instanceof DiskInterfaceBlock diskInterfaceBlock)) { + return; + } + final BiDirection direction = diskInterfaceBlock.getDirection(state); + if (direction == null) { + return; + } + context.pushTransform(quadRotators.forDirection(direction)); + final boolean active = state.getValue(AbstractActiveColoredDirectionalBlock.ACTIVE); + if (active) { + context.pushTransform(emissiveTransform); + } + (active ? wrapped : inactiveModel).emitBlockQuads(blockView, state, pos, randomSupplier, context); + super.emitBlockQuads(blockView, state, pos, randomSupplier, context); + if (active) { + context.popTransform(); + } + context.popTransform(); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java new file mode 100644 index 000000000..1ad24843d --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; + +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.fabric.support.render.RenderTypes; + +public class DiskInterfaceBlockEntityRendererImpl + extends AbstractDiskInterfaceBlockEntityRenderer { + public DiskInterfaceBlockEntityRendererImpl() { + super(RenderTypes.DISK_LED); + } + + @Override + protected Disk[] getDisks(final AbstractDiskInterfaceBlockEntity blockEntity) { + if (!(blockEntity instanceof FabricDiskInterfaceBlockEntity fabricBlockEntity)) { + return null; + } + if (fabricBlockEntity.getRenderData() instanceof Disk[] disks) { + return disks; + } + return null; + } +} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java similarity index 90% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java index 1c08114cc..0fabc5291 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/DiskInterfaceUnbakedModel.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface; +package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; import java.util.Collection; import java.util.HashSet; @@ -21,7 +21,7 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class DiskInterfaceUnbakedModel implements UnbakedModel { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java new file mode 100644 index 000000000..2be7b792b --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; + +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; + +public class FabricDiskInterfaceBlockEntity extends AbstractDiskInterfaceBlockEntity { + public FabricDiskInterfaceBlockEntity(final BlockPos pos, final BlockState state) { + super(pos, state); + } + + @Override + @Nullable + public Object getRenderData() { + return disks; + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/package-info.java new file mode 100644 index 000000000..f8d38dad1 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/diskinterface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java similarity index 81% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java index 7b074823b..a6f547dbb 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStorageExternalStorageProvider.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.externalstorage; +package com.refinedmods.refinedstorage.platform.fabric.storage.externalstorage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.fabric.storage.FabricStorageExtractableStorage; -import com.refinedmods.refinedstorage2.platform.fabric.storage.FabricStorageInsertableStorage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageExtractableStorage; +import com.refinedmods.refinedstorage.platform.fabric.storage.FabricStorageInsertableStorage; import java.util.Collections; import java.util.Iterator; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java similarity index 80% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java index 7c55e17ed..35239e7e6 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java @@ -1,43 +1,43 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage2.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; - -import java.util.Optional; -import java.util.function.Function; - -import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class FabricStoragePlatformExternalStorageProviderFactory - implements PlatformExternalStorageProviderFactory { - private final BlockApiLookup, Direction> lookup; - private final Function fromPlatformMapper; - private final Function toPlatformMapper; - - public FabricStoragePlatformExternalStorageProviderFactory(final BlockApiLookup, Direction> lookup, - final Function fromPlatformMapper, - final Function toPlatformMapper) { - this.lookup = lookup; - this.fromPlatformMapper = fromPlatformMapper; - this.toPlatformMapper = toPlatformMapper; - } - - @Override - public Optional create(final ServerLevel level, - final BlockPos pos, - final Direction direction) { - return Optional.of(new FabricStorageExternalStorageProvider<>( - lookup, - fromPlatformMapper, - toPlatformMapper, - level, - pos, - direction - )); - } -} +package com.refinedmods.refinedstorage.platform.fabric.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; +import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; + +import java.util.Optional; +import java.util.function.Function; + +import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class FabricStoragePlatformExternalStorageProviderFactory + implements PlatformExternalStorageProviderFactory { + private final BlockApiLookup, Direction> lookup; + private final Function fromPlatformMapper; + private final Function toPlatformMapper; + + public FabricStoragePlatformExternalStorageProviderFactory(final BlockApiLookup, Direction> lookup, + final Function fromPlatformMapper, + final Function toPlatformMapper) { + this.lookup = lookup; + this.fromPlatformMapper = fromPlatformMapper; + this.toPlatformMapper = toPlatformMapper; + } + + @Override + public Optional create(final ServerLevel level, + final BlockPos pos, + final Direction direction) { + return Optional.of(new FabricStorageExternalStorageProvider<>( + lookup, + fromPlatformMapper, + toPlatformMapper, + level, + pos, + direction + )); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/package-info.java new file mode 100644 index 000000000..fa307419d --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/package-info.java new file mode 100644 index 000000000..92c7b2d5c --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/DiskLeds.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/DiskLeds.java similarity index 76% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/DiskLeds.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/DiskLeds.java index 8af6e045b..8f9ed1861 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/DiskLeds.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/DiskLeds.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; -import com.refinedmods.refinedstorage2.api.storage.StorageState; +import com.refinedmods.refinedstorage.api.storage.StorageState; import net.minecraft.client.resources.model.BakedModel; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java new file mode 100644 index 000000000..747cad571 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java @@ -0,0 +1,21 @@ +package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; + +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; + +import javax.annotation.Nullable; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; + +public class FabricPortableGridBlockEntity extends AbstractPortableGridBlockEntity { + public FabricPortableGridBlockEntity(final PortableGridType type, final BlockPos pos, final BlockState state) { + super(type, pos, state); + } + + @Override + @Nullable + public Object getRenderData() { + return disk; + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBakedModel.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBakedModel.java new file mode 100644 index 000000000..a7ee4c67e --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBakedModel.java @@ -0,0 +1,125 @@ +package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlock; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItemRenderInfo; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadTranslator; + +import java.util.Map; +import java.util.function.Supplier; + +import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; +import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.core.BlockPos; +import net.minecraft.util.RandomSource; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.block.state.BlockState; + +public class PortableGridBakedModel extends ForwardingBakedModel { + private static final QuadTranslator MOVE_TO_DISK_LOCATION = new QuadTranslator(0, -12 / 16F, 9 / 16F); + private static final QuadTranslator MOVE_TO_DISK_LED_LOCATION = new QuadTranslator(0, -12 / 16F, 9 / 16F); + + private final BakedModel activeModel; + private final BakedModel inactiveModel; + private final Map diskModels; + private final QuadRotators quadRotators; + private final DiskLeds diskLeds; + + PortableGridBakedModel(final BakedModel activeModel, + final BakedModel inactiveModel, + final Map diskModels, + final QuadRotators quadRotators, + final DiskLeds diskLeds) { + this.wrapped = inactiveModel; + this.activeModel = activeModel; + this.inactiveModel = inactiveModel; + this.diskModels = diskModels; + this.quadRotators = quadRotators; + this.diskLeds = diskLeds; + } + + @Override + public boolean isVanillaAdapter() { + return false; + } + + @Override + public void emitItemQuads(final ItemStack stack, + final Supplier randomSupplier, + final RenderContext context) { + final ClientLevel level = Minecraft.getInstance().level; + if (level == null) { + return; + } + final PortableGridBlockItemRenderInfo renderInfo = PortableGridBlockItem.getRenderInfo(stack, level); + (renderInfo.active() ? activeModel : inactiveModel).emitItemQuads(stack, randomSupplier, context); + if (renderInfo.disk().state() != StorageState.NONE) { + final BakedModel diskModel = diskModels.get(renderInfo.disk().item()); + if (diskModel == null) { + return; + } + context.pushTransform(MOVE_TO_DISK_LOCATION); + context.pushTransform(quadRotators.forDirection(BiDirection.WEST)); + diskModel.emitItemQuads(stack, randomSupplier, context); + context.popTransform(); + context.popTransform(); + + context.pushTransform(MOVE_TO_DISK_LED_LOCATION); + context.pushTransform(quadRotators.forDirection(BiDirection.WEST)); + diskLeds.forState(renderInfo.disk().state()).emitItemQuads(stack, randomSupplier, context); + context.popTransform(); + context.popTransform(); + } + } + + @Override + public void emitBlockQuads(final BlockAndTintGetter blockView, + final BlockState state, + final BlockPos pos, + final Supplier randomSupplier, + final RenderContext context) { + if (!(state.getBlock() instanceof PortableGridBlock portableGridBlock)) { + return; + } + final BiDirection direction = portableGridBlock.getDirection(state); + if (direction == null) { + return; + } + context.pushTransform(quadRotators.forDirection(direction)); + final Object renderAttachment = blockView.getBlockEntityRenderData(pos); + if (renderAttachment instanceof Disk disk) { + emitDiskQuads(blockView, state, pos, randomSupplier, context, disk); + } + final boolean active = state.getValue(PortableGridBlock.ACTIVE); + (active ? activeModel : inactiveModel).emitBlockQuads(blockView, state, pos, randomSupplier, context); + context.popTransform(); + } + + private void emitDiskQuads( + final BlockAndTintGetter blockView, + final BlockState state, + final BlockPos pos, + final Supplier randomSupplier, + final RenderContext context, + final Disk disk + ) { + final BakedModel diskModel = diskModels.get(disk.item()); + if (diskModel == null) { + return; + } + context.pushTransform(MOVE_TO_DISK_LOCATION); + context.pushTransform(quadRotators.forDirection(BiDirection.WEST)); + diskModel.emitBlockQuads(blockView, state, pos, randomSupplier, context); + context.popTransform(); + context.popTransform(); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java new file mode 100644 index 000000000..474759349 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java @@ -0,0 +1,27 @@ +package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; + +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.fabric.support.render.RenderTypes; + +import javax.annotation.Nullable; + +public class PortableGridBlockEntityRendererImpl + extends AbstractPortableGridBlockEntityRenderer { + public PortableGridBlockEntityRendererImpl() { + super(RenderTypes.DISK_LED); + } + + @Override + @Nullable + protected Disk getDisk(final T blockEntity) { + if (!(blockEntity instanceof FabricPortableGridBlockEntity fabricDiskDriveBlockEntity)) { + return null; + } + if (fabricDiskDriveBlockEntity.getRenderData() instanceof Disk disk) { + return disk; + } + return null; + } +} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java similarity index 91% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java index 461457103..f3e2b957b 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/PortableGridUnbakedModel.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadRotators; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.fabric.support.render.QuadRotators; import java.util.Collection; import java.util.Map; @@ -18,7 +18,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class PortableGridUnbakedModel implements UnbakedModel { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/package-info.java new file mode 100644 index 000000000..72a06528a --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/storage/portablegrid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/ContainerTransferDestination.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/ContainerTransferDestination.java new file mode 100644 index 000000000..3ff564cc6 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/ContainerTransferDestination.java @@ -0,0 +1,29 @@ +package com.refinedmods.refinedstorage.platform.fabric.support.containermenu; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferDestination; + +import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; +import net.fabricmc.fabric.api.transfer.v1.storage.Storage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.minecraft.world.Container; +import net.minecraft.world.item.ItemStack; + +public record ContainerTransferDestination(Container destination) implements TransferDestination { + @Override + public ItemStack transfer(final ItemStack stack) { + final Storage storage = InventoryStorage.of(destination, null); + try (Transaction tx = Transaction.openOuter()) { + final long inserted = storage.insert( + ItemVariant.of(stack), + stack.getCount(), + tx + ); + tx.commit(); + final long remainder = stack.getCount() - inserted; + final ItemStack remainderStack = stack.copy(); + remainderStack.setCount((int) remainder); + return remainderStack; + } + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/MenuOpenerImpl.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/MenuOpenerImpl.java new file mode 100644 index 000000000..f5c409c30 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/MenuOpenerImpl.java @@ -0,0 +1,45 @@ +package com.refinedmods.refinedstorage.platform.fabric.support.containermenu; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; + +import javax.annotation.Nullable; + +import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; + +public class MenuOpenerImpl implements MenuOpener { + @Override + public void openMenu(final ServerPlayer player, final MenuProvider menuProvider) { + if (menuProvider instanceof ExtendedMenuProvider extendedMenuProvider) { + openExtendedMenu(player, extendedMenuProvider); + } else { + player.openMenu(menuProvider); + } + } + + private void openExtendedMenu(final ServerPlayer player, final ExtendedMenuProvider extendedMenuProvider) { + player.openMenu(new ExtendedScreenHandlerFactory() { + @Nullable + @Override + public AbstractContainerMenu createMenu(final int syncId, final Inventory inventory, final Player player) { + return extendedMenuProvider.createMenu(syncId, inventory, player); + } + + @Override + public Component getDisplayName() { + return extendedMenuProvider.getDisplayName(); + } + + @Override + public T getScreenOpeningData(final ServerPlayer player) { + return extendedMenuProvider.getMenuData(); + } + }); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/package-info.java new file mode 100644 index 000000000..8f6acc4f8 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/containermenu/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.support.containermenu; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/EnergyStorageAdapter.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/EnergyStorageAdapter.java new file mode 100644 index 000000000..94d34567f --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/EnergyStorageAdapter.java @@ -0,0 +1,58 @@ +package com.refinedmods.refinedstorage.platform.fabric.support.energy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; + +import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; +import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant; + +public class EnergyStorageAdapter extends SnapshotParticipant implements team.reborn.energy.api.EnergyStorage { + private final EnergyStorage energyStorage; + + public EnergyStorageAdapter(final EnergyStorage energyStorage) { + this.energyStorage = energyStorage; + } + + public EnergyStorage getEnergyStorage() { + return energyStorage; + } + + @Override + public long insert(final long maxAmount, final TransactionContext transaction) { + final long insertedSimulated = energyStorage.receive(maxAmount, Action.SIMULATE); + if (insertedSimulated > 0) { + updateSnapshots(transaction); + } + return energyStorage.receive(maxAmount, Action.EXECUTE); + } + + @Override + public long extract(final long maxAmount, final TransactionContext transaction) { + final long extractedSimulated = energyStorage.extract(maxAmount, Action.SIMULATE); + if (extractedSimulated > 0) { + updateSnapshots(transaction); + } + return energyStorage.extract(maxAmount, Action.EXECUTE); + } + + @Override + public long getAmount() { + return energyStorage.getStored(); + } + + @Override + public long getCapacity() { + return energyStorage.getCapacity(); + } + + @Override + protected Long createSnapshot() { + return energyStorage.getStored(); + } + + @Override + protected void readSnapshot(final Long snapshot) { + energyStorage.extract(Long.MAX_VALUE, Action.EXECUTE); + energyStorage.receive(snapshot, Action.EXECUTE); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/package-info.java new file mode 100644 index 000000000..d7b563bc1 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/energy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.support.energy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveBakedModel.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveBakedModel.java similarity index 96% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveBakedModel.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveBakedModel.java index 4e336d905..1cb81cae8 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveBakedModel.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveBakedModel.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.render; +package com.refinedmods.refinedstorage.platform.fabric.support.render; import java.util.Set; import java.util.function.Supplier; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveModelRegistry.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveModelRegistry.java similarity index 95% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveModelRegistry.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveModelRegistry.java index 7f0c25660..c08392308 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveModelRegistry.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveModelRegistry.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.render; +package com.refinedmods.refinedstorage.platform.fabric.support.render; import java.util.Arrays; import java.util.HashMap; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveTransform.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java similarity index 96% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveTransform.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java index fc482524b..f90d173c0 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/EmissiveTransform.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/EmissiveTransform.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.render; +package com.refinedmods.refinedstorage.platform.fabric.support.render; import java.util.Set; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/FluidVariantFluidRenderer.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/FluidVariantFluidRenderer.java similarity index 88% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/FluidVariantFluidRenderer.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/FluidVariantFluidRenderer.java index a63ca4f1c..dc2edf238 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/FluidVariantFluidRenderer.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/FluidVariantFluidRenderer.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.render; +package com.refinedmods.refinedstorage.platform.fabric.support.render; -import com.refinedmods.refinedstorage2.platform.common.support.render.AbstractFluidRenderer; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil; +import com.refinedmods.refinedstorage.platform.common.support.render.AbstractFluidRenderer; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil; import java.util.HashMap; import java.util.List; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadRotator.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java similarity index 92% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadRotator.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java index ddad39f6b..bf9e5cf55 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadRotator.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotator.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.render; +package com.refinedmods.refinedstorage.platform.fabric.support.render; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotators.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotators.java new file mode 100644 index 000000000..45bc35d83 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadRotators.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.fabric.support.render; + +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; + +import java.util.EnumMap; +import java.util.Map; + +public class QuadRotators { + private final Map rotators = new EnumMap<>(BiDirection.class); + + public QuadRotators() { + for (final BiDirection direction : BiDirection.values()) { + rotators.put(direction, new QuadRotator(direction)); + } + } + + public QuadRotator forDirection(final BiDirection direction) { + return rotators.get(direction); + } +} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadTranslator.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadTranslator.java similarity index 91% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadTranslator.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadTranslator.java index 92731a2ec..f812b092a 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadTranslator.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/QuadTranslator.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.render; +package com.refinedmods.refinedstorage.platform.fabric.support.render; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/RenderTypes.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/RenderTypes.java new file mode 100644 index 000000000..f022cd712 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/RenderTypes.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.platform.fabric.support.render; + +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.VertexFormat; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.RenderStateShard; +import net.minecraft.client.renderer.RenderType; + +public final class RenderTypes { + public static final RenderType DISK_LED = RenderType.create( + "disk_led", + DefaultVertexFormat.POSITION_COLOR, + VertexFormat.Mode.QUADS, + 32565, + false, + true, + RenderType.CompositeState.builder() + .setShaderState(new RenderStateShard.ShaderStateShard(GameRenderer::getPositionColorShader)) + .createCompositeState(false) + ); + + private RenderTypes() { + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/package-info.java new file mode 100644 index 000000000..f8f7bbe5f --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/render/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.support.render; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java similarity index 86% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java index 396a3875d..9f8805e47 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/ResourceContainerFluidStorageAdapter.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.resource; +package com.refinedmods.refinedstorage.platform.fabric.support.resource; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import java.util.ArrayList; import java.util.Iterator; @@ -18,8 +18,8 @@ import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant; -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.ofFluidVariant; -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toFluidVariant; +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofFluidVariant; +import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.toFluidVariant; public class ResourceContainerFluidStorageAdapter extends SnapshotParticipant implements Storage { diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/VariantUtil.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/VariantUtil.java new file mode 100644 index 000000000..3b08f6428 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/VariantUtil.java @@ -0,0 +1,28 @@ +package com.refinedmods.refinedstorage.platform.fabric.support.resource; + +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; + +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; +import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; + +public final class VariantUtil { + private VariantUtil() { + } + + public static ItemVariant toItemVariant(final ItemResource itemResource) { + return ItemVariant.of(itemResource.item(), itemResource.components()); + } + + public static ItemResource ofItemVariant(final ItemVariant itemVariant) { + return new ItemResource(itemVariant.getItem(), itemVariant.getComponents()); + } + + public static FluidVariant toFluidVariant(final FluidResource fluidResource) { + return FluidVariant.of(fluidResource.fluid(), fluidResource.components()); + } + + public static FluidResource ofFluidVariant(final FluidVariant fluidVariant) { + return new FluidResource(fluidVariant.getFluid(), fluidVariant.getComponents()); + } +} diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/package-info.java new file mode 100644 index 000000000..4aecb33f9 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/support/resource/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.support.resource; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/util/SimpleSingleStackStorage.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/SimpleSingleStackStorage.java similarity index 91% rename from refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/util/SimpleSingleStackStorage.java rename to refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/SimpleSingleStackStorage.java index b0a59cd71..cebb1af3d 100644 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/util/SimpleSingleStackStorage.java +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/SimpleSingleStackStorage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.fabric.util; +package com.refinedmods.refinedstorage.platform.fabric.util; import net.fabricmc.fabric.api.transfer.v1.item.base.SingleStackStorage; import net.minecraft.world.item.ItemStack; diff --git a/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/package-info.java b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/package-info.java new file mode 100644 index 000000000..3a3f8bc11 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/java/com/refinedmods/refinedstorage/platform/fabric/util/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.fabric.util; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-fabric/src/main/resources/fabric.mod.json b/refinedstorage-platform-fabric/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..f2599ada8 --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,51 @@ +{ + "schemaVersion": 1, + "id": "refinedstorage", + "version": "${version}", + "name": "Refined Storage", + "description": "Refined Storage is a mass storage mod for Minecraft that offers the player a network-based storage system, allowing them to store items and fluids on a massively expandable device network.", + "authors": [ + "Refined Mods" + ], + "contact": { + "sources": "https://github.com/refinedmods/refinedstorage2", + "issues": "https://github.com/refinedmods/refinedstorage2/issues" + }, + "accessWidener": "refinedstorage.accesswidener", + "icon": "assets/refinedstorage/icon.png", + "license": "MIT", + "environment": "*", + "entrypoints": { + "main": [ + "com.refinedmods.refinedstorage.platform.fabric.ModInitializerImpl" + ], + "client": [ + "com.refinedmods.refinedstorage.platform.fabric.ClientModInitializerImpl" + ], + "modmenu": [ + "com.refinedmods.refinedstorage.platform.fabric.modmenu.ModMenuApiImpl" + ] + }, + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "https://discordapp.com/invite/VYzsydb" + } + } + }, + "mixins": [ + "refinedstorage.mixins.json" + ], + "depends": { + "fabricloader": ">=0.14.6", + "fabric-api": "*", + "minecraft": "1.21", + "java": ">=21", + "cloth-config2": "*", + "team_reborn_energy": "*" + }, + "suggests": { + "roughlyenoughitems": "*", + "modmenu": "*" + } +} diff --git a/refinedstorage2-platform-fabric/src/main/resources/refinedstorage2.accesswidener b/refinedstorage-platform-fabric/src/main/resources/refinedstorage.accesswidener similarity index 100% rename from refinedstorage2-platform-fabric/src/main/resources/refinedstorage2.accesswidener rename to refinedstorage-platform-fabric/src/main/resources/refinedstorage.accesswidener diff --git a/refinedstorage-platform-fabric/src/main/resources/refinedstorage.mixins.json b/refinedstorage-platform-fabric/src/main/resources/refinedstorage.mixins.json new file mode 100644 index 000000000..bf26e41ac --- /dev/null +++ b/refinedstorage-platform-fabric/src/main/resources/refinedstorage.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.refinedmods.refinedstorage.platform.fabric.mixin", + "compatibilityLevel": "JAVA_17", + "client": [ + "AbstractModelBakerImplMixin", + "EditBoxAccessor", + "ItemPropertiesAccessor", + "KeyMappingAccessor", + "ModelBakeryAccessor" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/refinedstorage2-platform-forge/.gitignore b/refinedstorage-platform-neoforge/.gitignore similarity index 100% rename from refinedstorage2-platform-forge/.gitignore rename to refinedstorage-platform-neoforge/.gitignore diff --git a/refinedstorage-platform-neoforge/build.gradle b/refinedstorage-platform-neoforge/build.gradle new file mode 100644 index 000000000..2b0405b8a --- /dev/null +++ b/refinedstorage-platform-neoforge/build.gradle @@ -0,0 +1,10 @@ +forgeProject("refinedstorage", project(":refinedstorage-platform-common"), apis, compileApis) + +archivesBaseName = 'refinedstorage-platform-neoforge' + +enablePublishing() + +// This avoids a build failure when running the "test" task, because there is no JUnit engine +// in this subproject. +// The test source set in this subproject is used for Minecraft game tests, not for JUnit tests. +test.onlyIf { false } diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ClientModInitializer.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ClientModInitializer.java new file mode 100644 index 000000000..08f60497a --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ClientModInitializer.java @@ -0,0 +1,230 @@ +package com.refinedmods.refinedstorage.platform.neoforge; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.api.support.HelpTooltipComponent; +import com.refinedmods.refinedstorage.platform.api.upgrade.AbstractUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.AbstractClientModInitializer; +import com.refinedmods.refinedstorage.platform.common.configurationcard.ConfigurationCardItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.content.KeyMappings; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkCardItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.storagemonitor.StorageMonitorBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.CompositeClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.HelpClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.support.tooltip.ResourceClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.upgrade.UpgradeDestinationClientTooltipComponent; +import com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive.DiskDriveBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive.DiskDriveGeometryLoader; +import com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface.DiskInterfaceBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface.DiskInterfaceGeometryLoader; +import com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid.PortableGridBlockEntityRendererImpl; +import com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid.PortableGridGeometryLoader; + +import java.util.List; + +import com.mojang.blaze3d.platform.InputConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.MenuAccess; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; +import net.minecraft.client.renderer.item.ItemProperties; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.MenuType; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.neoforge.client.event.InputEvent; +import net.neoforged.neoforge.client.event.ModelEvent; +import net.neoforged.neoforge.client.event.RegisterClientTooltipComponentFactoriesEvent; +import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent; +import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; +import net.neoforged.neoforge.client.settings.KeyConflictContext; +import net.neoforged.neoforge.client.settings.KeyModifier; +import net.neoforged.neoforge.common.NeoForge; +import org.lwjgl.glfw.GLFW; + +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.DISK_DRIVE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PORTABLE_GRID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslationKey; + +public final class ClientModInitializer extends AbstractClientModInitializer { + private ClientModInitializer() { + } + + @SubscribeEvent + public static void onClientSetup(final FMLClientSetupEvent e) { + NeoForge.EVENT_BUS.addListener(ClientModInitializer::onKeyInput); + e.enqueueWork(ClientModInitializer::registerModelPredicates); + e.enqueueWork(ClientModInitializer::registerItemProperties); + registerBlockEntityRenderer(); + registerResourceRendering(); + registerAlternativeGridHints(); + registerDiskModels(); + } + + @SubscribeEvent + public static void onKeyInput(final InputEvent.Key e) { + handleInputEvents(); + } + + private static void registerModelPredicates() { + Items.INSTANCE.getControllers().forEach(controllerBlockItem -> ItemProperties.register( + controllerBlockItem.get(), + createIdentifier("stored_in_controller"), + new ControllerItemPropertyFunction() + )); + } + + @SubscribeEvent + public static void onRegisterModelGeometry(final ModelEvent.RegisterGeometryLoaders e) { + registerDiskModels(); + e.register(DISK_DRIVE, new DiskDriveGeometryLoader()); + e.register(PORTABLE_GRID, new PortableGridGeometryLoader()); + Blocks.INSTANCE.getDiskInterface().forEach( + (color, id, supplier) -> e.register(id, new DiskInterfaceGeometryLoader(color)) + ); + } + + @SubscribeEvent + public static void onRegisterMenuScreens(final RegisterMenuScreensEvent e) { + registerScreens(new ScreenRegistration() { + @Override + public > void register( + final MenuType type, + final ScreenConstructor factory + ) { + e.register(type, factory::create); + } + }); + } + + @SubscribeEvent + public static void onRegisterKeyMappings(final RegisterKeyMappingsEvent e) { + final KeyMapping focusSearchBarKeyBinding = new KeyMapping( + createTranslationKey("key", "focus_search_bar"), + InputConstants.Type.KEYSYM, + GLFW.GLFW_KEY_TAB, + ContentNames.MOD_TRANSLATION_KEY + ); + e.register(focusSearchBarKeyBinding); + KeyMappings.INSTANCE.setFocusSearchBar(focusSearchBarKeyBinding); + + final KeyMapping clearCraftingGridMatrixToNetwork = new KeyMapping( + createTranslationKey("key", "clear_crafting_grid_matrix_to_network"), + KeyConflictContext.GUI, + KeyModifier.CONTROL, + InputConstants.Type.KEYSYM, + GLFW.GLFW_KEY_X, + ContentNames.MOD_TRANSLATION_KEY + ); + e.register(clearCraftingGridMatrixToNetwork); + KeyMappings.INSTANCE.setClearCraftingGridMatrixToNetwork(clearCraftingGridMatrixToNetwork); + + final KeyMapping clearCraftingGridMatrixToInventory = new KeyMapping( + createTranslationKey("key", "clear_crafting_grid_matrix_to_inventory"), + InputConstants.UNKNOWN.getValue(), + ContentNames.MOD_TRANSLATION_KEY + ); + e.register(clearCraftingGridMatrixToInventory); + KeyMappings.INSTANCE.setClearCraftingGridMatrixToInventory(clearCraftingGridMatrixToInventory); + + final KeyMapping openWirelessGrid = new KeyMapping( + createTranslationKey("key", "open_wireless_grid"), + KeyConflictContext.IN_GAME, + InputConstants.UNKNOWN, + ContentNames.MOD_TRANSLATION_KEY + ); + e.register(openWirelessGrid); + KeyMappings.INSTANCE.setOpenWirelessGrid(openWirelessGrid); + } + + private static void registerBlockEntityRenderer() { + BlockEntityRenderers.register( + BlockEntities.INSTANCE.getDiskDrive(), + ctx -> new DiskDriveBlockEntityRendererImpl<>() + ); + BlockEntityRenderers.register( + BlockEntities.INSTANCE.getStorageMonitor(), + ctx -> new StorageMonitorBlockEntityRenderer() + ); + BlockEntityRenderers.register( + BlockEntities.INSTANCE.getPortableGrid(), + ctx -> new PortableGridBlockEntityRendererImpl<>() + ); + BlockEntityRenderers.register( + BlockEntities.INSTANCE.getCreativePortableGrid(), + ctx -> new PortableGridBlockEntityRendererImpl<>() + ); + BlockEntityRenderers.register( + BlockEntities.INSTANCE.getDiskInterface(), + ctx -> new DiskInterfaceBlockEntityRendererImpl<>() + ); + } + + @SubscribeEvent + public static void onRegisterTooltipFactories(final RegisterClientTooltipComponentFactoriesEvent e) { + e.register( + AbstractUpgradeItem.UpgradeDestinationTooltipComponent.class, + component -> new UpgradeDestinationClientTooltipComponent(component.destinations()) + ); + e.register( + HelpTooltipComponent.class, + component -> HelpClientTooltipComponent.create(component.text()) + ); + e.register( + RegulatorUpgradeItem.RegulatorTooltipComponent.class, + component -> { + final ClientTooltipComponent help = HelpClientTooltipComponent.create(component.helpText()); + return component.configuredResource() == null + ? help + : createRegulatorUpgradeClientTooltipComponent(component.configuredResource(), help); + } + ); + } + + private static CompositeClientTooltipComponent createRegulatorUpgradeClientTooltipComponent( + final ResourceAmount configuredResource, + final ClientTooltipComponent help + ) { + return new CompositeClientTooltipComponent(List.of( + new ResourceClientTooltipComponent(configuredResource), + help + )); + } + + private static void registerItemProperties() { + ItemProperties.register( + Items.INSTANCE.getWirelessGrid(), + NetworkBoundItemItemPropertyFunction.NAME, + new NetworkBoundItemItemPropertyFunction() + ); + ItemProperties.register( + Items.INSTANCE.getCreativeWirelessGrid(), + NetworkBoundItemItemPropertyFunction.NAME, + new NetworkBoundItemItemPropertyFunction() + ); + ItemProperties.register( + Items.INSTANCE.getConfigurationCard(), + ConfigurationCardItemPropertyFunction.NAME, + new ConfigurationCardItemPropertyFunction() + ); + ItemProperties.register( + Items.INSTANCE.getNetworkCard(), + NetworkCardItemPropertyFunction.NAME, + new NetworkCardItemPropertyFunction() + ); + ItemProperties.register( + Items.INSTANCE.getSecurityCard(), + SecurityCardItemPropertyFunction.NAME, + new SecurityCardItemPropertyFunction() + ); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java new file mode 100644 index 000000000..e8f4bbe5a --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ConfigImpl.java @@ -0,0 +1,873 @@ +package com.refinedmods.refinedstorage.platform.neoforge; + +import com.refinedmods.refinedstorage.api.grid.view.GridSortingDirection; +import com.refinedmods.refinedstorage.platform.common.Config; +import com.refinedmods.refinedstorage.platform.common.content.DefaultEnergyUsage; +import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridMatrixCloseBehavior; +import com.refinedmods.refinedstorage.platform.common.grid.GridSortingTypes; +import com.refinedmods.refinedstorage.platform.common.support.stretching.ScreenSize; + +import java.util.Optional; + +import net.minecraft.resources.ResourceLocation; +import net.neoforged.neoforge.common.ModConfigSpec; + +public class ConfigImpl implements Config { + private static final String ENERGY_USAGE = "energyUsage"; + private static final String ENERGY_CAPACITY = "energyCapacity"; + + private final ModConfigSpec.Builder builder = new ModConfigSpec.Builder(); + private final ModConfigSpec spec; + + private final ModConfigSpec.EnumValue screenSize; + private final ModConfigSpec.BooleanValue smoothScrolling; + private final ModConfigSpec.IntValue maxRowsStretch; + private final SimpleEnergyUsageEntry cable; + private final ControllerEntry controller; + private final DiskDriveEntry diskDrive; + private final DiskInterfaceEntry diskInterface; + private final GridEntry grid; + private final CraftingGridEntry craftingGrid; + private final StorageBlockEntry storageBlock; + private final FluidStorageBlockEntry fluidStorageBlock; + private final SimpleEnergyUsageEntry importer; + private final SimpleEnergyUsageEntry exporter; + private final UpgradeEntry upgrade; + private final SimpleEnergyUsageEntry iface; + private final SimpleEnergyUsageEntry externalStorage; + private final SimpleEnergyUsageEntry detector; + private final SimpleEnergyUsageEntry destructor; + private final SimpleEnergyUsageEntry constructor; + private final WirelessGridEntry wirelessGrid; + private final WirelessTransmitterEntry wirelessTransmitter; + private final SimpleEnergyUsageEntry storageMonitor; + private final SimpleEnergyUsageEntry networkReceiver; + private final SimpleEnergyUsageEntry networkTransmitter; + private final PortableGridEntry portableGrid; + private final SimpleEnergyUsageEntry securityCard; + private final SimpleEnergyUsageEntry fallbackSecurityCard; + private final SimpleEnergyUsageEntry securityManager; + private final RelayEntry relay; + + public ConfigImpl() { + screenSize = builder + .comment("The screen size") + .defineEnum("screenSize", ScreenSize.STRETCH); + smoothScrolling = builder + .comment("Whether scrollbars should use smooth scrolling") + .define("smoothScrolling", true); + maxRowsStretch = builder + .comment("The maximum amount of rows that can be displayed when the screen size is stretched") + .defineInRange("maxRowsStretch", 256, 3, 256); + cable = new SimpleEnergyUsageEntryImpl("cable", "Cable", DefaultEnergyUsage.CABLE); + controller = new ControllerEntryImpl(); + diskDrive = new DiskDriveEntryImpl(); + diskInterface = new DiskInterfaceEntryImpl(); + grid = new GridEntryImpl(); + craftingGrid = new CraftingGridEntryImpl(); + storageBlock = new StorageBlockEntryImpl(); + fluidStorageBlock = new FluidStorageBlockEntryImpl(); + importer = new SimpleEnergyUsageEntryImpl("importer", "Importer", DefaultEnergyUsage.IMPORTER); + exporter = new SimpleEnergyUsageEntryImpl("exporter", "Exporter", DefaultEnergyUsage.EXPORTER); + upgrade = new UpgradeEntryImpl(); + iface = new SimpleEnergyUsageEntryImpl("interface", "Interface", DefaultEnergyUsage.INTERFACE); + externalStorage = new SimpleEnergyUsageEntryImpl( + "externalStorage", + "External Storage", + DefaultEnergyUsage.EXTERNAL_STORAGE + ); + detector = new SimpleEnergyUsageEntryImpl("detector", "Detector", DefaultEnergyUsage.DETECTOR); + destructor = new SimpleEnergyUsageEntryImpl("destructor", "Destructor", DefaultEnergyUsage.DESTRUCTOR); + constructor = new SimpleEnergyUsageEntryImpl("constructor", "Constructor", DefaultEnergyUsage.CONSTRUCTOR); + wirelessGrid = new WirelessGridEntryImpl(); + wirelessTransmitter = new WirelessTransmitterEntryImpl(); + storageMonitor = new SimpleEnergyUsageEntryImpl( + "storageMonitor", + "Storage Monitor", + DefaultEnergyUsage.STORAGE_MONITOR + ); + networkReceiver = new SimpleEnergyUsageEntryImpl( + "networkReceiver", + "Network Receiver", + DefaultEnergyUsage.NETWORK_RECEIVER + ); + networkTransmitter = new SimpleEnergyUsageEntryImpl( + "networkTransmitter", + "Network Transmitter", + DefaultEnergyUsage.NETWORK_TRANSMITTER + ); + portableGrid = new PortableGridEntryImpl(); + securityCard = new SimpleEnergyUsageEntryImpl( + "securityCard", + "Security Card", + DefaultEnergyUsage.SECURITY_CARD + ); + fallbackSecurityCard = new SimpleEnergyUsageEntryImpl( + "fallbackSecurityCard", + "Fallback Security Card", + DefaultEnergyUsage.FALLBACK_SECURITY_CARD + ); + securityManager = new SimpleEnergyUsageEntryImpl( + "securityManager", + "Security Manager", + DefaultEnergyUsage.SECURITY_MANAGER + ); + relay = new RelayEntryImpl(); + spec = builder.build(); + } + + public ModConfigSpec getSpec() { + return spec; + } + + @Override + public ScreenSize getScreenSize() { + return screenSize.get(); + } + + @Override + public boolean isSmoothScrolling() { + return smoothScrolling.get(); + } + + @Override + public int getMaxRowsStretch() { + return maxRowsStretch.get(); + } + + @Override + public void setScreenSize(final ScreenSize screenSize) { + this.screenSize.set(screenSize); + } + + @Override + public GridEntry getGrid() { + return grid; + } + + @Override + public CraftingGridEntry getCraftingGrid() { + return craftingGrid; + } + + @Override + public ControllerEntry getController() { + return controller; + } + + @Override + public DiskDriveEntry getDiskDrive() { + return diskDrive; + } + + @Override + public DiskInterfaceEntry getDiskInterface() { + return diskInterface; + } + + @Override + public SimpleEnergyUsageEntry getCable() { + return cable; + } + + @Override + public StorageBlockEntry getStorageBlock() { + return storageBlock; + } + + @Override + public FluidStorageBlockEntry getFluidStorageBlock() { + return fluidStorageBlock; + } + + @Override + public SimpleEnergyUsageEntry getImporter() { + return importer; + } + + @Override + public SimpleEnergyUsageEntry getExporter() { + return exporter; + } + + @Override + public UpgradeEntry getUpgrade() { + return upgrade; + } + + @Override + public SimpleEnergyUsageEntry getInterface() { + return iface; + } + + @Override + public SimpleEnergyUsageEntry getExternalStorage() { + return externalStorage; + } + + @Override + public SimpleEnergyUsageEntry getDetector() { + return detector; + } + + @Override + public SimpleEnergyUsageEntry getDestructor() { + return destructor; + } + + @Override + public SimpleEnergyUsageEntry getConstructor() { + return constructor; + } + + @Override + public WirelessGridEntry getWirelessGrid() { + return wirelessGrid; + } + + @Override + public WirelessTransmitterEntry getWirelessTransmitter() { + return wirelessTransmitter; + } + + @Override + public SimpleEnergyUsageEntry getStorageMonitor() { + return storageMonitor; + } + + @Override + public SimpleEnergyUsageEntry getNetworkReceiver() { + return networkReceiver; + } + + @Override + public SimpleEnergyUsageEntry getNetworkTransmitter() { + return networkTransmitter; + } + + @Override + public PortableGridEntry getPortableGrid() { + return portableGrid; + } + + @Override + public SimpleEnergyUsageEntry getSecurityCard() { + return securityCard; + } + + @Override + public SimpleEnergyUsageEntry getFallbackSecurityCard() { + return fallbackSecurityCard; + } + + @Override + public SimpleEnergyUsageEntry getSecurityManager() { + return securityManager; + } + + @Override + public RelayEntry getRelay() { + return relay; + } + + private class SimpleEnergyUsageEntryImpl implements SimpleEnergyUsageEntry { + private final ModConfigSpec.LongValue energyUsage; + + SimpleEnergyUsageEntryImpl(final String path, final String readableName, final long defaultValue) { + builder.push(path); + energyUsage = builder + .comment("The energy used by the " + readableName) + .defineInRange(ENERGY_USAGE, defaultValue, 0, Long.MAX_VALUE); + builder.pop(); + } + + @Override + public long getEnergyUsage() { + return energyUsage.get(); + } + } + + private class ControllerEntryImpl implements ControllerEntry { + private final ModConfigSpec.LongValue energyCapacity; + + private ControllerEntryImpl() { + builder.push("controller"); + energyCapacity = builder.comment("The energy capacity of the Controller") + .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.CONTROLLER_CAPACITY, 0, Long.MAX_VALUE); + builder.pop(); + } + + @Override + public long getEnergyCapacity() { + return energyCapacity.get(); + } + } + + private class DiskDriveEntryImpl implements DiskDriveEntry { + private final ModConfigSpec.LongValue energyUsage; + private final ModConfigSpec.LongValue energyUsagePerDisk; + + private DiskDriveEntryImpl() { + builder.push("diskDrive"); + energyUsage = builder.comment("The energy used by the Disk Drive") + .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.DISK_DRIVE, 0, Long.MAX_VALUE); + energyUsagePerDisk = builder.comment("The energy used per disk") + .defineInRange("energyUsagePerDisk", DefaultEnergyUsage.DISK_DRIVE_PER_DISK, 0, Long.MAX_VALUE); + builder.pop(); + } + + @Override + public long getEnergyUsage() { + return energyUsage.get(); + } + + @Override + public long getEnergyUsagePerDisk() { + return energyUsagePerDisk.get(); + } + } + + private class DiskInterfaceEntryImpl implements DiskInterfaceEntry { + private final ModConfigSpec.LongValue energyUsage; + private final ModConfigSpec.LongValue energyUsagePerDisk; + + private DiskInterfaceEntryImpl() { + builder.push("diskInterface"); + energyUsage = builder.comment("The energy used by the Disk Interface") + .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.DISK_INTERFACE, 0, Long.MAX_VALUE); + energyUsagePerDisk = builder.comment("The energy used per disk") + .defineInRange("energyUsagePerDisk", DefaultEnergyUsage.DISK_INTERFACE_PER_DISK, 0, Long.MAX_VALUE); + builder.pop(); + } + + @Override + public long getEnergyUsage() { + return energyUsage.get(); + } + + @Override + public long getEnergyUsagePerDisk() { + return energyUsagePerDisk.get(); + } + } + + private class GridEntryImpl implements GridEntry { + private final ModConfigSpec.BooleanValue largeFont; + private final ModConfigSpec.BooleanValue preventSortingWhileShiftIsDown; + private final ModConfigSpec.BooleanValue detailedTooltip; + private final ModConfigSpec.BooleanValue rememberSearchQuery; + private final ModConfigSpec.LongValue energyUsage; + private final ModConfigSpec.BooleanValue autoSelected; + private final ModConfigSpec.ConfigValue synchronizer; + private final ModConfigSpec.ConfigValue resourceType; + private final ModConfigSpec.EnumValue sortingDirection; + private final ModConfigSpec.EnumValue sortingType; + + GridEntryImpl() { + builder.push("grid"); + largeFont = builder + .comment("Whether the Grid should use a large font for quantities") + .define("largeFont", false); + preventSortingWhileShiftIsDown = builder + .comment("Whether the Grid should avoid sorting when shift is held down") + .define("preventSortingWhileShiftIsDown", true); + detailedTooltip = builder + .comment("Whether the Grid should show a detailed tooltip") + .define("detailedTooltip", true); + rememberSearchQuery = builder + .comment("Whether the search query should persist when closing and re-opening the Grid") + .define("rememberSearchQuery", false); + energyUsage = builder + .comment("The energy used by the Grid") + .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.GRID, 0, Long.MAX_VALUE); + autoSelected = builder + .comment("Whether the Grid search box is auto selected") + .define("autoSelected", false); + synchronizer = builder + .comment("The synchronization type of the Grid search box") + .define("synchronizer", ""); + resourceType = builder + .comment("The resource type to be shown") + .define("resourceType", ""); + sortingDirection = builder + .comment("The sorting direction") + .defineEnum("sortingDirection", GridSortingDirection.ASCENDING); + sortingType = builder + .comment("The sorting type") + .defineEnum("sortingType", GridSortingTypes.QUANTITY); + builder.pop(); + } + + @Override + public boolean isLargeFont() { + return largeFont.get(); + } + + @Override + public boolean isPreventSortingWhileShiftIsDown() { + return preventSortingWhileShiftIsDown.get(); + } + + @Override + public boolean isDetailedTooltip() { + return detailedTooltip.get(); + } + + @Override + public boolean isRememberSearchQuery() { + return rememberSearchQuery.get(); + } + + @Override + public long getEnergyUsage() { + return energyUsage.get(); + } + + @Override + public boolean isAutoSelected() { + return autoSelected.get(); + } + + @Override + public void setAutoSelected(final boolean autoSelected) { + this.autoSelected.set(autoSelected); + } + + @Override + public Optional getSynchronizer() { + if (synchronizer == null || synchronizer.get().trim().isBlank()) { + return Optional.empty(); + } + return Optional.of(synchronizer.get()).map(ResourceLocation::tryParse); + } + + @Override + public void setSynchronizer(final ResourceLocation synchronizerId) { + this.synchronizer.set(synchronizerId.toString()); + } + + @Override + public void clearSynchronizer() { + this.synchronizer.set(""); + } + + @Override + public GridSortingDirection getSortingDirection() { + return sortingDirection.get(); + } + + @Override + public void setSortingDirection(final GridSortingDirection sortingDirection) { + this.sortingDirection.set(sortingDirection); + } + + @Override + public GridSortingTypes getSortingType() { + return sortingType.get(); + } + + @Override + public void setSortingType(final GridSortingTypes sortingType) { + this.sortingType.set(sortingType); + } + + @Override + public Optional getResourceTypeId() { + if (resourceType == null || resourceType.get().trim().isBlank()) { + return Optional.empty(); + } + return Optional.of(resourceType.get()).map(ResourceLocation::tryParse); + } + + @Override + public void setResourceTypeId(final ResourceLocation resourceTypeId) { + this.resourceType.set(resourceTypeId.toString()); + } + + @Override + public void clearResourceType() { + this.resourceType.set(""); + } + } + + private class CraftingGridEntryImpl implements CraftingGridEntry { + private final ModConfigSpec.LongValue energyUsage; + private final ModConfigSpec.EnumValue craftingMatrixCloseBehavior; + + CraftingGridEntryImpl() { + builder.push("craftingGrid"); + energyUsage = builder + .comment("The energy used by the Crafting Grid") + .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.CRAFTING_GRID, 0, Long.MAX_VALUE); + craftingMatrixCloseBehavior = builder + .comment("What should happen to the crafting matrix slots when closing the Crafting Grid") + .defineEnum("craftingMatrixCloseBehavior", CraftingGridMatrixCloseBehavior.NONE); + builder.pop(); + } + + @Override + public long getEnergyUsage() { + return energyUsage.get(); + } + + @Override + public CraftingGridMatrixCloseBehavior getCraftingMatrixCloseBehavior() { + return craftingMatrixCloseBehavior.get(); + } + } + + private class StorageBlockEntryImpl implements StorageBlockEntry { + private final ModConfigSpec.LongValue oneKEnergyUsage; + private final ModConfigSpec.LongValue fourKEnergyUsage; + private final ModConfigSpec.LongValue sixteenKEnergyUsage; + private final ModConfigSpec.LongValue sixtyFourKEnergyUsage; + private final ModConfigSpec.LongValue creativeUsage; + + StorageBlockEntryImpl() { + builder.push("storageBlock"); + oneKEnergyUsage = builder + .comment("The energy used by the 1K Storage Block") + .defineInRange("1kEnergyUsage", DefaultEnergyUsage.ONE_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); + fourKEnergyUsage = builder + .comment("The energy used by the 4K Storage Block") + .defineInRange("4kEnergyUsage", DefaultEnergyUsage.FOUR_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); + sixteenKEnergyUsage = builder + .comment("The energy used by the 16K Storage Block") + .defineInRange("16kEnergyUsage", DefaultEnergyUsage.SIXTEEN_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); + sixtyFourKEnergyUsage = builder + .comment("The energy used by the 64K Storage Block") + .defineInRange("64kEnergyUsage", DefaultEnergyUsage.SIXTY_FOUR_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); + creativeUsage = builder + .comment("The energy used by the Creative Storage Block") + .defineInRange("creativeEnergyUsage", DefaultEnergyUsage.CREATIVE_STORAGE_BLOCK, 0, Long.MAX_VALUE); + builder.pop(); + } + + @Override + public long get1kEnergyUsage() { + return oneKEnergyUsage.get(); + } + + @Override + public long get4kEnergyUsage() { + return fourKEnergyUsage.get(); + } + + @Override + public long get16kEnergyUsage() { + return sixteenKEnergyUsage.get(); + } + + @Override + public long get64kEnergyUsage() { + return sixtyFourKEnergyUsage.get(); + } + + @Override + public long getCreativeEnergyUsage() { + return creativeUsage.get(); + } + } + + private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { + private final ModConfigSpec.LongValue sixtyFourBEnergyUsage; + private final ModConfigSpec.LongValue twoHundredFiftySixBEnergyUsage; + private final ModConfigSpec.LongValue thousandTwentyFourBEnergyUsage; + private final ModConfigSpec.LongValue fourThousandNinetySixBEnergyUsage; + private final ModConfigSpec.LongValue creativeUsage; + + FluidStorageBlockEntryImpl() { + builder.push("fluidStorageBlock"); + sixtyFourBEnergyUsage = builder + .comment("The energy used by the 64B Fluid Storage Block") + .defineInRange( + "64bEnergyUsage", + DefaultEnergyUsage.SIXTY_FOUR_B_FLUID_STORAGE_BLOCK, + 0, + Long.MAX_VALUE + ); + twoHundredFiftySixBEnergyUsage = builder + .comment("The energy used by the 256B Fluid Storage Block") + .defineInRange( + "256bEnergyUsage", + DefaultEnergyUsage.TWO_HUNDRED_FIFTY_SIX_B_FLUID_STORAGE_BLOCK, + 0, + Long.MAX_VALUE + ); + thousandTwentyFourBEnergyUsage = builder + .comment("The energy used by the 1024B Fluid Storage Block") + .defineInRange( + "1024bEnergyUsage", + DefaultEnergyUsage.THOUSAND_TWENTY_FOUR_B_FLUID_STORAGE_BLOCK, + 0, + Long.MAX_VALUE + ); + fourThousandNinetySixBEnergyUsage = builder + .comment("The energy used by the 4096B Fluid Storage Block") + .defineInRange( + "4096bEnergyUsage", + DefaultEnergyUsage.FOUR_THOUSAND_NINETY_SIX_B_FLUID_STORAGE_BLOCK, + 0, + Long.MAX_VALUE + ); + creativeUsage = builder + .comment("The energy used by the Creative Fluid Storage Block") + .defineInRange( + "creativeEnergyUsage", + DefaultEnergyUsage.CREATIVE_FLUID_STORAGE_BLOCK, + 0, + Long.MAX_VALUE + ); + builder.pop(); + } + + @Override + public long get64bEnergyUsage() { + return sixtyFourBEnergyUsage.get(); + } + + @Override + public long get256bEnergyUsage() { + return twoHundredFiftySixBEnergyUsage.get(); + } + + @Override + public long get1024bEnergyUsage() { + return thousandTwentyFourBEnergyUsage.get(); + } + + @Override + public long get4096bEnergyUsage() { + return fourThousandNinetySixBEnergyUsage.get(); + } + + @Override + public long getCreativeEnergyUsage() { + return creativeUsage.get(); + } + } + + private class UpgradeEntryImpl implements UpgradeEntry { + private final ModConfigSpec.LongValue speedUpgradeEnergyUsage; + private final ModConfigSpec.LongValue stackUpgradeEnergyUsage; + private final ModConfigSpec.LongValue fortune1UpgradeEnergyUsage; + private final ModConfigSpec.LongValue fortune2UpgradeEnergyUsage; + private final ModConfigSpec.LongValue fortune3UpgradeEnergyUsage; + private final ModConfigSpec.LongValue silkTouchUpgradeEnergyUsage; + private final ModConfigSpec.LongValue regulatorUpgradeEnergyUsage; + private final ModConfigSpec.LongValue rangeUpgradeEnergyUsage; + private final ModConfigSpec.LongValue creativeRangeUpgradeEnergyUsage; + private final ModConfigSpec.IntValue rangeUpgradeRange; + + UpgradeEntryImpl() { + builder.push("upgrade"); + speedUpgradeEnergyUsage = builder + .comment("The additional energy used per Speed Upgrade") + .defineInRange("speedUpgradeEnergyUsage", DefaultEnergyUsage.SPEED_UPGRADE, 0, Long.MAX_VALUE); + stackUpgradeEnergyUsage = builder + .comment("The additional energy used by the Stack Upgrade") + .defineInRange("stackUpgradeEnergyUsage", DefaultEnergyUsage.STACK_UPGRADE, 0, Long.MAX_VALUE); + fortune1UpgradeEnergyUsage = builder + .comment("The additional energy used by the Fortune 1 Upgrade") + .defineInRange("fortune1UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_1_UPGRADE, 0, Long.MAX_VALUE); + fortune2UpgradeEnergyUsage = builder + .comment("The additional energy used by the Fortune 2 Upgrade") + .defineInRange("fortune2UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_2_UPGRADE, 0, Long.MAX_VALUE); + fortune3UpgradeEnergyUsage = builder + .comment("The additional energy used by the Fortune 3 Upgrade") + .defineInRange("fortune3UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_3_UPGRADE, 0, Long.MAX_VALUE); + silkTouchUpgradeEnergyUsage = builder + .comment("The additional energy used by the Silk Touch Upgrade") + .defineInRange("silkTouchUpgradeEnergyUsage", DefaultEnergyUsage.SILK_TOUCH_UPGRADE, 0, Long.MAX_VALUE); + regulatorUpgradeEnergyUsage = builder + .comment("The additional energy used by the Regulator Upgrade") + .defineInRange("regulatorUpgradeEnergyUsage", DefaultEnergyUsage.REGULATOR_UPGRADE, 0, Long.MAX_VALUE); + rangeUpgradeEnergyUsage = builder + .comment("The additional energy used by the Range Upgrade") + .defineInRange("rangeUpgradeEnergyUsage", DefaultEnergyUsage.RANGE_UPGRADE, 0, Long.MAX_VALUE); + creativeRangeUpgradeEnergyUsage = builder + .comment("The additional energy used by the Creative Range Upgrade") + .defineInRange( + "creativeRangeUpgradeEnergyUsage", + DefaultEnergyUsage.CREATIVE_RANGE_UPGRADE, + 0, + Long.MAX_VALUE + ); + rangeUpgradeRange = builder + .comment("The additional range by the Range Upgrade") + .defineInRange("rangeUpgradeRange", DefaultEnergyUsage.RANGE_UPGRADE_RANGE, 0, Integer.MAX_VALUE); + builder.pop(); + } + + @Override + public long getSpeedUpgradeEnergyUsage() { + return speedUpgradeEnergyUsage.get(); + } + + @Override + public long getStackUpgradeEnergyUsage() { + return stackUpgradeEnergyUsage.get(); + } + + @Override + public long getFortune1UpgradeEnergyUsage() { + return fortune1UpgradeEnergyUsage.get(); + } + + @Override + public long getFortune2UpgradeEnergyUsage() { + return fortune2UpgradeEnergyUsage.get(); + } + + @Override + public long getFortune3UpgradeEnergyUsage() { + return fortune3UpgradeEnergyUsage.get(); + } + + @Override + public long getSilkTouchUpgradeEnergyUsage() { + return silkTouchUpgradeEnergyUsage.get(); + } + + @Override + public long getRegulatorUpgradeEnergyUsage() { + return regulatorUpgradeEnergyUsage.get(); + } + + @Override + public long getRangeUpgradeEnergyUsage() { + return rangeUpgradeEnergyUsage.get(); + } + + @Override + public long getCreativeRangeUpgradeEnergyUsage() { + return creativeRangeUpgradeEnergyUsage.get(); + } + + @Override + public int getRangeUpgradeRange() { + return rangeUpgradeRange.get(); + } + } + + private class WirelessGridEntryImpl implements WirelessGridEntry { + private final ModConfigSpec.LongValue energyCapacity; + private final ModConfigSpec.LongValue openEnergyUsage; + private final ModConfigSpec.LongValue extractEnergyUsage; + private final ModConfigSpec.LongValue insertEnergyUsage; + + WirelessGridEntryImpl() { + builder.push("wirelessGrid"); + energyCapacity = builder.comment("The energy capacity of the Wireless Grid") + .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.WIRELESS_GRID_CAPACITY, 0, Long.MAX_VALUE); + openEnergyUsage = builder.comment("The energy used by the Wireless Grid to open") + .defineInRange("openEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_OPEN, 0, Long.MAX_VALUE); + extractEnergyUsage = builder.comment("The energy used by the Wireless Grid to extract resources") + .defineInRange("extractEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_EXTRACT, 0, Long.MAX_VALUE); + insertEnergyUsage = builder.comment("The energy used by the Wireless Grid to insert resources") + .defineInRange("insertEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_INSERT, 0, Long.MAX_VALUE); + builder.pop(); + } + + public long getEnergyCapacity() { + return energyCapacity.get(); + } + + public long getOpenEnergyUsage() { + return openEnergyUsage.get(); + } + + public long getExtractEnergyUsage() { + return extractEnergyUsage.get(); + } + + public long getInsertEnergyUsage() { + return insertEnergyUsage.get(); + } + } + + private class WirelessTransmitterEntryImpl implements WirelessTransmitterEntry { + private final ModConfigSpec.LongValue energyUsage; + private final ModConfigSpec.IntValue baseRange; + + WirelessTransmitterEntryImpl() { + builder.push("wirelessTransmitter"); + + energyUsage = builder.comment("The energy used by the Wireless Transmitter") + .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.WIRELESS_TRANSMITTER, 0, Long.MAX_VALUE); + baseRange = builder.comment("The base range of the Wireless Transmitter") + .defineInRange("baseRange", DefaultEnergyUsage.WIRELESS_TRANSMITTER_BASE_RANGE, 0, Integer.MAX_VALUE); + + builder.pop(); + } + + public long getEnergyUsage() { + return energyUsage.get(); + } + + public int getBaseRange() { + return baseRange.get(); + } + } + + private class PortableGridEntryImpl implements PortableGridEntry { + private final ModConfigSpec.LongValue energyCapacity; + private final ModConfigSpec.LongValue openEnergyUsage; + private final ModConfigSpec.LongValue extractEnergyUsage; + private final ModConfigSpec.LongValue insertEnergyUsage; + + PortableGridEntryImpl() { + builder.push("portableGrid"); + energyCapacity = builder.comment("The energy capacity of the Portable Grid") + .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.PORTABLE_GRID_CAPACITY, 0, Long.MAX_VALUE); + openEnergyUsage = builder.comment("The energy used by the Portable Grid to open") + .defineInRange("openEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_OPEN, 0, Long.MAX_VALUE); + extractEnergyUsage = builder.comment("The energy used by the Portable Grid to extract resources") + .defineInRange("extractEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_EXTRACT, 0, Long.MAX_VALUE); + insertEnergyUsage = builder.comment("The energy used by the Portable Grid to insert resources") + .defineInRange("insertEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_INSERT, 0, Long.MAX_VALUE); + builder.pop(); + } + + public long getEnergyCapacity() { + return energyCapacity.get(); + } + + public long getOpenEnergyUsage() { + return openEnergyUsage.get(); + } + + public long getExtractEnergyUsage() { + return extractEnergyUsage.get(); + } + + public long getInsertEnergyUsage() { + return insertEnergyUsage.get(); + } + } + + private class RelayEntryImpl implements RelayEntry { + private final ModConfigSpec.LongValue inputNetworkEnergyUsage; + private final ModConfigSpec.LongValue outputNetworkEnergyUsage; + + RelayEntryImpl() { + builder.push("relay"); + inputNetworkEnergyUsage = builder.comment("The energy used by the Relay in the input network") + .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.RELAY_INPUT_NETWORK, 8, Long.MAX_VALUE); + outputNetworkEnergyUsage = builder.comment( + "The energy used by the Relay in the output network (if not in pass through mode)" + ).defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.RELAY_OUTPUT_NETWORK, 8, Long.MAX_VALUE); + builder.pop(); + } + + @Override + public long getInputNetworkEnergyUsage() { + return inputNetworkEnergyUsage.get(); + } + + @Override + public long getOutputNetworkEnergyUsage() { + return outputNetworkEnergyUsage.get(); + } + } +} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java similarity index 77% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java index af7c0c18f..8abc754b3 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ModInitializer.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java @@ -1,70 +1,70 @@ -package com.refinedmods.refinedstorage2.platform.forge; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.network.NetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.AbstractModInitializer; -import com.refinedmods.refinedstorage2.platform.common.PlatformProxy; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntityTypeFactory; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.content.CreativeModeTabItems; -import com.refinedmods.refinedstorage2.platform.common.content.DirectRegistryCallback; -import com.refinedmods.refinedstorage2.platform.common.content.ExtendedMenuTypeFactory; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.content.MenuTypeFactory; -import com.refinedmods.refinedstorage2.platform.common.content.RegistryCallback; -import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridItem; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfacePlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.common.security.FallbackSecurityCardItem; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardItem; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseBlock; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketHandler; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.CraftingGridClearPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.CraftingGridRecipeTransferPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridExtractPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridInsertPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.GridScrollPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.PropertyChangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceSlotAmountChangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.ResourceSlotChangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardBoundPlayerPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardPermissionPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SecurityCardResetPermissionPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.SingleAmountChangePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.StorageInfoRequestPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.UseNetworkBoundItemPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.EnergyInfoPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridActivePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridClearPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.GridUpdatePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.NoPermissionPacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.StorageInfoResponsePacket; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; -import com.refinedmods.refinedstorage2.platform.common.util.ServerEventQueue; -import com.refinedmods.refinedstorage2.platform.forge.exporter.FluidHandlerExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.forge.exporter.ItemHandlerExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.forge.grid.strategy.FluidGridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.forge.grid.strategy.FluidGridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.forge.grid.strategy.ItemGridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.forge.grid.strategy.ItemGridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.forge.importer.FluidHandlerImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.forge.importer.ItemHandlerImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.forge.storage.diskdrive.ForgeDiskDriveBlockEntity; -import com.refinedmods.refinedstorage2.platform.forge.storage.diskinterface.ForgeDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.forge.storage.externalstorage.FluidHandlerPlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.forge.storage.externalstorage.ItemHandlerPlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid.ForgePortableGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.forge.support.energy.EnergyStorageAdapter; -import com.refinedmods.refinedstorage2.platform.forge.support.inventory.InsertExtractItemHandler; -import com.refinedmods.refinedstorage2.platform.forge.support.resource.ResourceContainerFluidHandlerAdapter; +package com.refinedmods.refinedstorage.platform.neoforge; + +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.support.network.NetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.AbstractModInitializer; +import com.refinedmods.refinedstorage.platform.common.PlatformProxy; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntities; +import com.refinedmods.refinedstorage.platform.common.content.BlockEntityTypeFactory; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.ContentNames; +import com.refinedmods.refinedstorage.platform.common.content.CreativeModeTabItems; +import com.refinedmods.refinedstorage.platform.common.content.DirectRegistryCallback; +import com.refinedmods.refinedstorage.platform.common.content.ExtendedMenuTypeFactory; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.content.MenuTypeFactory; +import com.refinedmods.refinedstorage.platform.common.content.RegistryCallback; +import com.refinedmods.refinedstorage.platform.common.grid.WirelessGridItem; +import com.refinedmods.refinedstorage.platform.common.iface.InterfacePlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.common.security.FallbackSecurityCardItem; +import com.refinedmods.refinedstorage.platform.common.security.SecurityCardItem; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; +import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseBlock; +import com.refinedmods.refinedstorage.platform.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.CraftingGridClearPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.CraftingGridRecipeTransferPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridExtractPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridInsertPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.GridScrollPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.PropertyChangePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceSlotAmountChangePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.ResourceSlotChangePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardBoundPlayerPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardPermissionPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SecurityCardResetPermissionPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.SingleAmountChangePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.StorageInfoRequestPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.UseNetworkBoundItemPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.EnergyInfoPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridActivePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridClearPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.GridUpdatePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NetworkTransmitterStatusPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.NoPermissionPacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.ResourceSlotUpdatePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.StorageInfoResponsePacket; +import com.refinedmods.refinedstorage.platform.common.support.packet.s2c.WirelessTransmitterRangePacket; +import com.refinedmods.refinedstorage.platform.common.upgrade.RegulatorUpgradeItem; +import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.platform.common.util.ServerEventQueue; +import com.refinedmods.refinedstorage.platform.neoforge.exporter.FluidHandlerExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.neoforge.exporter.ItemHandlerExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.FluidGridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.FluidGridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.ItemGridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.ItemGridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.neoforge.importer.FluidHandlerImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.neoforge.importer.ItemHandlerImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive.ForgeDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface.ForgeDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage.FluidHandlerPlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage.ItemHandlerPlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid.ForgePortableGridBlockEntity; +import com.refinedmods.refinedstorage.platform.neoforge.support.energy.EnergyStorageAdapter; +import com.refinedmods.refinedstorage.platform.neoforge.support.inventory.InsertExtractItemHandler; +import com.refinedmods.refinedstorage.platform.neoforge.support.resource.ResourceContainerFluidHandlerAdapter; import java.util.Arrays; import java.util.HashSet; @@ -113,16 +113,16 @@ import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.RegisterEvent; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CREATIVE_WIRELESS_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PORTABLE_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.REGULATOR_UPGRADE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.SECURITY_CARD; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.WIRELESS_GRID; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.CREATIVE_WIRELESS_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.PORTABLE_GRID; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.REGULATOR_UPGRADE; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.SECURITY_CARD; +import static com.refinedmods.refinedstorage.platform.common.content.ContentIds.WIRELESS_GRID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createTranslation; @Mod(IdentifierUtil.MOD_ID) public class ModInitializer extends AbstractModInitializer { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java new file mode 100644 index 000000000..9fe267ffb --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/PlatformImpl.java @@ -0,0 +1,325 @@ +package com.refinedmods.refinedstorage.platform.neoforge; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.view.GridResourceFactory; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; +import com.refinedmods.refinedstorage.platform.common.AbstractPlatform; +import com.refinedmods.refinedstorage.platform.common.Config; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferManager; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.util.CustomBlockPlaceContext; +import com.refinedmods.refinedstorage.platform.neoforge.grid.strategy.ItemGridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.neoforge.grid.view.ForgeFluidGridResourceFactory; +import com.refinedmods.refinedstorage.platform.neoforge.grid.view.ForgeItemGridResourceFactory; +import com.refinedmods.refinedstorage.platform.neoforge.support.containermenu.ContainerTransferDestination; +import com.refinedmods.refinedstorage.platform.neoforge.support.containermenu.MenuOpenerImpl; +import com.refinedmods.refinedstorage.platform.neoforge.support.energy.EnergyStorageAdapter; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.FluidStackFluidRenderer; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import javax.annotation.Nullable; + +import com.mojang.blaze3d.platform.InputConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.NonNullList; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.Container; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.crafting.CraftingInput; +import net.minecraft.world.item.crafting.CraftingRecipe; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.Vec3; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.config.ModConfig; +import net.neoforged.neoforge.capabilities.Capabilities; +import net.neoforged.neoforge.client.ClientHooks; +import net.neoforged.neoforge.common.CommonHooks; +import net.neoforged.neoforge.common.NeoForge; +import net.neoforged.neoforge.common.util.FakePlayerFactory; +import net.neoforged.neoforge.event.EventHooks; +import net.neoforged.neoforge.event.level.BlockEvent; +import net.neoforged.neoforge.fluids.FluidActionResult; +import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.fluids.FluidUtil; +import net.neoforged.neoforge.fluids.capability.IFluidHandler; +import net.neoforged.neoforge.fluids.capability.templates.FluidTank; +import net.neoforged.neoforge.items.ItemHandlerHelper; +import net.neoforged.neoforge.items.wrapper.InvWrapper; +import net.neoforged.neoforge.network.PacketDistributor; + +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.ofFluidStack; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; + +public final class PlatformImpl extends AbstractPlatform { + private final ConfigImpl config = new ConfigImpl(); + + public PlatformImpl(final ModContainer modContainer) { + super(new MenuOpenerImpl(), new FluidStackFluidRenderer(), ItemGridInsertionStrategy::new); + modContainer.registerConfig(ModConfig.Type.COMMON, config.getSpec()); + } + + @Override + public long getBucketAmount() { + return FluidType.BUCKET_VOLUME; + } + + @Override + public Config getConfig() { + return config; + } + + @Override + public boolean canEditBoxLoseFocus(final EditBox editBox) { + return editBox.canLoseFocus; + } + + @Override + public boolean isKeyDown(final KeyMapping keyMapping) { + return !keyMapping.isUnbound() && InputConstants.isKeyDown( + Minecraft.getInstance().getWindow().getWindow(), + keyMapping.getKey().getValue() + ); + } + + @Override + public GridResourceFactory getItemGridResourceFactory() { + return new ForgeItemGridResourceFactory(); + } + + @Override + public GridResourceFactory getFluidGridResourceFactory() { + return new ForgeFluidGridResourceFactory(); + } + + @Override + public Optional getContainedFluid(final ItemStack stack) { + final FluidTank tank = new FluidTank(Integer.MAX_VALUE); + final FluidActionResult result = FluidUtil.tryEmptyContainer( + stack, + tank, + Integer.MAX_VALUE, + null, + true + ); + if (!result.isSuccess() || tank.isEmpty()) { + return Optional.empty(); + } + final FluidResource fluidResource = ofFluidStack(tank.getFluid()); + return Optional.of(new ContainedFluid( + result.getResult(), + fluidResource, + tank.getFluidAmount() + )); + } + + @Override + public Optional convertToBucket(final FluidResource fluidResource) { + return Optional.ofNullable( + new ItemStack(Items.BUCKET).getCapability(Capabilities.FluidHandler.ITEM) + ).map(dest -> { + dest.fill( + toFluidStack(fluidResource, FluidType.BUCKET_VOLUME), + IFluidHandler.FluidAction.EXECUTE + ); + return dest.getContainer(); + }); + } + + @Override + public TransferManager createTransferManager(final AbstractContainerMenu containerMenu) { + return new TransferManager(containerMenu, ContainerTransferDestination::new); + } + + @Override + public long insertIntoContainer(final Container container, + final ItemResource itemResource, + final long amount, + final Action action) { + final InvWrapper wrapper = new InvWrapper(container); + final ItemStack stack = itemResource.toItemStack(amount); + final ItemStack remainder = ItemHandlerHelper.insertItem(wrapper, stack, action == Action.SIMULATE); + return amount - remainder.getCount(); + } + + @Override + public ItemStack getCloneItemStack(final BlockState state, + final Level level, + final BlockHitResult hitResult, + final Player player) { + return state.getCloneItemStack(hitResult, level, hitResult.getBlockPos(), player); + } + + @Override + @SuppressWarnings("DataFlowIssue") // NeoForge allows null + public NonNullList getRemainingCraftingItems(final Player player, + final CraftingRecipe craftingRecipe, + final CraftingInput input) { + CommonHooks.setCraftingPlayer(player); + final NonNullList remainingItems = craftingRecipe.getRemainingItems(input); + CommonHooks.setCraftingPlayer(null); + return remainingItems; + } + + @Override + public void onItemCrafted(final Player player, final ItemStack craftedStack, final CraftingContainer container) { + EventHooks.firePlayerCraftingEvent(player, craftedStack, container); + } + + @Override + public Player getFakePlayer(final ServerLevel level, @Nullable final UUID playerId) { + return Optional.ofNullable(playerId) + .flatMap(id -> level.getServer().getProfileCache().get(id)) + .map(profile -> FakePlayerFactory.get(level, profile)) + .orElseGet(() -> FakePlayerFactory.getMinecraft(level)); + } + + @Override + public boolean canBreakBlock(final Level level, final BlockPos pos, final BlockState state, final Player player) { + final BlockEvent.BreakEvent e = new BlockEvent.BreakEvent(level, pos, state, player); + return !NeoForge.EVENT_BUS.post(e).isCanceled(); + } + + @Override + public boolean placeBlock( + final Level level, + final BlockPos pos, + final Direction direction, + final Player player, + final ItemStack stack + ) { + final BlockPlaceContext ctx = new CustomBlockPlaceContext( + level, + player, + InteractionHand.MAIN_HAND, + stack, + new BlockHitResult(Vec3.ZERO, direction, pos, false) + ); + final InteractionResult result = CommonHooks.onPlaceItemIntoWorld(ctx); + return result.consumesAction(); + } + + @Override + public boolean placeFluid( + final Level level, + final BlockPos pos, + final Direction direction, + final Player player, + final FluidResource fluidResource + ) { + if (level.getBlockState(pos).getFluidState().isSource()) { + return false; + } + final FluidStack stack = toFluidStack(fluidResource, FluidType.BUCKET_VOLUME); + final FluidTank tank = new FluidTank(FluidType.BUCKET_VOLUME); + tank.fill(stack, IFluidHandler.FluidAction.EXECUTE); + return FluidUtil.tryPlaceFluid( + player, + level, + InteractionHand.MAIN_HAND, + pos, + tank, + toFluidStack(fluidResource, FluidType.BUCKET_VOLUME) + ); + } + + @Override + public ItemStack getBlockAsItemStack(final Block block, + final BlockState state, + final Direction direction, + final LevelReader level, + final BlockPos position, + final Player player) { + return block.getCloneItemStack( + state, + new BlockHitResult(Vec3.ZERO, direction, position, false), + level, + position, + player + ); + } + + @Override + public Optional getBucketPickupSound(final LiquidBlock liquidBlock, final BlockState state) { + return liquidBlock.getPickupSound(state); + } + + @Override + public List processTooltipComponents( + final ItemStack stack, + final GuiGraphics graphics, + final int mouseX, + final Optional imageComponent, + final List components + ) { + return new ArrayList<>(ClientHooks.gatherTooltipComponents( + stack, + components, + imageComponent, + mouseX, + graphics.guiWidth(), + graphics.guiHeight(), + Minecraft.getInstance().font + )); // make modifiable + } + + @Override + public void renderTooltip(final GuiGraphics graphics, + final List components, + final int x, + final int y) { + graphics.renderTooltipInternal( + Minecraft.getInstance().font, + components, + x, + y, + DefaultTooltipPositioner.INSTANCE + ); + } + + @Override + public Optional getEnergyStorage(final ItemStack stack) { + return Optional.ofNullable(stack.getCapability(Capabilities.EnergyStorage.ITEM)) + .filter(EnergyStorageAdapter.class::isInstance) + .map(EnergyStorageAdapter.class::cast) + .map(EnergyStorageAdapter::getEnergyStorage); + } + + @Override + public void sendPacketToServer(final T packet) { + PacketDistributor.sendToServer(packet); + } + + @Override + public void sendPacketToClient(final ServerPlayer player, final T packet) { + PacketDistributor.sendToPlayer(player, packet); + } +} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockModelProviderImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockModelProviderImpl.java similarity index 97% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockModelProviderImpl.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockModelProviderImpl.java index 16314ba54..6c76ba7b6 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockModelProviderImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockModelProviderImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.forge.datagen; +package com.refinedmods.refinedstorage.platform.neoforge.datagen; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -9,8 +9,8 @@ import net.neoforged.neoforge.client.model.generators.CustomLoaderBuilder; import net.neoforged.neoforge.common.data.ExistingFileHelper; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class BlockModelProviderImpl extends BlockModelProvider { private static final String PARTICLE_TEXTURE = "particle"; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockStateProviderImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockStateProviderImpl.java similarity index 92% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockStateProviderImpl.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockStateProviderImpl.java index 4d6098d07..00fd6b027 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/BlockStateProviderImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/BlockStateProviderImpl.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage2.platform.forge.datagen; - -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.AbstractConstructorDestructorBlock; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.controller.AbstractControllerBlock; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerEnergyType; -import com.refinedmods.refinedstorage2.platform.common.detector.DetectorBlock; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverBlock; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterBlock; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.CableBlockSupport; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.HorizontalDirectionType; +package com.refinedmods.refinedstorage.platform.neoforge.datagen; + +import com.refinedmods.refinedstorage.platform.common.constructordestructor.AbstractConstructorDestructorBlock; +import com.refinedmods.refinedstorage.platform.common.content.BlockColorMap; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.controller.AbstractControllerBlock; +import com.refinedmods.refinedstorage.platform.common.controller.ControllerEnergyType; +import com.refinedmods.refinedstorage.platform.common.detector.DetectorBlock; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlock; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlock; +import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.CableBlockSupport; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.DefaultDirectionType; +import com.refinedmods.refinedstorage.platform.common.support.direction.HorizontalDirectionType; import java.util.EnumMap; import java.util.Map; @@ -32,8 +32,8 @@ import net.neoforged.neoforge.client.model.generators.MultiPartBlockStateBuilder; import net.neoforged.neoforge.common.data.ExistingFileHelper; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class BlockStateProviderImpl extends BlockStateProvider { private static final String BLOCK_PREFIX = "block"; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/DataGenerators.java similarity index 87% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/DataGenerators.java index cca30f1ff..cfdac8749 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/DataGenerators.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/DataGenerators.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.forge.datagen; +package com.refinedmods.refinedstorage.platform.neoforge.datagen; -import com.refinedmods.refinedstorage2.platform.forge.datagen.loot.LootTableProviderImpl; -import com.refinedmods.refinedstorage2.platform.forge.datagen.recipe.RecoloringRecipeProvider; -import com.refinedmods.refinedstorage2.platform.forge.datagen.tag.BlockTagsProvider; -import com.refinedmods.refinedstorage2.platform.forge.datagen.tag.ItemTagsProviderImpl; +import com.refinedmods.refinedstorage.platform.neoforge.datagen.loot.LootTableProviderImpl; +import com.refinedmods.refinedstorage.platform.neoforge.datagen.recipe.RecoloringRecipeProvider; +import com.refinedmods.refinedstorage.platform.neoforge.datagen.tag.BlockTagsProvider; +import com.refinedmods.refinedstorage.platform.neoforge.datagen.tag.ItemTagsProviderImpl; import java.util.concurrent.CompletableFuture; @@ -15,7 +15,7 @@ import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.data.event.GatherDataEvent; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; @EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD) public class DataGenerators { diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/ItemModelProviderImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/ItemModelProviderImpl.java similarity index 87% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/ItemModelProviderImpl.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/ItemModelProviderImpl.java index c002fb409..e38a0e068 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/ItemModelProviderImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/ItemModelProviderImpl.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.platform.forge.datagen; - -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorBlock; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.DestructorBlock; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.ColorMap; -import com.refinedmods.refinedstorage2.platform.common.exporter.ExporterBlock; -import com.refinedmods.refinedstorage2.platform.common.importer.ImporterBlock; -import com.refinedmods.refinedstorage2.platform.common.networking.CableBlock; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverBlock; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageBlock; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterBlock; +package com.refinedmods.refinedstorage.platform.neoforge.datagen; + +import com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorBlock; +import com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorBlock; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.ColorMap; +import com.refinedmods.refinedstorage.platform.common.exporter.ExporterBlock; +import com.refinedmods.refinedstorage.platform.common.importer.ImporterBlock; +import com.refinedmods.refinedstorage.platform.common.networking.CableBlock; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkReceiverBlock; +import com.refinedmods.refinedstorage.platform.common.networking.NetworkTransmitterBlock; +import com.refinedmods.refinedstorage.platform.common.storage.externalstorage.ExternalStorageBlock; +import com.refinedmods.refinedstorage.platform.common.wirelesstransmitter.WirelessTransmitterBlock; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -20,8 +20,8 @@ import net.neoforged.neoforge.client.model.generators.ModelFile; import net.neoforged.neoforge.common.data.ExistingFileHelper; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.MOD_ID; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class ItemModelProviderImpl extends ItemModelProvider { private static final String CUTOUT_TEXTURE_KEY = "cutout"; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/BlockDropProvider.java similarity index 92% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/BlockDropProvider.java index 00647bfaa..64ccb7fb2 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/BlockDropProvider.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/BlockDropProvider.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.forge.datagen.loot; +package com.refinedmods.refinedstorage.platform.neoforge.datagen.loot; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyLootItemFunction; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.energy.EnergyLootItemFunction; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/LootTableProviderImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/LootTableProviderImpl.java similarity index 90% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/LootTableProviderImpl.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/LootTableProviderImpl.java index 515e5c71d..11103a175 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/LootTableProviderImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/LootTableProviderImpl.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.datagen.loot; +package com.refinedmods.refinedstorage.platform.neoforge.datagen.loot; import java.util.List; import java.util.Set; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/package-info.java new file mode 100644 index 000000000..9bc99f9e5 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/loot/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.datagen.loot; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/package-info.java new file mode 100644 index 000000000..0180e5c80 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.datagen; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/RecoloringRecipeProvider.java similarity index 95% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/RecoloringRecipeProvider.java index be60b1b30..e3fbe8959 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/RecoloringRecipeProvider.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/RecoloringRecipeProvider.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.forge.datagen.recipe; +package com.refinedmods.refinedstorage.platform.neoforge.datagen.recipe; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.Tags; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.Tags; import java.util.concurrent.CompletableFuture; @@ -16,7 +16,7 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; public class RecoloringRecipeProvider extends RecipeProvider { public RecoloringRecipeProvider(final PackOutput output, diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/package-info.java new file mode 100644 index 000000000..d2939e72c --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/recipe/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.datagen.recipe; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/BlockTagsProvider.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/BlockTagsProvider.java similarity index 85% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/BlockTagsProvider.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/BlockTagsProvider.java index 1e2339916..8acdeb830 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/BlockTagsProvider.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/BlockTagsProvider.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.datagen.tag; +package com.refinedmods.refinedstorage.platform.neoforge.datagen.tag; import java.util.concurrent.CompletableFuture; import javax.annotation.Nullable; @@ -10,7 +10,7 @@ import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.common.data.ExistingFileHelper; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.MOD_ID; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; public class BlockTagsProvider extends TagsProvider { public BlockTagsProvider(final PackOutput packOutput, diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java new file mode 100644 index 000000000..18b4f10eb --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/ItemTagsProviderImpl.java @@ -0,0 +1,137 @@ +package com.refinedmods.refinedstorage.platform.neoforge.datagen.tag; + +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.support.BaseBlockItem; + +import java.util.Arrays; +import java.util.Collection; +import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; + +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.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.neoforged.neoforge.common.data.ExistingFileHelper; + +import static com.refinedmods.refinedstorage.platform.common.content.Tags.CABLES; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.CONSTRUCTORS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.CONTROLLERS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.CRAFTING_GRIDS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.CREATIVE_CONTROLLERS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.DESTRUCTORS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.DETECTORS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.DISK_INTERFACES; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.EXPORTERS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.EXTERNAL_STORAGES; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.FLUID_STORAGE_DISKS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.GRIDS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.IMPORTERS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.NETWORK_RECEIVERS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.NETWORK_TRANSMITTERS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.RELAYS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.SECURITY_MANAGERS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.STORAGE_DISKS; +import static com.refinedmods.refinedstorage.platform.common.content.Tags.WIRELESS_TRANSMITTERS; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.MOD_ID; + +public class ItemTagsProviderImpl extends ItemTagsProvider { + public ItemTagsProviderImpl(final PackOutput packOutput, + final CompletableFuture registries, + final TagsProvider blockTagsProvider, + final ExistingFileHelper existingFileHelper) { + super(packOutput, registries, blockTagsProvider.contentsGetter(), MOD_ID, existingFileHelper); + } + + @Override + protected void addTags(final HolderLookup.Provider provider) { + addAllToTag2(CABLES, Items.INSTANCE.getCables()); + addAllToTag(CONTROLLERS, Items.INSTANCE.getControllers()); + addAllToTag(CREATIVE_CONTROLLERS, Blocks.INSTANCE.getCreativeController().values().stream() + .map(Block::asItem) + .map(c -> (Supplier) () -> c) + .toList()); + addAllToTag(FLUID_STORAGE_DISKS, + Arrays.stream(FluidStorageType.Variant.values()) + .filter(variant -> variant != FluidStorageType.Variant.CREATIVE) + .map(Items.INSTANCE::getFluidStorageDisk) + .map(t -> (Supplier) () -> t) + .toList()); + addAllToTag(GRIDS, + Blocks.INSTANCE.getGrid().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(CRAFTING_GRIDS, + Blocks.INSTANCE.getCraftingGrid().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(STORAGE_DISKS, + Arrays.stream(ItemStorageType.Variant.values()) + .filter(variant -> variant != ItemStorageType.Variant.CREATIVE) + .map(Items.INSTANCE::getItemStorageDisk) + .map(t -> (Supplier) () -> t) + .toList()); + addAllToTag(IMPORTERS, + Blocks.INSTANCE.getImporter().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(EXPORTERS, + Blocks.INSTANCE.getExporter().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(EXTERNAL_STORAGES, + Blocks.INSTANCE.getExternalStorage().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(DETECTORS, + Blocks.INSTANCE.getDetector().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(CONSTRUCTORS, + Blocks.INSTANCE.getConstructor().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(DESTRUCTORS, + Blocks.INSTANCE.getDestructor().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(WIRELESS_TRANSMITTERS, + Blocks.INSTANCE.getWirelessTransmitter().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(NETWORK_RECEIVERS, + Blocks.INSTANCE.getNetworkReceiver().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(NETWORK_TRANSMITTERS, + Blocks.INSTANCE.getNetworkTransmitter().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(SECURITY_MANAGERS, + Blocks.INSTANCE.getSecurityManager().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(RELAYS, + Blocks.INSTANCE.getRelay().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + addAllToTag(DISK_INTERFACES, + Blocks.INSTANCE.getDiskInterface().values().stream() + .map(block -> (Supplier) block::asItem) + .toList()); + } + + private void addAllToTag(final TagKey t, final Collection> items) { + tag(t).add(items.stream().map(Supplier::get).toArray(Item[]::new)).replace(false); + } + + private void addAllToTag2(final TagKey t, final Collection> items) { + tag(t).add(items.stream().map(Supplier::get).toArray(Item[]::new)).replace(false); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/package-info.java new file mode 100644 index 000000000..9ffb1ad2f --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/datagen/tag/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.datagen.tag; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java new file mode 100644 index 000000000..c58b265f4 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/FluidHandlerExporterTransferStrategyFactory.java @@ -0,0 +1,39 @@ +package com.refinedmods.refinedstorage.platform.neoforge.exporter; + +import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.exporter.FuzzyExporterTransferStrategy; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; +import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerInsertableStorage; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class FluidHandlerExporterTransferStrategyFactory implements ExporterTransferStrategyFactory { + @Override + public ExporterTransferStrategy create(final ServerLevel level, + final BlockPos pos, + final Direction direction, + final UpgradeState upgradeState, + final AmountOverride amountOverride, + final boolean fuzzyMode) { + final CapabilityCache coordinates = new CapabilityCacheImpl(level, pos, direction); + final FluidHandlerInsertableStorage destination = new FluidHandlerInsertableStorage( + coordinates, + amountOverride + ); + final long transferQuota = (upgradeState.has(Items.INSTANCE.getStackUpgrade()) ? 64 : 1) + * Platform.INSTANCE.getBucketAmount(); + if (fuzzyMode) { + return new FuzzyExporterTransferStrategy(destination, transferQuota); + } + return new ExporterTransferStrategyImpl(destination, transferQuota); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java new file mode 100644 index 000000000..cd90beb86 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/ItemHandlerExporterTransferStrategyFactory.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.platform.neoforge.exporter; + +import com.refinedmods.refinedstorage.api.network.impl.node.exporter.ExporterTransferStrategyImpl; +import com.refinedmods.refinedstorage.api.network.node.exporter.ExporterTransferStrategy; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.exporter.ExporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.common.exporter.FuzzyExporterTransferStrategy; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; +import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class ItemHandlerExporterTransferStrategyFactory implements ExporterTransferStrategyFactory { + @Override + public ExporterTransferStrategy create(final ServerLevel level, + final BlockPos pos, + final Direction direction, + final UpgradeState upgradeState, + final AmountOverride amountOverride, + final boolean fuzzyMode) { + final CapabilityCacheImpl coordinates = new CapabilityCacheImpl(level, pos, direction); + final ItemHandlerInsertableStorage destination = new ItemHandlerInsertableStorage(coordinates, amountOverride); + final int transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) ? 64 : 1; + if (fuzzyMode) { + return new FuzzyExporterTransferStrategy(destination, transferQuota); + } + return new ExporterTransferStrategyImpl(destination, transferQuota); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/package-info.java new file mode 100644 index 000000000..20d03298c --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/exporter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.exporter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/CursorItemHandler.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/CursorItemHandler.java similarity index 97% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/CursorItemHandler.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/CursorItemHandler.java index 40d9f77d0..633ffda58 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/CursorItemHandler.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/CursorItemHandler.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.grid.strategy; +package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; import javax.annotation.Nonnull; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridExtractionStrategy.java new file mode 100644 index 000000000..6a331fe15 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridExtractionStrategy.java @@ -0,0 +1,153 @@ +package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; + +import javax.annotation.Nullable; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.neoforged.neoforge.capabilities.Capabilities; +import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem; +import net.neoforged.neoforge.items.IItemHandler; +import net.neoforged.neoforge.items.ItemHandlerHelper; +import net.neoforged.neoforge.items.wrapper.PlayerMainInvWrapper; + +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidAction; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; + +public class FluidGridExtractionStrategy implements GridExtractionStrategy { + private static final ItemResource BUCKET_ITEM_RESOURCE = new ItemResource(Items.BUCKET); + + private final AbstractContainerMenu menu; + private final GridOperations gridOperations; + private final PlayerMainInvWrapper playerInventoryStorage; + private final Storage itemStorage; + + public FluidGridExtractionStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + this.menu = containerMenu; + this.gridOperations = grid.createOperations(ResourceTypes.FLUID, player); + this.playerInventoryStorage = new PlayerMainInvWrapper(player.getInventory()); + this.itemStorage = grid.getItemStorage(); + } + + @Override + public boolean onExtract(final PlatformResourceKey resource, + final GridExtractMode extractMode, + final boolean cursor) { + if (resource instanceof FluidResource fluidResource) { + final boolean bucketInInventory = hasBucketInInventory(); + final boolean bucketInStorageChannel = hasBucketInStorage(); + if (bucketInInventory) { + extract(fluidResource, extractMode, cursor, true); + } else if (bucketInStorageChannel) { + extract(fluidResource, extractMode, cursor, false); + } + return true; + } + return false; + } + + @Nullable + private IFluidHandlerItem getFluidStorage(final ItemStack stack) { + return stack.getCapability(Capabilities.FluidHandler.ITEM); + } + + private void extract(final FluidResource fluidResource, + final GridExtractMode mode, + final boolean cursor, + final boolean bucketFromInventory) { + final IFluidHandlerItem destination = getFluidStorage(BUCKET_ITEM_RESOURCE.toItemStack()); + if (destination == null) { + return; // shouldn't happen + } + gridOperations.extract(fluidResource, mode, (resource, amount, action, source) -> { + if (!(resource instanceof FluidResource fluidResource2)) { + return 0; + } + final int inserted = destination.fill(toFluidStack(fluidResource2, amount), toFluidAction(action)); + if (action == Action.EXECUTE) { + extractSourceBucket(bucketFromInventory, source); + if (!insertResultingBucket(cursor, destination)) { + insertSourceBucket(bucketFromInventory, source); + return 0; + } + } + return inserted; + }); + } + + private void extractSourceBucket(final boolean bucketFromInventory, final Actor actor) { + if (bucketFromInventory) { + extractBucket(playerInventoryStorage, Action.EXECUTE); + } else { + itemStorage.extract(BUCKET_ITEM_RESOURCE, 1, Action.EXECUTE, actor); + } + } + + private void insertSourceBucket(final boolean bucketFromInventory, final Actor actor) { + if (bucketFromInventory) { + insertBucket(playerInventoryStorage); + } else { + itemStorage.insert(BUCKET_ITEM_RESOURCE, 1, Action.EXECUTE, actor); + } + } + + private boolean insertResultingBucket(final boolean cursor, final IFluidHandlerItem destination) { + if (cursor) { + menu.setCarried(destination.getContainer()); + return true; + } else { + final ItemStack remainder = ItemHandlerHelper.insertItem( + playerInventoryStorage, + destination.getContainer(), + false + ); + return remainder.isEmpty(); + } + } + + private boolean hasBucketInStorage() { + return itemStorage.extract(BUCKET_ITEM_RESOURCE, 1, Action.SIMULATE, EmptyActor.INSTANCE) == 1; + } + + private boolean hasBucketInInventory() { + return extractBucket(playerInventoryStorage, Action.SIMULATE); + } + + private boolean extractBucket(final IItemHandler source, final Action action) { + final ItemStack toExtractStack = BUCKET_ITEM_RESOURCE.toItemStack(); + for (int slot = 0; slot < source.getSlots(); ++slot) { + final boolean relevant = isSame(source.getStackInSlot(slot), toExtractStack); + if (!relevant) { + continue; + } + if (source.extractItem(slot, 1, action == Action.SIMULATE).getCount() == 1) { + return true; + } + } + return false; + } + + private void insertBucket(final IItemHandler destination) { + ItemHandlerHelper.insertItem(destination, BUCKET_ITEM_RESOURCE.toItemStack(), false); + } + + private boolean isSame(final ItemStack a, final ItemStack b) { + return ItemStack.isSameItemSameComponents(a, b); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridInsertionStrategy.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridInsertionStrategy.java new file mode 100644 index 000000000..46b48a635 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/FluidGridInsertionStrategy.java @@ -0,0 +1,75 @@ +package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; + +import javax.annotation.Nullable; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.capabilities.Capabilities; +import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem; + +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.ofFluidStack; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidAction; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; + +public class FluidGridInsertionStrategy implements GridInsertionStrategy { + private final AbstractContainerMenu menu; + private final GridOperations gridOperations; + + public FluidGridInsertionStrategy(final AbstractContainerMenu menu, final ServerPlayer player, final Grid grid) { + this.menu = menu; + this.gridOperations = grid.createOperations(ResourceTypes.FLUID, player); + } + + @Override + public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { + final IFluidHandlerItem cursorStorage = getFluidCursorStorage(); + if (cursorStorage == null) { + return false; + } + final FluidStack extractableResource = cursorStorage.getFluidInTank(0); + if (extractableResource.isEmpty()) { + return false; + } + final FluidResource fluidResource = ofFluidStack(extractableResource); + gridOperations.insert(fluidResource, insertMode, (resource, amount, action, source) -> { + if (!(resource instanceof FluidResource fluidResource2)) { + return 0; + } + final FluidStack toDrain = toFluidStack( + fluidResource2, + amount == Long.MAX_VALUE ? Integer.MAX_VALUE : amount + ); + final FluidStack drained = cursorStorage.drain(toDrain, toFluidAction(action)); + if (action == Action.EXECUTE) { + menu.setCarried(cursorStorage.getContainer()); + } + return drained.getAmount(); + }); + return true; + } + + @Nullable + private IFluidHandlerItem getFluidCursorStorage() { + return getFluidStorage(menu.getCarried()); + } + + @Nullable + private IFluidHandlerItem getFluidStorage(final ItemStack stack) { + return stack.getCapability(Capabilities.FluidHandler.ITEM); + } + + @Override + public boolean onTransfer(final int slotIndex) { + throw new UnsupportedOperationException(); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridExtractionStrategy.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridExtractionStrategy.java new file mode 100644 index 000000000..cc30ab2f2 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridExtractionStrategy.java @@ -0,0 +1,47 @@ +package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridExtractionStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.neoforged.neoforge.items.IItemHandler; +import net.neoforged.neoforge.items.wrapper.PlayerMainInvWrapper; + +public class ItemGridExtractionStrategy implements GridExtractionStrategy { + private final GridOperations gridOperations; + private final PlayerMainInvWrapper playerInventoryStorage; + private final CursorItemHandler playerCursorItemHandler; + + public ItemGridExtractionStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); + this.playerInventoryStorage = new PlayerMainInvWrapper(player.getInventory()); + this.playerCursorItemHandler = new CursorItemHandler(containerMenu); + } + + @Override + public boolean onExtract(final PlatformResourceKey resource, + final GridExtractMode extractMode, + final boolean cursor) { + if (resource instanceof ItemResource itemResource) { + final IItemHandler handler = cursor ? playerCursorItemHandler : playerInventoryStorage; + gridOperations.extract( + itemResource, + extractMode, + new ItemHandlerInsertableStorage(CapabilityCache.ofItemHandler(handler), AmountOverride.NONE) + ); + return true; + } + return false; + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridInsertionStrategy.java new file mode 100644 index 000000000..6770ec662 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridInsertionStrategy.java @@ -0,0 +1,76 @@ +package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; + +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridInsertionStrategy; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerExtractableStorage; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.items.wrapper.InvWrapper; +import net.neoforged.neoforge.items.wrapper.RangedWrapper; + +import static com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource.ofItemStack; + +public class ItemGridInsertionStrategy implements GridInsertionStrategy { + private final AbstractContainerMenu containerMenu; + private final GridOperations gridOperations; + private final CursorItemHandler playerCursorItemHandler; + + public ItemGridInsertionStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + this.containerMenu = containerMenu; + this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); + this.playerCursorItemHandler = new CursorItemHandler(containerMenu); + } + + @Override + public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { + final ItemStack carried = containerMenu.getCarried(); + if (carried.isEmpty()) { + return false; + } + final ItemResource itemResource = ItemResource.ofItemStack(carried); + gridOperations.insert( + itemResource, + insertMode, + new ItemHandlerExtractableStorage( + CapabilityCache.ofItemHandler(playerCursorItemHandler), + AmountOverride.NONE + ) + ); + return true; + } + + @Override + public boolean onTransfer(final int slotIndex) { + final Slot slot = containerMenu.getSlot(slotIndex); + final RangedWrapper storage = new RangedWrapper( + new InvWrapper(slot.container), + slot.getContainerSlot(), + slot.getContainerSlot() + 1 + ); + final ItemStack itemStackInSlot = storage.getStackInSlot(0); + if (itemStackInSlot.isEmpty()) { + return false; + } + final ItemResource itemResource = ofItemStack(itemStackInSlot); + gridOperations.insert( + itemResource, + GridInsertMode.ENTIRE_RESOURCE, + new ItemHandlerExtractableStorage( + CapabilityCache.ofItemHandler(storage), + AmountOverride.NONE + ) + ); + return true; + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridScrollingStrategy.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridScrollingStrategy.java new file mode 100644 index 000000000..65453ea79 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/ItemGridScrollingStrategy.java @@ -0,0 +1,77 @@ +package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; + +import com.refinedmods.refinedstorage.api.grid.operations.GridExtractMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridInsertMode; +import com.refinedmods.refinedstorage.api.grid.operations.GridOperations; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.grid.Grid; +import com.refinedmods.refinedstorage.platform.api.grid.GridScrollMode; +import com.refinedmods.refinedstorage.platform.api.grid.strategy.GridScrollingStrategy; +import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerExtractableStorage; +import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.neoforged.neoforge.items.IItemHandler; +import net.neoforged.neoforge.items.wrapper.InvWrapper; +import net.neoforged.neoforge.items.wrapper.PlayerMainInvWrapper; +import net.neoforged.neoforge.items.wrapper.RangedWrapper; + +public class ItemGridScrollingStrategy implements GridScrollingStrategy { + private final GridOperations gridOperations; + private final Inventory playerInventory; + private final PlayerMainInvWrapper playerInventoryStorage; + private final CursorItemHandler playerCursorItemHandler; + + public ItemGridScrollingStrategy(final AbstractContainerMenu containerMenu, + final ServerPlayer player, + final Grid grid) { + this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); + this.playerInventory = player.getInventory(); + this.playerInventoryStorage = new PlayerMainInvWrapper(playerInventory); + this.playerCursorItemHandler = new CursorItemHandler(containerMenu); + } + + @Override + public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { + if (resource instanceof ItemResource itemResource) { + final IItemHandler playerStorage = slotIndex >= 0 + ? new RangedWrapper(new InvWrapper(playerInventory), slotIndex, slotIndex + 1) + : playerInventoryStorage; + switch (scrollMode) { + case GRID_TO_INVENTORY -> handleGridToInventoryScroll(itemResource, playerStorage); + case INVENTORY_TO_GRID -> handleInventoryToGridScroll(itemResource, playerStorage); + case GRID_TO_CURSOR -> handleGridToInventoryScroll(itemResource, playerCursorItemHandler); + } + return true; + } + return false; + } + + private void handleInventoryToGridScroll(final ItemResource itemResource, final IItemHandler sourceStorage) { + gridOperations.insert( + itemResource, + GridInsertMode.SINGLE_RESOURCE, + new ItemHandlerExtractableStorage( + CapabilityCache.ofItemHandler(sourceStorage), + AmountOverride.NONE + ) + ); + } + + private void handleGridToInventoryScroll(final ItemResource itemResource, final IItemHandler destinationStorage) { + gridOperations.extract( + itemResource, + GridExtractMode.SINGLE_RESOURCE, + new ItemHandlerInsertableStorage( + CapabilityCache.ofItemHandler(destinationStorage), + AmountOverride.NONE + ) + ); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/package-info.java new file mode 100644 index 000000000..df7c35c37 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/strategy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.grid.strategy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeFluidGridResourceFactory.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeFluidGridResourceFactory.java new file mode 100644 index 000000000..1f27ea832 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeFluidGridResourceFactory.java @@ -0,0 +1,30 @@ +package com.refinedmods.refinedstorage.platform.neoforge.grid.view; + +import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractFluidGridResourceFactory; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; + +import net.neoforged.fml.ModList; +import net.neoforged.neoforge.fluids.FluidType; + +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; + +public class ForgeFluidGridResourceFactory extends AbstractFluidGridResourceFactory { + @Override + protected String getTooltip(final FluidResource resource) { + return getName(resource); + } + + @Override + protected String getModName(final String modId) { + return ModList + .get() + .getModContainerById(modId) + .map(container -> container.getModInfo().getDisplayName()) + .orElse(""); + } + + @Override + protected String getName(final FluidResource fluidResource) { + return toFluidStack(fluidResource, FluidType.BUCKET_VOLUME).getHoverName().getString(); + } +} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeItemGridResourceFactory.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeItemGridResourceFactory.java similarity index 78% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeItemGridResourceFactory.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeItemGridResourceFactory.java index 4f2a318ba..6cf5cf4e4 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeItemGridResourceFactory.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/ForgeItemGridResourceFactory.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.forge.grid.view; +package com.refinedmods.refinedstorage.platform.neoforge.grid.view; -import com.refinedmods.refinedstorage2.platform.common.grid.view.AbstractItemGridResourceFactory; +import com.refinedmods.refinedstorage.platform.common.grid.view.AbstractItemGridResourceFactory; import java.util.Objects; import java.util.Optional; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/package-info.java new file mode 100644 index 000000000..ae8c40a5e --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/grid/view/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.grid.view; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterSource.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterSource.java new file mode 100644 index 000000000..30e1fa319 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterSource.java @@ -0,0 +1,42 @@ +package com.refinedmods.refinedstorage.platform.neoforge.importer; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerExtractableStorage; +import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerInsertableStorage; + +import java.util.Iterator; + +class FluidHandlerImporterSource implements ImporterSource { + private final CapabilityCache capabilityCache; + private final InsertableStorage insertTarget; + private final ExtractableStorage extractTarget; + + FluidHandlerImporterSource(final CapabilityCache capabilityCache, + final AmountOverride amountOverride) { + this.capabilityCache = capabilityCache; + this.insertTarget = new FluidHandlerInsertableStorage(capabilityCache, AmountOverride.NONE); + this.extractTarget = new FluidHandlerExtractableStorage(capabilityCache, amountOverride); + } + + @Override + public Iterator getResources() { + return capabilityCache.getFluidIterator(); + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return extractTarget.extract(resource, amount, action, actor); + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return insertTarget.insert(resource, amount, action, actor); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java new file mode 100644 index 000000000..86602ba77 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/FluidHandlerImporterTransferStrategyFactory.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage.platform.neoforge.importer; + +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; +import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import net.neoforged.neoforge.fluids.FluidType; + +public class FluidHandlerImporterTransferStrategyFactory implements ImporterTransferStrategyFactory { + @Override + public ImporterTransferStrategy create(final ServerLevel level, + final BlockPos pos, + final Direction direction, + final UpgradeState upgradeState, + final AmountOverride amountOverride) { + final ImporterSource source = new FluidHandlerImporterSource(new CapabilityCacheImpl( + level, + pos, + direction + ), amountOverride); + final int transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) + ? FluidType.BUCKET_VOLUME * 64 + : FluidType.BUCKET_VOLUME; + return new ImporterTransferStrategyImpl(source, transferQuota); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterSource.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterSource.java new file mode 100644 index 000000000..71c45fe99 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterSource.java @@ -0,0 +1,42 @@ +package com.refinedmods.refinedstorage.platform.neoforge.importer; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerExtractableStorage; +import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; + +import java.util.Iterator; + +class ItemHandlerImporterSource implements ImporterSource { + private final CapabilityCache capabilityCache; + private final InsertableStorage insertTarget; + private final ExtractableStorage extractTarget; + + ItemHandlerImporterSource(final CapabilityCache capabilityCache, + final AmountOverride amountOverride) { + this.capabilityCache = capabilityCache; + this.insertTarget = new ItemHandlerInsertableStorage(capabilityCache, AmountOverride.NONE); + this.extractTarget = new ItemHandlerExtractableStorage(capabilityCache, amountOverride); + } + + @Override + public Iterator getResources() { + return capabilityCache.getItemIterator(); + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return extractTarget.extract(resource, amount, action, actor); + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return insertTarget.insert(resource, amount, action, actor); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java new file mode 100644 index 000000000..4d8d9e056 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/ItemHandlerImporterTransferStrategyFactory.java @@ -0,0 +1,31 @@ +package com.refinedmods.refinedstorage.platform.neoforge.importer; + +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterSource; +import com.refinedmods.refinedstorage.api.network.impl.node.importer.ImporterTransferStrategyImpl; +import com.refinedmods.refinedstorage.api.network.node.importer.ImporterTransferStrategy; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.api.importer.ImporterTransferStrategyFactory; +import com.refinedmods.refinedstorage.platform.api.upgrade.UpgradeState; +import com.refinedmods.refinedstorage.platform.common.content.Items; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class ItemHandlerImporterTransferStrategyFactory implements ImporterTransferStrategyFactory { + @Override + public ImporterTransferStrategy create(final ServerLevel level, + final BlockPos pos, + final Direction direction, + final UpgradeState upgradeState, + final AmountOverride amountOverride) { + final ImporterSource source = new ItemHandlerImporterSource(new CapabilityCacheImpl( + level, + pos, + direction + ), amountOverride); + final int transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) ? 64 : 1; + return new ImporterTransferStrategyImpl(source, transferQuota); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/package-info.java new file mode 100644 index 000000000..83c3211a2 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/importer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.importer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/package-info.java new file mode 100644 index 000000000..e7e6917db --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/CapabilityCache.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCache.java similarity index 91% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/CapabilityCache.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCache.java index 28f7ed94c..30878750b 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/CapabilityCache.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCache.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage; +package com.refinedmods.refinedstorage.platform.neoforge.storage; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.Collections; import java.util.Iterator; @@ -14,8 +14,8 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.items.IItemHandler; -import static com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource.ofItemStack; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.ofFluidStack; +import static com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource.ofItemStack; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.ofFluidStack; public interface CapabilityCache { default Optional getItemHandler() { diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/CapabilityCacheImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCacheImpl.java similarity index 95% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/CapabilityCacheImpl.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCacheImpl.java index 744e854fe..6641e4789 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/CapabilityCacheImpl.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/CapabilityCacheImpl.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage; +package com.refinedmods.refinedstorage.platform.neoforge.storage; import java.util.Optional; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/DiskContainerItemOverrides.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/DiskContainerItemOverrides.java similarity index 90% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/DiskContainerItemOverrides.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/DiskContainerItemOverrides.java index 0bc957c53..27cf58b85 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/DiskContainerItemOverrides.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/DiskContainerItemOverrides.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage; +package com.refinedmods.refinedstorage.platform.neoforge.storage; -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractDiskContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.forge.support.render.ItemBakedModel; +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.common.storage.AbstractDiskContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.ItemBakedModel; import java.util.List; import java.util.Map; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerExtractableStorage.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerExtractableStorage.java new file mode 100644 index 000000000..a91c290d0 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerExtractableStorage.java @@ -0,0 +1,43 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; + +import net.neoforged.neoforge.fluids.FluidStack; + +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidAction; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; + +public class FluidHandlerExtractableStorage implements ExtractableStorage { + private final CapabilityCache capabilityCache; + private final AmountOverride amountOverride; + + public FluidHandlerExtractableStorage(final CapabilityCache capabilityCache, + final AmountOverride amountOverride) { + this.capabilityCache = capabilityCache; + this.amountOverride = amountOverride; + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + if (!(resource instanceof FluidResource fluidResource)) { + return 0; + } + return capabilityCache.getFluidHandler().map(fluidHandler -> { + final long correctedAmount = amountOverride.overrideAmount( + resource, + amount, + () -> ForgeHandlerUtil.getCurrentAmount(fluidHandler, fluidResource) + ); + if (correctedAmount == 0) { + return 0L; + } + final FluidStack toExtractStack = toFluidStack(fluidResource, correctedAmount); + return (long) fluidHandler.drain(toExtractStack, toFluidAction(action)).getAmount(); + }).orElse(0L); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerInsertableStorage.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerInsertableStorage.java new file mode 100644 index 000000000..b73b81973 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/FluidHandlerInsertableStorage.java @@ -0,0 +1,51 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; + +import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.fluids.capability.IFluidHandler; + +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidAction; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; + +public class FluidHandlerInsertableStorage implements InsertableStorage { + private final CapabilityCache capabilityCache; + private final AmountOverride amountOverride; + + public FluidHandlerInsertableStorage(final CapabilityCache capabilityCache, + final AmountOverride amountOverride) { + this.capabilityCache = capabilityCache; + this.amountOverride = amountOverride; + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + if (!(resource instanceof FluidResource fluidResource)) { + return 0; + } + return capabilityCache.getFluidHandler().map(fluidHandler -> { + final long correctedAmount = amountOverride.overrideAmount( + fluidResource, + amount, + () -> ForgeHandlerUtil.getCurrentAmount(fluidHandler, fluidResource) + ); + if (correctedAmount == 0) { + return 0L; + } + return doInsert(fluidResource, correctedAmount, action, fluidHandler); + }).orElse(0L); + } + + private long doInsert(final FluidResource resource, + final long amount, + final Action action, + final IFluidHandler fluidHandler) { + final FluidStack stack = toFluidStack(resource, amount); + return fluidHandler.fill(stack, toFluidAction(action)); + } +} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ForgeHandlerUtil.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ForgeHandlerUtil.java similarity index 81% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ForgeHandlerUtil.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ForgeHandlerUtil.java index 648cab491..e76d0cdca 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ForgeHandlerUtil.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ForgeHandlerUtil.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage; +package com.refinedmods.refinedstorage.platform.neoforge.storage; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.items.IItemHandler; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.isSame; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.isSame; final class ForgeHandlerUtil { private ForgeHandlerUtil() { diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerExtractableStorage.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerExtractableStorage.java similarity index 81% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerExtractableStorage.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerExtractableStorage.java index 9ffc1d0ad..06a8d4521 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerExtractableStorage.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerExtractableStorage.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage; +package com.refinedmods.refinedstorage.platform.neoforge.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.items.IItemHandler; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerInsertableStorage.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerInsertableStorage.java similarity index 79% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerInsertableStorage.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerInsertableStorage.java index fe34d4d41..bae970bca 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/ItemHandlerInsertableStorage.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/ItemHandlerInsertableStorage.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage; +package com.refinedmods.refinedstorage.platform.neoforge.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.items.IItemHandler; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBakedModel.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBakedModel.java new file mode 100644 index 000000000..3755fe14d --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBakedModel.java @@ -0,0 +1,162 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; + +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.DiskDriveBlock; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.neoforge.storage.DiskContainerItemOverrides; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.TransformationBuilder; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import javax.annotation.Nullable; + +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.mojang.math.Transformation; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.core.Direction; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.model.BakedModelWrapper; +import net.neoforged.neoforge.client.model.data.ModelData; +import org.joml.Vector3f; + +class DiskDriveBakedModel extends BakedModelWrapper { + private final LoadingCache> cache; + private final DiskContainerItemOverrides itemOverrides; + private final Vector3f[] diskTranslations = new Vector3f[8]; + + DiskDriveBakedModel(final BakedModel baseModel, + final RotationTranslationModelBaker baseModelBaker, + final DiskModelBaker diskModelBaker, + final RotationTranslationModelBaker ledInactiveModelBaker) { + super(baseModel); + int i = 0; + for (int y = 0; y < 4; ++y) { + for (int x = 0; x < 2; ++x) { + this.diskTranslations[i++] = getDiskTranslation(x, y); + } + } + this.cache = CacheBuilder.newBuilder().build(CacheLoader.from(cacheKey -> { + final Transformation rotation = TransformationBuilder.create().rotate(cacheKey.direction).build(); + final RandomSource rand = RandomSource.create(); + final List quads = baseModelBaker.bake(rotation, cacheKey.side, rand); + for (int j = 0; j < diskTranslations.length; ++j) { + final Disk disk = cacheKey.disks[j]; + quads.addAll(getDiskQuads(diskModelBaker, cacheKey, disk, j)); + if (cacheKey.withInactiveLed && disk.state() == StorageState.INACTIVE) { + final Transformation ledTransform = TransformationBuilder + .create() + .rotate(cacheKey.direction) + .translate(diskTranslations[j]) + .build(); + quads.addAll(ledInactiveModelBaker.bake(ledTransform, cacheKey.side, rand)); + } + } + return quads; + })); + this.itemOverrides = new DiskContainerItemOverrides<>( + cache, + baseModel, + diskTranslations, + disks -> new CacheKey(null, true, BiDirection.NORTH, disks), + CacheKey::withSide + ); + } + + @Override + public ItemOverrides getOverrides() { + return itemOverrides; + } + + @Override + public List getQuads(@Nullable final BlockState state, + @Nullable final Direction side, + final RandomSource rand, + final ModelData extraData, + @Nullable final RenderType renderType) { + if (state == null || !(state.getBlock() instanceof DiskDriveBlock diskDriveBlock)) { + return super.getQuads(state, side, rand); + } + final BiDirection direction = diskDriveBlock.getDirection(state); + if (direction == null) { + return super.getQuads(state, side, rand); + } + final Disk[] disks = extraData.get(ForgeDiskDriveBlockEntity.DISKS_PROPERTY); + if (disks == null) { + return super.getQuads(state, side, rand); + } + return cache.getUnchecked(new CacheKey(side, false, direction, disks)); + } + + private List getDiskQuads(final DiskModelBaker diskBakers, + final CacheKey cacheKey, + final Disk disk, + final int index) { + if (disk.state() == StorageState.NONE || disk.item() == null) { + return Collections.emptyList(); + } + final RotationTranslationModelBaker diskBaker = diskBakers.forDisk(disk.item()); + if (diskBaker == null) { + return Collections.emptyList(); + } + final Transformation diskTransform = TransformationBuilder.create() + .rotate(cacheKey.direction) + .translate(diskTranslations[index]) + .build(); + return diskBaker.bake(diskTransform, cacheKey.side, RandomSource.create()); + } + + private static Vector3f getDiskTranslation(final int x, final int y) { + return new Vector3f( + x == 0 ? -(2F / 16F) : -(9F / 16F), + -((y * 3F) / 16F) - (2F / 16F), + 0 + ); + } + + private record CacheKey(@Nullable Direction side, boolean withInactiveLed, BiDirection direction, Disk[] disks) { + CacheKey withSide(final Direction newSide) { + return new CacheKey(newSide, withInactiveLed, direction, disks); + } + + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + final CacheKey cacheKey = (CacheKey) o; + return side == cacheKey.side && direction == cacheKey.direction && Arrays.equals(disks, cacheKey.disks) + && withInactiveLed == cacheKey.withInactiveLed; + } + + @Override + public int hashCode() { + int result = Objects.hash(side, direction, withInactiveLed); + result = 31 * result + Arrays.hashCode(disks); + return result; + } + + @Override + public String toString() { + return "CacheKey{" + + "side=" + side + + ", withInactiveLed=" + withInactiveLed + + ", direction=" + direction + + ", disks=" + Arrays.toString(disks) + + '}'; + } + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java new file mode 100644 index 000000000..ca777044d --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; + +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RenderTypes; + +public class DiskDriveBlockEntityRendererImpl + extends AbstractDiskDriveBlockEntityRenderer { + public DiskDriveBlockEntityRendererImpl() { + super(RenderTypes.DISK_LED); + } + + @Override + protected Disk[] getDisks(final AbstractDiskDriveBlockEntity blockEntity) { + return blockEntity.getModelData().get(ForgeDiskDriveBlockEntity.DISKS_PROPERTY); + } +} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveGeometryLoader.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java similarity index 86% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveGeometryLoader.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java index a5aa8243f..ba576706f 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveGeometryLoader.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveGeometryLoader.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskdrive; +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveUnbakedGeometry.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java similarity index 84% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveUnbakedGeometry.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java index 31668973c..d07034568 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveUnbakedGeometry.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/DiskDriveUnbakedGeometry.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskdrive; +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.forge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; import java.util.function.Function; @@ -17,7 +17,7 @@ import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class DiskDriveUnbakedGeometry implements IUnbakedGeometry { diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/ForgeDiskDriveBlockEntity.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java similarity index 77% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/ForgeDiskDriveBlockEntity.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java index 8612c9ad8..47801f7f3 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/ForgeDiskDriveBlockEntity.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/ForgeDiskDriveBlockEntity.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskdrive; +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; import javax.annotation.Nonnull; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/package-info.java new file mode 100644 index 000000000..4050fcfcb --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskdrive/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskdrive; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java new file mode 100644 index 000000000..2b0d3a885 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBakedModel.java @@ -0,0 +1,170 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.DiskInterfaceBlock; +import com.refinedmods.refinedstorage.platform.common.support.AbstractActiveColoredDirectionalBlock; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.neoforge.storage.DiskContainerItemOverrides; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.TransformationBuilder; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import javax.annotation.Nullable; + +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.mojang.math.Transformation; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.core.Direction; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.model.BakedModelWrapper; +import net.neoforged.neoforge.client.model.data.ModelData; +import org.joml.Vector3f; + +public class DiskInterfaceBakedModel extends BakedModelWrapper { + private final LoadingCache> cache; + private final DiskContainerItemOverrides itemOverrides; + private final Vector3f[] diskTranslations = new Vector3f[6]; + + DiskInterfaceBakedModel(final BakedModel baseModel, + final RotationTranslationModelBaker inactiveBaseModelBaker, + final RotationTranslationModelBaker baseModelBaker, + final DiskModelBaker diskModelBaker, + final RotationTranslationModelBaker ledInactiveModelBaker) { + super(baseModel); + for (int i = 0; i < 6; ++i) { + this.diskTranslations[i] = getDiskTranslation(i); + } + this.cache = CacheBuilder.newBuilder().build(CacheLoader.from(cacheKey -> { + final Transformation rotation = TransformationBuilder.create().rotate(cacheKey.direction).build(); + final RandomSource rand = RandomSource.create(); + final List quads = (cacheKey.active ? baseModelBaker : inactiveBaseModelBaker) + .bake(rotation, cacheKey.side, rand); + for (int j = 0; j < diskTranslations.length; ++j) { + final Disk disk = cacheKey.disks[j]; + quads.addAll(getDiskQuads(diskModelBaker, cacheKey, disk, j)); + if (cacheKey.withInactiveLed && disk.state() == StorageState.INACTIVE) { + final Transformation ledTransform = TransformationBuilder + .create() + .rotate(cacheKey.direction) + .translate(diskTranslations[j]) + .build(); + quads.addAll(ledInactiveModelBaker.bake(ledTransform, cacheKey.side, rand)); + } + } + return quads; + })); + this.itemOverrides = new DiskContainerItemOverrides<>( + cache, + baseModel, + diskTranslations, + disks -> new CacheKey(null, true, true, BiDirection.NORTH, disks), + CacheKey::withSide + ); + } + + @Override + public ItemOverrides getOverrides() { + return itemOverrides; + } + + @Override + public List getQuads(@Nullable final BlockState state, + @Nullable final Direction side, + final RandomSource rand, + final ModelData extraData, + @Nullable final RenderType renderType) { + if (state == null || !(state.getBlock() instanceof DiskInterfaceBlock diskInterfaceBlock)) { + return super.getQuads(state, side, rand); + } + final BiDirection direction = diskInterfaceBlock.getDirection(state); + if (direction == null) { + return super.getQuads(state, side, rand); + } + final Disk[] disks = extraData.get(ForgeDiskInterfaceBlockEntity.DISKS_PROPERTY); + if (disks == null) { + return super.getQuads(state, side, rand); + } + final boolean active = state.getValue(AbstractActiveColoredDirectionalBlock.ACTIVE); + return cache.getUnchecked(new CacheKey(side, active, false, direction, disks)); + } + + private List getDiskQuads(final DiskModelBaker diskBakers, + final CacheKey cacheKey, + final Disk disk, + final int index) { + if (disk.state() == StorageState.NONE || disk.item() == null) { + return Collections.emptyList(); + } + final RotationTranslationModelBaker diskBaker = diskBakers.forDisk(disk.item()); + if (diskBaker == null) { + return Collections.emptyList(); + } + final Transformation diskTransform = TransformationBuilder.create() + .rotate(cacheKey.direction) + .translate(diskTranslations[index]) + .build(); + return diskBaker.bake(diskTransform, cacheKey.side, RandomSource.create()); + } + + private static Vector3f getDiskTranslation(final int i) { + final int x = i < 3 ? 0 : 1; + final int y = i % 3; + return new Vector3f( + x == 0 ? -(2F / 16F) : -(9F / 16F), + -((y * 3F) / 16F) - (6F / 16F), + 0 + ); + } + + private record CacheKey(@Nullable Direction side, + boolean active, + boolean withInactiveLed, + BiDirection direction, + Disk[] disks) { + CacheKey withSide(final Direction newSide) { + return new CacheKey(newSide, active, withInactiveLed, direction, disks); + } + + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + final CacheKey cacheKey = (CacheKey) o; + return side == cacheKey.side && direction == cacheKey.direction && Arrays.equals(disks, cacheKey.disks) + && withInactiveLed == cacheKey.withInactiveLed && active == cacheKey.active; + } + + @Override + public int hashCode() { + int result = Objects.hash(side, active, direction, withInactiveLed); + result = 31 * result + Arrays.hashCode(disks); + return result; + } + + @Override + public String toString() { + return "CacheKey{" + + "side=" + side + + ", active=" + active + + ", withInactiveLed=" + withInactiveLed + + ", direction=" + direction + + ", disks=" + Arrays.toString(disks) + + '}'; + } + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java new file mode 100644 index 000000000..1e4adf49d --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; + +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RenderTypes; + +public class DiskInterfaceBlockEntityRendererImpl + extends AbstractDiskInterfaceBlockEntityRenderer { + public DiskInterfaceBlockEntityRendererImpl() { + super(RenderTypes.DISK_LED); + } + + @Override + protected Disk[] getDisks(final AbstractDiskInterfaceBlockEntity blockEntity) { + return blockEntity.getModelData().get(ForgeDiskInterfaceBlockEntity.DISKS_PROPERTY); + } +} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceGeometryLoader.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java similarity index 89% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceGeometryLoader.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java index a1654762a..68166f5ea 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceGeometryLoader.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceGeometryLoader.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskinterface; +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java similarity index 86% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java index 9b51c3e2f..4b06d115b 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/DiskInterfaceUnbakedGeometry.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskinterface; +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.forge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; import java.util.function.Function; @@ -18,7 +18,7 @@ import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class DiskInterfaceUnbakedGeometry implements IUnbakedGeometry { diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java similarity index 76% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java index d163d6605..f5816313e 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/ForgeDiskInterfaceBlockEntity.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskinterface; +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; import javax.annotation.Nonnull; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/package-info.java new file mode 100644 index 000000000..2ebdb0cfa --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/diskinterface/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.storage.diskinterface; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java new file mode 100644 index 000000000..c71d967bc --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerExternalStorageProvider.java @@ -0,0 +1,42 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerExtractableStorage; +import com.refinedmods.refinedstorage.platform.neoforge.storage.FluidHandlerInsertableStorage; + +import java.util.Iterator; + +class FluidHandlerExternalStorageProvider implements ExternalStorageProvider { + private final CapabilityCache capabilityCache; + private final InsertableStorage insertTarget; + private final ExtractableStorage extractTarget; + + FluidHandlerExternalStorageProvider(final CapabilityCache capabilityCache) { + this.capabilityCache = capabilityCache; + this.insertTarget = new FluidHandlerInsertableStorage(capabilityCache, AmountOverride.NONE); + this.extractTarget = new FluidHandlerExtractableStorage(capabilityCache, AmountOverride.NONE); + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return extractTarget.extract(resource, amount, action, actor); + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return insertTarget.insert(resource, amount, action, actor); + } + + @Override + public Iterator iterator() { + return capabilityCache.getFluidAmountIterator(); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java new file mode 100644 index 000000000..a64aecf55 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; +import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; + +import java.util.Optional; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class FluidHandlerPlatformExternalStorageProviderFactory implements PlatformExternalStorageProviderFactory { + @Override + public Optional create(final ServerLevel level, + final BlockPos pos, + final Direction direction) { + return Optional.of(new FluidHandlerExternalStorageProvider(new CapabilityCacheImpl(level, pos, direction))); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java new file mode 100644 index 000000000..8674dbbff --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerExternalStorageProvider.java @@ -0,0 +1,42 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; +import com.refinedmods.refinedstorage.platform.api.exporter.AmountOverride; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCache; +import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerExtractableStorage; +import com.refinedmods.refinedstorage.platform.neoforge.storage.ItemHandlerInsertableStorage; + +import java.util.Iterator; + +class ItemHandlerExternalStorageProvider implements ExternalStorageProvider { + private final CapabilityCache capabilityCache; + private final InsertableStorage insertTarget; + private final ExtractableStorage extractTarget; + + ItemHandlerExternalStorageProvider(final CapabilityCache capabilityCache) { + this.capabilityCache = capabilityCache; + this.insertTarget = new ItemHandlerInsertableStorage(capabilityCache, AmountOverride.NONE); + this.extractTarget = new ItemHandlerExtractableStorage(capabilityCache, AmountOverride.NONE); + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return extractTarget.extract(resource, amount, action, actor); + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return insertTarget.insert(resource, amount, action, actor); + } + + @Override + public Iterator iterator() { + return capabilityCache.getItemAmountIterator(); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java new file mode 100644 index 000000000..d65eb3ea9 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider; +import com.refinedmods.refinedstorage.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; +import com.refinedmods.refinedstorage.platform.neoforge.storage.CapabilityCacheImpl; + +import java.util.Optional; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; + +public class ItemHandlerPlatformExternalStorageProviderFactory implements PlatformExternalStorageProviderFactory { + @Override + public Optional create(final ServerLevel level, + final BlockPos pos, + final Direction direction) { + return Optional.of(new ItemHandlerExternalStorageProvider(new CapabilityCacheImpl(level, pos, direction))); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/package-info.java new file mode 100644 index 000000000..5d55cb170 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/externalstorage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.storage.externalstorage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/package-info.java new file mode 100644 index 000000000..43b91e753 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/DiskLedBakers.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/DiskLedBakers.java new file mode 100644 index 000000000..f81ce7e0d --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/DiskLedBakers.java @@ -0,0 +1,20 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; + +record DiskLedBakers( + RotationTranslationModelBaker inactiveBaker, + RotationTranslationModelBaker normalBaker, + RotationTranslationModelBaker nearCapacityBaker, + RotationTranslationModelBaker fullBaker +) { + RotationTranslationModelBaker forState(final StorageState state) { + return switch (state) { + case INACTIVE -> inactiveBaker; + case NEAR_CAPACITY -> nearCapacityBaker; + case FULL -> fullBaker; + default -> normalBaker; + }; + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java new file mode 100644 index 000000000..cc1f73317 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/ForgePortableGridBlockEntity.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; + +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridType; + +import javax.annotation.Nonnull; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.model.data.ModelData; +import net.neoforged.neoforge.client.model.data.ModelProperty; + +public class ForgePortableGridBlockEntity extends AbstractPortableGridBlockEntity { + public static final ModelProperty DISK_PROPERTY = new ModelProperty<>(); + + public ForgePortableGridBlockEntity(final PortableGridType type, final BlockPos pos, final BlockState state) { + super(type, pos, state); + } + + @Override + protected void onClientDriveStateUpdated() { + requestModelDataUpdate(); + super.onClientDriveStateUpdated(); + } + + @Nonnull + @Override + public ModelData getModelData() { + return ModelData.builder().with(DISK_PROPERTY, disk).build(); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBakedModel.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBakedModel.java new file mode 100644 index 000000000..5f8c2a03b --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBakedModel.java @@ -0,0 +1,140 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.storage.StorageState; +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlock; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItem; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.PortableGridBlockItemRenderInfo; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.ItemBakedModel; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.TransformationBuilder; + +import java.util.Collections; +import java.util.List; +import javax.annotation.Nullable; + +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemOverrides; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.core.Direction; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.model.BakedModelWrapper; +import net.neoforged.neoforge.client.model.data.ModelData; +import org.joml.Vector3f; + +class PortableGridBakedModel extends BakedModelWrapper { + private static final Vector3f MOVE_TO_DISK_LOCATION = new Vector3f(0, -12 / 16F, 9 / 16F); + private static final Vector3f MOVE_TO_DISK_LED_LOCATION = new Vector3f(0, -12 / 16F, 9 / 16F); + + private final LoadingCache> cache; + private final PortableGridItemOverrides itemOverrides = new PortableGridItemOverrides(); + + PortableGridBakedModel(final BakedModel baseModel, + final RotationTranslationModelBaker activeModelBaker, + final RotationTranslationModelBaker inactiveModelBaker, + final DiskModelBaker diskModelBaker, + final DiskLedBakers diskLedBakers) { + super(baseModel); + this.cache = CacheBuilder.newBuilder().build(CacheLoader.from(cacheKey -> { + final RotationTranslationModelBaker baseModelBaker = cacheKey.active + ? activeModelBaker + : inactiveModelBaker; + final List quads = baseModelBaker.bake( + TransformationBuilder.create().rotate(cacheKey.direction).build(), + cacheKey.side(), + RandomSource.create() + ); + if (cacheKey.disk.item() == null) { + return quads; + } + final RotationTranslationModelBaker diskBaker = diskModelBaker.forDisk(cacheKey.disk.item()); + if (diskBaker != null) { + quads.addAll(diskBaker.bake(TransformationBuilder.create() + .rotate(cacheKey.direction) + .translate(MOVE_TO_DISK_LOCATION) + .rotate(BiDirection.WEST) + .build(), cacheKey.side(), RandomSource.create())); + } + if (cacheKey.includeLed && cacheKey.disk.state() != StorageState.NONE) { + quads.addAll(diskLedBakers.forState(cacheKey.disk.state()).bake(TransformationBuilder.create() + .translate(MOVE_TO_DISK_LED_LOCATION) + .rotate(BiDirection.WEST) + .build(), cacheKey.side(), RandomSource.create())); + } + return quads; + })); + } + + @Override + public List getQuads(@Nullable final BlockState state, + @Nullable final Direction side, + final RandomSource randomSource, + final ModelData extraData, + @Nullable final RenderType renderType) { + if (state == null || !(state.getBlock() instanceof PortableGridBlock portableGridBlock)) { + return super.getQuads(state, side, randomSource); + } + final BiDirection direction = portableGridBlock.getDirection(state); + if (direction == null) { + return super.getQuads(state, side, randomSource); + } + final Disk disk = extraData.get(ForgePortableGridBlockEntity.DISK_PROPERTY); + if (disk == null) { + return super.getQuads(state, side, randomSource); + } + final boolean active = state.getValue(PortableGridBlock.ACTIVE); + return cache.getUnchecked(new CacheKey(side, direction, active, disk, false)); + } + + @Override + public ItemOverrides getOverrides() { + return itemOverrides; + } + + private class PortableGridItemOverrides extends ItemOverrides { + private final LoadingCache itemCache = CacheBuilder.newBuilder().build( + CacheLoader.from(cacheKey -> new ItemBakedModel( + originalModel, + cache.getUnchecked(cacheKey), + Collections.emptyMap() + )) + ); + + @Override + @Nullable + public BakedModel resolve(final BakedModel bakedModel, + final ItemStack stack, + @Nullable final ClientLevel level, + @Nullable final LivingEntity entity, + final int seed) { + if (level == null) { + return null; + } + final PortableGridBlockItemRenderInfo renderInfo = PortableGridBlockItem.getRenderInfo(stack, level); + return itemCache.getUnchecked(new CacheKey( + null, + BiDirection.NORTH, + renderInfo.active(), + renderInfo.disk(), + true + )); + } + } + + private record CacheKey(@Nullable Direction side, + BiDirection direction, + boolean active, + Disk disk, + boolean includeLed) { + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java new file mode 100644 index 000000000..71dc5b662 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java @@ -0,0 +1,21 @@ +package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; + +import com.refinedmods.refinedstorage.platform.common.storage.Disk; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; +import com.refinedmods.refinedstorage.platform.common.storage.portablegrid.AbstractPortableGridBlockEntityRenderer; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RenderTypes; + +import javax.annotation.Nullable; + +public class PortableGridBlockEntityRendererImpl + extends AbstractPortableGridBlockEntityRenderer { + public PortableGridBlockEntityRendererImpl() { + super(RenderTypes.DISK_LED); + } + + @Override + @Nullable + protected Disk getDisk(final T blockEntity) { + return blockEntity.getModelData().get(ForgePortableGridBlockEntity.DISK_PROPERTY); + } +} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridGeometryLoader.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridGeometryLoader.java similarity index 86% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridGeometryLoader.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridGeometryLoader.java index 54e7d2251..02ff78940 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridGeometryLoader.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridGeometryLoader.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridUnbakedGeometry.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java similarity index 88% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridUnbakedGeometry.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java index 9463fb525..06a7cf02e 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridUnbakedGeometry.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/PortableGridUnbakedGeometry.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid; +package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.forge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.DiskModelBaker; +import com.refinedmods.refinedstorage.platform.neoforge.support.render.RotationTranslationModelBaker; import java.util.function.Function; @@ -17,7 +17,7 @@ import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; +import static com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil.createIdentifier; import static java.util.Objects.requireNonNull; public class PortableGridUnbakedGeometry implements IUnbakedGeometry { diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/package-info.java new file mode 100644 index 000000000..c721b6141 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/storage/portablegrid/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.storage.portablegrid; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/ContainerTransferDestination.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/ContainerTransferDestination.java new file mode 100644 index 000000000..6dde05407 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/ContainerTransferDestination.java @@ -0,0 +1,16 @@ +package com.refinedmods.refinedstorage.platform.neoforge.support.containermenu; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.TransferDestination; + +import net.minecraft.world.Container; +import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.items.ItemHandlerHelper; +import net.neoforged.neoforge.items.wrapper.InvWrapper; + +public record ContainerTransferDestination(Container destination) implements TransferDestination { + @Override + public ItemStack transfer(final ItemStack stack) { + final InvWrapper destinationInv = new InvWrapper(destination); + return ItemHandlerHelper.insertItem(destinationInv, stack, false); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/MenuOpenerImpl.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/MenuOpenerImpl.java new file mode 100644 index 000000000..6be6d3531 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/MenuOpenerImpl.java @@ -0,0 +1,26 @@ +package com.refinedmods.refinedstorage.platform.neoforge.support.containermenu; + +import com.refinedmods.refinedstorage.platform.common.support.containermenu.ExtendedMenuProvider; +import com.refinedmods.refinedstorage.platform.common.support.containermenu.MenuOpener; + +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.MenuProvider; + +public class MenuOpenerImpl implements MenuOpener { + @Override + public void openMenu(final ServerPlayer player, final MenuProvider menuProvider) { + if (menuProvider instanceof ExtendedMenuProvider extendedMenuProvider) { + openExtendedMenu(player, extendedMenuProvider); + } else { + player.openMenu(menuProvider); + } + } + + private static void openExtendedMenu(final ServerPlayer player, + final ExtendedMenuProvider extendedMenuProvider) { + player.openMenu( + extendedMenuProvider, + buf -> extendedMenuProvider.getMenuCodec().encode(buf, extendedMenuProvider.getMenuData()) + ); + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/package-info.java new file mode 100644 index 000000000..0d92a442e --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/containermenu/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.support.containermenu; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java new file mode 100644 index 000000000..35ff1effa --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/EnergyStorageAdapter.java @@ -0,0 +1,48 @@ +package com.refinedmods.refinedstorage.platform.neoforge.support.energy; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage; + +import net.neoforged.neoforge.energy.IEnergyStorage; + +public class EnergyStorageAdapter implements IEnergyStorage { + private final EnergyStorage energyStorage; + + public EnergyStorageAdapter(final EnergyStorage energyStorage) { + this.energyStorage = energyStorage; + } + + public EnergyStorage getEnergyStorage() { + return energyStorage; + } + + @Override + public int receiveEnergy(final int maxReceive, final boolean simulate) { + return (int) energyStorage.receive(maxReceive, simulate ? Action.SIMULATE : Action.EXECUTE); + } + + @Override + public int extractEnergy(final int maxExtract, final boolean simulate) { + return (int) energyStorage.extract(maxExtract, simulate ? Action.SIMULATE : Action.EXECUTE); + } + + @Override + public int getEnergyStored() { + return (int) energyStorage.getStored(); + } + + @Override + public int getMaxEnergyStored() { + return (int) energyStorage.getCapacity(); + } + + @Override + public boolean canExtract() { + return false; + } + + @Override + public boolean canReceive() { + return true; + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/package-info.java new file mode 100644 index 000000000..59b8b4647 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/energy/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.support.energy; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/InsertExtractItemHandler.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/InsertExtractItemHandler.java similarity index 96% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/InsertExtractItemHandler.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/InsertExtractItemHandler.java index 199bc41d5..01b87a8fe 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/InsertExtractItemHandler.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/InsertExtractItemHandler.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.inventory; +package com.refinedmods.refinedstorage.platform.neoforge.support.inventory; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.items.IItemHandler; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/package-info.java new file mode 100644 index 000000000..d0db718c9 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/inventory/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.support.inventory; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/DiskModelBaker.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/DiskModelBaker.java similarity index 89% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/DiskModelBaker.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/DiskModelBaker.java index 8bbaf11e5..a9c1031e4 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/DiskModelBaker.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/DiskModelBaker.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.render; +package com.refinedmods.refinedstorage.platform.neoforge.support.render; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; +import com.refinedmods.refinedstorage.platform.api.PlatformApi; import java.util.Map; import java.util.function.Function; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/FluidStackFluidRenderer.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/FluidStackFluidRenderer.java similarity index 92% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/FluidStackFluidRenderer.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/FluidStackFluidRenderer.java index e02d22965..13d440be1 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/FluidStackFluidRenderer.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/FluidStackFluidRenderer.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.render; +package com.refinedmods.refinedstorage.platform.neoforge.support.render; -import com.refinedmods.refinedstorage2.platform.common.support.render.AbstractFluidRenderer; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.render.AbstractFluidRenderer; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; import java.util.Collections; import java.util.HashMap; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/ItemBakedModel.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/ItemBakedModel.java similarity index 96% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/ItemBakedModel.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/ItemBakedModel.java index 580ce1cc6..cf0486995 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/ItemBakedModel.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/ItemBakedModel.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.render; +package com.refinedmods.refinedstorage.platform.neoforge.support.render; import java.util.Collections; import java.util.List; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RenderTypes.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RenderTypes.java new file mode 100644 index 000000000..3fc2a1fba --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RenderTypes.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.platform.neoforge.support.render; + +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.VertexFormat; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.RenderStateShard; +import net.minecraft.client.renderer.RenderType; + +public final class RenderTypes { + public static final RenderType DISK_LED = RenderType.create( + "disk_led", + DefaultVertexFormat.POSITION_COLOR, + VertexFormat.Mode.QUADS, + 32565, + false, + true, + RenderType.CompositeState.builder() + .setShaderState(new RenderStateShard.ShaderStateShard(GameRenderer::getPositionColorShader)) + .createCompositeState(false) + ); + + private RenderTypes() { + } +} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RotationTranslationModelBaker.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java similarity index 96% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RotationTranslationModelBaker.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java index abf422b50..ace1123b3 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RotationTranslationModelBaker.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/RotationTranslationModelBaker.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.render; +package com.refinedmods.refinedstorage.platform.neoforge.support.render; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/TransformationBuilder.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/TransformationBuilder.java similarity index 86% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/TransformationBuilder.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/TransformationBuilder.java index 76459fee5..9837ea16d 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/TransformationBuilder.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/TransformationBuilder.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.render; +package com.refinedmods.refinedstorage.platform.neoforge.support.render; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; +import com.refinedmods.refinedstorage.platform.common.support.direction.BiDirection; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/package-info.java new file mode 100644 index 000000000..d4aac3d9a --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/render/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.support.render; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/ResourceContainerFluidHandlerAdapter.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java similarity index 77% rename from refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/ResourceContainerFluidHandlerAdapter.java rename to refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java index de24cbc94..dd3e857b6 100644 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/ResourceContainerFluidHandlerAdapter.java +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/ResourceContainerFluidHandlerAdapter.java @@ -1,19 +1,19 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.resource; +package com.refinedmods.refinedstorage.platform.neoforge.support.resource; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.platform.api.support.resource.ResourceContainer; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ResourceTypes; import javax.annotation.Nullable; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.ofFluidStack; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toAction; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidStack; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.ofFluidStack; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toAction; +import static com.refinedmods.refinedstorage.platform.neoforge.support.resource.VariantUtil.toFluidStack; public class ResourceContainerFluidHandlerAdapter implements IFluidHandler { private final ResourceContainer container; diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/VariantUtil.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/VariantUtil.java new file mode 100644 index 000000000..3a050e902 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/VariantUtil.java @@ -0,0 +1,49 @@ +package com.refinedmods.refinedstorage.platform.neoforge.support.resource; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; + +import java.util.Objects; + +import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.fluids.capability.IFluidHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public final class VariantUtil { + private static final Logger LOGGER = LoggerFactory.getLogger(VariantUtil.class); + + private VariantUtil() { + } + + public static boolean isSame(final FluidResource resource, final FluidStack stack) { + return resource.fluid() == stack.getFluid() && Objects.equals( + resource.components(), + stack.getComponents().asPatch() + ); + } + + public static FluidResource ofFluidStack(final FluidStack fluidStack) { + return new FluidResource(fluidStack.getFluid(), fluidStack.getComponents().asPatch()); + } + + @SuppressWarnings("deprecation") + public static FluidStack toFluidStack(final FluidResource fluidResource, final long amount) { + if (amount > Integer.MAX_VALUE) { + LOGGER.warn("Truncating too large amount for {} to fit into FluidStack {}", fluidResource, amount); + } + return new FluidStack( + fluidResource.fluid().builtInRegistryHolder(), + (int) amount, + fluidResource.components() + ); + } + + public static Action toAction(final IFluidHandler.FluidAction action) { + return action == IFluidHandler.FluidAction.SIMULATE ? Action.SIMULATE : Action.EXECUTE; + } + + public static IFluidHandler.FluidAction toFluidAction(final Action action) { + return action == Action.SIMULATE ? IFluidHandler.FluidAction.SIMULATE : IFluidHandler.FluidAction.EXECUTE; + } +} diff --git a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/package-info.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/package-info.java new file mode 100644 index 000000000..8ea903117 --- /dev/null +++ b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/support/resource/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.platform.neoforge.support.resource; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/resources/META-INF/accesstransformer.cfg b/refinedstorage-platform-neoforge/src/main/resources/META-INF/accesstransformer.cfg similarity index 100% rename from refinedstorage2-platform-forge/src/main/resources/META-INF/accesstransformer.cfg rename to refinedstorage-platform-neoforge/src/main/resources/META-INF/accesstransformer.cfg diff --git a/refinedstorage2-platform-forge/src/main/resources/META-INF/neoforge.mods.toml b/refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 77% rename from refinedstorage2-platform-forge/src/main/resources/META-INF/neoforge.mods.toml rename to refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml index ef5cf1c45..1148ab8a3 100644 --- a/refinedstorage2-platform-forge/src/main/resources/META-INF/neoforge.mods.toml +++ b/refinedstorage-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -3,10 +3,10 @@ loaderVersion = "[2,)" issueTrackerURL = "https://github.com/refinedmods/refinedstorage2" license = "MIT" [[mods]] -modId = "refinedstorage2" +modId = "refinedstorage" version = "${version}" -displayName = "Refined Storage 2" -displayURL = "https://github.com/refinedmods/refinedstorage2" +displayName = "Refined Storage" +displayURL = "https://refinedmods.com/refined-storage" logoFile = "icon.png" authors = "Refined Mods" description = ''' diff --git a/refinedstorage2-platform-forge/src/main/resources/icon.png b/refinedstorage-platform-neoforge/src/main/resources/icon.png similarity index 100% rename from refinedstorage2-platform-forge/src/main/resources/icon.png rename to refinedstorage-platform-neoforge/src/main/resources/icon.png diff --git a/refinedstorage2-platform-forge/src/main/resources/pack.mcmeta b/refinedstorage-platform-neoforge/src/main/resources/pack.mcmeta similarity index 100% rename from refinedstorage2-platform-forge/src/main/resources/pack.mcmeta rename to refinedstorage-platform-neoforge/src/main/resources/pack.mcmeta diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/forge/GameTestUtil.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java similarity index 89% rename from refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/forge/GameTestUtil.java rename to refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java index bd05d0bef..22d5a5561 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/forge/GameTestUtil.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/GameTestUtil.java @@ -1,16 +1,16 @@ -package com.refinedmods.refinedstorage2.platform.forge; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.platform.api.support.network.AbstractNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; +package com.refinedmods.refinedstorage.platform.common; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.network.Network; +import com.refinedmods.refinedstorage.api.network.node.NetworkNode; +import com.refinedmods.refinedstorage.api.network.storage.StorageNetworkComponent; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.platform.api.support.network.AbstractNetworkNodeContainerBlockEntity; +import com.refinedmods.refinedstorage.platform.common.content.Blocks; +import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource; +import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource; import java.util.Arrays; import java.util.function.Consumer; diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorTest.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java similarity index 87% rename from refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorTest.java rename to refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java index 994129a19..505551875 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorTest.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTest.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; import java.util.List; @@ -15,12 +15,12 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; -import static com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorTestPlots.preparePlot; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.asResource; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.assertFluidPresent; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.insert; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.networkIsAvailable; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.storageContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.assertFluidPresent; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.constructordestructor.ConstructorTestPlots.preparePlot; import static net.minecraft.world.item.Items.DIRT; import static net.minecraft.world.item.Items.FIREWORK_ROCKET; import static net.minecraft.world.item.Items.STONE; diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java similarity index 78% rename from refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorTestPlots.java rename to refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java index 35ed4ba4f..8bf1cb20a 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/ConstructorTestPlots.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -9,8 +9,8 @@ import net.minecraft.gametest.framework.GameTestSequence; import org.apache.commons.lang3.function.TriConsumer; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.RSBLOCKS; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.requireBlockEntity; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.requireBlockEntity; import static net.minecraft.core.BlockPos.ZERO; final class ConstructorTestPlots { diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorTest.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java similarity index 93% rename from refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorTest.java rename to refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java index e0cb1f50e..c6207d66e 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorTest.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTest.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; import java.util.Set; @@ -14,11 +14,11 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; -import static com.refinedmods.refinedstorage2.platform.common.constructordestructor.DestructorTestPlots.preparePlot; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.asResource; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.insert; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.networkIsAvailable; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.storageContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.constructordestructor.DestructorTestPlots.preparePlot; import static net.minecraft.world.item.Items.DIRT; import static net.minecraft.world.item.Items.STONE; import static net.minecraft.world.level.material.Fluids.LAVA; diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java similarity index 78% rename from refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorTestPlots.java rename to refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java index 49556acd4..9444e559c 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/constructordestructor/DestructorTestPlots.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; +package com.refinedmods.refinedstorage.platform.common.constructordestructor; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -9,8 +9,8 @@ import net.minecraft.gametest.framework.GameTestSequence; import org.apache.commons.lang3.function.TriConsumer; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.RSBLOCKS; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.requireBlockEntity; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.requireBlockEntity; import static net.minecraft.core.BlockPos.ZERO; final class DestructorTestPlots { diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterTest.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java similarity index 88% rename from refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterTest.java rename to refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java index d89f99fb4..dd4e4809f 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterTest.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTest.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.platform.common.exporter; +package com.refinedmods.refinedstorage.platform.common.exporter; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; import java.util.List; @@ -14,12 +14,12 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; -import static com.refinedmods.refinedstorage2.platform.common.exporter.ExporterTestPlots.preparePlot; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.asResource; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.containerContainsExactly; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.insert; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.networkIsAvailable; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.storageContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.containerContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.exporter.ExporterTestPlots.preparePlot; import static net.minecraft.world.item.Items.DIAMOND_CHESTPLATE; import static net.minecraft.world.item.Items.DIRT; import static net.minecraft.world.item.Items.STONE; diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java similarity index 81% rename from refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterTestPlots.java rename to refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java index 8cf74448b..48fea077a 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/exporter/ExporterTestPlots.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.exporter; +package com.refinedmods.refinedstorage.platform.common.exporter; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -10,8 +10,8 @@ import net.minecraft.world.level.block.Blocks; import org.apache.commons.lang3.function.TriConsumer; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.RSBLOCKS; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.requireBlockEntity; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.requireBlockEntity; import static net.minecraft.core.BlockPos.ZERO; final class ExporterTestPlots { diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterTest.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java similarity index 92% rename from refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterTest.java rename to refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java index ba22f0e24..f2650ec82 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterTest.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTest.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.platform.common.importer; +package com.refinedmods.refinedstorage.platform.common.importer; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.filter.FilterMode; +import com.refinedmods.refinedstorage.platform.common.Platform; +import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil; import java.util.Set; @@ -16,13 +16,13 @@ import net.neoforged.neoforge.gametest.GameTestHolder; import net.neoforged.neoforge.gametest.PrefixGameTestTemplate; -import static com.refinedmods.refinedstorage2.platform.common.importer.ImporterTestPlots.prepareChest; -import static com.refinedmods.refinedstorage2.platform.common.importer.ImporterTestPlots.preparePlot; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.asResource; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.containerContainsExactly; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.insert; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.networkIsAvailable; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.storageContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.asResource; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.containerContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.insert; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.networkIsAvailable; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.storageContainsExactly; +import static com.refinedmods.refinedstorage.platform.common.importer.ImporterTestPlots.prepareChest; +import static com.refinedmods.refinedstorage.platform.common.importer.ImporterTestPlots.preparePlot; import static net.minecraft.world.item.Items.COBBLESTONE; import static net.minecraft.world.item.Items.DIAMOND_CHESTPLATE; import static net.minecraft.world.item.Items.DIRT; diff --git a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterTestPlots.java b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java similarity index 84% rename from refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterTestPlots.java rename to refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java index 44a9c357c..54ec0431d 100644 --- a/refinedstorage2-platform-forge/src/test/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterTestPlots.java +++ b/refinedstorage-platform-neoforge/src/test/java/com/refinedmods/refinedstorage/platform/common/importer/ImporterTestPlots.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.platform.common.importer; +package com.refinedmods.refinedstorage.platform.common.importer; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.FluidStorageType; +import com.refinedmods.refinedstorage.platform.common.storage.ItemStorageType; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -12,8 +12,8 @@ import net.minecraft.world.level.block.entity.BaseContainerBlockEntity; import org.apache.commons.lang3.function.TriConsumer; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.RSBLOCKS; -import static com.refinedmods.refinedstorage2.platform.forge.GameTestUtil.requireBlockEntity; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.RSBLOCKS; +import static com.refinedmods.refinedstorage.platform.common.GameTestUtil.requireBlockEntity; import static net.minecraft.core.BlockPos.ZERO; final class ImporterTestPlots { diff --git a/refinedstorage2-platform-forge/src/test/resources/data/refinedstorage2/structure/empty_15x15.nbt b/refinedstorage-platform-neoforge/src/test/resources/data/refinedstorage/structure/empty_15x15.nbt similarity index 100% rename from refinedstorage2-platform-forge/src/test/resources/data/refinedstorage2/structure/empty_15x15.nbt rename to refinedstorage-platform-neoforge/src/test/resources/data/refinedstorage/structure/empty_15x15.nbt diff --git a/refinedstorage-query-parser/build.gradle b/refinedstorage-query-parser/build.gradle new file mode 100644 index 000000000..9a1d982bf --- /dev/null +++ b/refinedstorage-query-parser/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'java-library' +} + +archivesBaseName = 'refinedstorage-query-parser' + +dependencies { + api project(':refinedstorage-core-api') + testImplementation libs.junit.api + testImplementation libs.junit.params + testRuntimeOnly libs.junit.engine + testImplementation libs.assertj +} + +test { + useJUnitPlatform() +} + +enableMutationTesting() +enableJavadoc() +enablePublishing() diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/Lexer.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/Lexer.java similarity index 98% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/Lexer.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/Lexer.java index dac5fac67..f038fffac 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/Lexer.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/Lexer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerException.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerException.java similarity index 85% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerException.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerException.java index b9b005e6d..3bfdef4ec 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerException.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerException.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; public class LexerException extends RuntimeException { private final transient TokenRange range; diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerPosition.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerPosition.java similarity index 94% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerPosition.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerPosition.java index 42a07e634..be4048389 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerPosition.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerPosition.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; public class LexerPosition { private int startIndex = 0; diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerTokenMapping.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerTokenMapping.java new file mode 100644 index 000000000..d81a18bfc --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerTokenMapping.java @@ -0,0 +1,5 @@ +package com.refinedmods.refinedstorage.query.lexer; + +public record LexerTokenMapping(String value, + TokenType type) { +} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerTokenMappings.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerTokenMappings.java similarity index 97% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerTokenMappings.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerTokenMappings.java index 402d42380..632bd133a 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerTokenMappings.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/LexerTokenMappings.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; import java.util.Set; import java.util.TreeSet; diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/Source.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/Source.java similarity index 77% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/Source.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/Source.java index d3760719f..7b3528521 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/Source.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/Source.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; public record Source(String name, String content) { @Override diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlightedCharacter.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlightedCharacter.java similarity index 89% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlightedCharacter.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlightedCharacter.java index 52fc66fad..130481015 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlightedCharacter.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlightedCharacter.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; public class SyntaxHighlightedCharacter { private final String character; diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlighter.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlighter.java similarity index 95% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlighter.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlighter.java index 570fa51bf..bf71cec71 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlighter.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlighter.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlighterColors.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlighterColors.java similarity index 95% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlighterColors.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlighterColors.java index 984021ed4..381327017 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlighterColors.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlighterColors.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; import java.util.EnumMap; import java.util.Map; diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/Token.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/Token.java similarity index 84% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/Token.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/Token.java index a1fc35ec1..6ba1d5eb4 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/Token.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/Token.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; public record Token(String content, TokenType type, TokenPosition position) { @Override diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenPosition.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenPosition.java similarity index 81% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenPosition.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenPosition.java index bc90756e5..9776c0ae5 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenPosition.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenPosition.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; public record TokenPosition(Source source, TokenRange range) { @Override diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenRange.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenRange.java similarity index 80% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenRange.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenRange.java index 9e45d0eca..c7300ebcb 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenRange.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenRange.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; public record TokenRange(int startLine, int startColumn, int endLine, int endColumn) { @Override diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenType.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenType.java new file mode 100644 index 000000000..2a19c5087 --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/TokenType.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.query.lexer; + +public enum TokenType { + INTEGER_NUMBER, + FLOATING_NUMBER, + IDENTIFIER, + PAREN_OPEN, + PAREN_CLOSE, + BIN_OP, + UNARY_OP +} diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/package-info.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/package-info.java new file mode 100644 index 000000000..ba559bfd9 --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/lexer/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.query.lexer; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Associativity.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Associativity.java new file mode 100644 index 000000000..93c83b513 --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Associativity.java @@ -0,0 +1,6 @@ +package com.refinedmods.refinedstorage.query.parser; + +public enum Associativity { + LEFT, + RIGHT +} diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Operator.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Operator.java new file mode 100644 index 000000000..0e524572e --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Operator.java @@ -0,0 +1,4 @@ +package com.refinedmods.refinedstorage.query.parser; + +public record Operator(int level, Associativity associativity) { +} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Parser.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Parser.java similarity index 88% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Parser.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Parser.java index 95b57d732..14b583868 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Parser.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/Parser.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.query.parser; - -import com.refinedmods.refinedstorage2.query.lexer.Token; -import com.refinedmods.refinedstorage2.query.lexer.TokenType; -import com.refinedmods.refinedstorage2.query.parser.node.BinOpNode; -import com.refinedmods.refinedstorage2.query.parser.node.LiteralNode; -import com.refinedmods.refinedstorage2.query.parser.node.Node; -import com.refinedmods.refinedstorage2.query.parser.node.ParenNode; -import com.refinedmods.refinedstorage2.query.parser.node.UnaryOpNode; +package com.refinedmods.refinedstorage.query.parser; + +import com.refinedmods.refinedstorage.query.lexer.Token; +import com.refinedmods.refinedstorage.query.lexer.TokenType; +import com.refinedmods.refinedstorage.query.parser.node.BinOpNode; +import com.refinedmods.refinedstorage.query.parser.node.LiteralNode; +import com.refinedmods.refinedstorage.query.parser.node.Node; +import com.refinedmods.refinedstorage.query.parser.node.ParenNode; +import com.refinedmods.refinedstorage.query.parser.node.UnaryOpNode; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/ParserException.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/ParserException.java new file mode 100644 index 000000000..ead6fba1e --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/ParserException.java @@ -0,0 +1,16 @@ +package com.refinedmods.refinedstorage.query.parser; + +import com.refinedmods.refinedstorage.query.lexer.Token; + +public class ParserException extends RuntimeException { + private final transient Token token; + + public ParserException(final String message, final Token token) { + super(message); + this.token = token; + } + + public Token getToken() { + return token; + } +} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/ParserOperatorMappings.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/ParserOperatorMappings.java similarity index 86% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/ParserOperatorMappings.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/ParserOperatorMappings.java index 26ef2fd2e..6b120a91a 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/ParserOperatorMappings.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/ParserOperatorMappings.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.query.parser; +package com.refinedmods.refinedstorage.query.parser; -import com.refinedmods.refinedstorage2.query.lexer.Token; +import com.refinedmods.refinedstorage.query.lexer.Token; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/BinOpNode.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/BinOpNode.java new file mode 100644 index 000000000..5dbc92463 --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/BinOpNode.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.query.parser.node; + +import com.refinedmods.refinedstorage.query.lexer.Token; + +public record BinOpNode(Node left, + Node right, + Token binOp) implements Node { + @Override + public String toString() { + return "(" + left + " " + binOp.content() + " " + right + ")"; + } +} diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/LiteralNode.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/LiteralNode.java new file mode 100644 index 000000000..782bb5c62 --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/LiteralNode.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.query.parser.node; + +import com.refinedmods.refinedstorage.query.lexer.Token; + +public record LiteralNode(Token token) implements Node { + @Override + public String toString() { + return token.content(); + } +} + diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/Node.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/Node.java new file mode 100644 index 000000000..da4304961 --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/Node.java @@ -0,0 +1,4 @@ +package com.refinedmods.refinedstorage.query.parser.node; + +public interface Node { +} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/ParenNode.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/ParenNode.java similarity index 82% rename from refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/ParenNode.java rename to refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/ParenNode.java index 85a5d583e..50a1ef664 100644 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/ParenNode.java +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/ParenNode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.parser.node; +package com.refinedmods.refinedstorage.query.parser.node; import java.util.List; import java.util.stream.Collectors; diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/UnaryOpNode.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/UnaryOpNode.java new file mode 100644 index 000000000..f8bb297fe --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/UnaryOpNode.java @@ -0,0 +1,10 @@ +package com.refinedmods.refinedstorage.query.parser.node; + +import com.refinedmods.refinedstorage.query.lexer.Token; + +public record UnaryOpNode(Node node, Token operator) implements Node { + @Override + public String toString() { + return operator.content() + node; + } +} diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/package-info.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/package-info.java new file mode 100644 index 000000000..66446f2af --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/node/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.query.parser.node; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/package-info.java b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/package-info.java new file mode 100644 index 000000000..d731d87f8 --- /dev/null +++ b/refinedstorage-query-parser/src/main/java/com/refinedmods/refinedstorage/query/parser/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.query.parser; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-query-parser/src/main/resources/fabric.mod.json b/refinedstorage-query-parser/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..0970459fb --- /dev/null +++ b/refinedstorage-query-parser/src/main/resources/fabric.mod.json @@ -0,0 +1,19 @@ +{ + "schemaVersion": 1, + "id": "refinedstorage-query-parser", + "version": "${version}", + "name": "Refined Storage Query Parser", + "authors": [ + "Refined Mods" + ], + "license": "MIT", + "environment": "*", + "custom": { + "modmenu": { + "parent": "refinedstorage", + "badges": [ + "library" + ] + } + } +} diff --git a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/lexer/LexerTest.java b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/LexerTest.java similarity index 96% rename from refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/lexer/LexerTest.java rename to refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/LexerTest.java index 5f825e05c..50cd0101e 100644 --- a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/lexer/LexerTest.java +++ b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/LexerTest.java @@ -1,12 +1,12 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; import java.util.List; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.query.lexer.TokenAssertions.assertPosition; -import static com.refinedmods.refinedstorage2.query.lexer.TokenAssertions.assertRange; -import static com.refinedmods.refinedstorage2.query.lexer.TokenAssertions.assertToken; +import static com.refinedmods.refinedstorage.query.lexer.TokenAssertions.assertPosition; +import static com.refinedmods.refinedstorage.query.lexer.TokenAssertions.assertRange; +import static com.refinedmods.refinedstorage.query.lexer.TokenAssertions.assertToken; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlighterTest.java b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlighterTest.java similarity index 98% rename from refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlighterTest.java rename to refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlighterTest.java index 544c4234b..d76615060 100644 --- a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/lexer/SyntaxHighlighterTest.java +++ b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/SyntaxHighlighterTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; import java.util.Arrays; import java.util.Collections; diff --git a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/lexer/TokenAssertions.java b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/TokenAssertions.java similarity index 96% rename from refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/lexer/TokenAssertions.java rename to refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/TokenAssertions.java index cfdbce04a..5a416f444 100644 --- a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/lexer/TokenAssertions.java +++ b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/lexer/TokenAssertions.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.query.lexer; +package com.refinedmods.refinedstorage.query.lexer; import static org.assertj.core.api.Assertions.assertThat; diff --git a/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserBuilder.java b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserBuilder.java new file mode 100644 index 000000000..5fb5326f2 --- /dev/null +++ b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserBuilder.java @@ -0,0 +1,39 @@ +package com.refinedmods.refinedstorage.query.parser; + +import com.refinedmods.refinedstorage.query.lexer.Source; +import com.refinedmods.refinedstorage.query.lexer.Token; +import com.refinedmods.refinedstorage.query.lexer.TokenPosition; +import com.refinedmods.refinedstorage.query.lexer.TokenRange; +import com.refinedmods.refinedstorage.query.lexer.TokenType; +import com.refinedmods.refinedstorage.query.parser.node.Node; + +import java.util.ArrayList; +import java.util.List; + +class ParserBuilder { + private static final TokenPosition DUMMY_POSITION = + new TokenPosition(new Source("", ""), new TokenRange(0, 0, 0, 0)); + + private static final ParserOperatorMappings OPERATOR_MAPPINGS = new ParserOperatorMappings() + .addBinaryOperator("=", new Operator(0, Associativity.RIGHT)) + .addBinaryOperator("||", new Operator(1, Associativity.LEFT)) + .addBinaryOperator("&&", new Operator(2, Associativity.LEFT)) + .addBinaryOperator("+", new Operator(3, Associativity.LEFT)) + .addBinaryOperator("-", new Operator(3, Associativity.LEFT)) + .addBinaryOperator("*", new Operator(4, Associativity.LEFT)) + .addBinaryOperator("/", new Operator(4, Associativity.LEFT)) + .addBinaryOperator("^", new Operator(5, Associativity.RIGHT)); + + private final List tokens = new ArrayList<>(); + + ParserBuilder token(final String content, final TokenType type) { + tokens.add(new Token(content, type, DUMMY_POSITION)); + return this; + } + + List getNodes() { + final Parser parser = new Parser(tokens, OPERATOR_MAPPINGS); + parser.parse(); + return parser.getNodes(); + } +} diff --git a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/parser/ParserTest.java b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserTest.java similarity index 98% rename from refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/parser/ParserTest.java rename to refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserTest.java index 020b13169..5f3001696 100644 --- a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/parser/ParserTest.java +++ b/refinedstorage-query-parser/src/test/java/com/refinedmods/refinedstorage/query/parser/ParserTest.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.query.parser; +package com.refinedmods.refinedstorage.query.parser; -import com.refinedmods.refinedstorage2.query.lexer.TokenType; -import com.refinedmods.refinedstorage2.query.parser.node.Node; +import com.refinedmods.refinedstorage.query.lexer.TokenType; +import com.refinedmods.refinedstorage.query.parser.node.Node; import java.util.List; diff --git a/refinedstorage-resource-api/build.gradle b/refinedstorage-resource-api/build.gradle new file mode 100644 index 000000000..cb1dda6b4 --- /dev/null +++ b/refinedstorage-resource-api/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'java-library' +} + +archivesBaseName = 'refinedstorage-resource-api' + +dependencies { + api libs.apiguardian + api project(":refinedstorage-core-api") + testImplementation libs.junit.api + testRuntimeOnly libs.junit.engine + testImplementation libs.assertj +} + +test { + useJUnitPlatform() +} + +enableMutationTesting() +enableJavadoc() +enablePublishing() diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/ResourceAmount.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/ResourceAmount.java similarity index 94% rename from refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/ResourceAmount.java rename to refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/ResourceAmount.java index d6227df99..5c6398c89 100644 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/ResourceAmount.java +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/ResourceAmount.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.resource; +package com.refinedmods.refinedstorage.api.resource; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.core.CoreValidations; import org.apiguardian.api.API; diff --git a/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/ResourceKey.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/ResourceKey.java new file mode 100644 index 000000000..4df463a35 --- /dev/null +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/ResourceKey.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.api.resource; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.4") +public interface ResourceKey { +} diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/Filter.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/Filter.java similarity index 90% rename from refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/Filter.java rename to refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/Filter.java index fd0dbb8b4..4768f8cd1 100644 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/Filter.java +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/Filter.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.resource.filter; +package com.refinedmods.refinedstorage.api.resource.filter; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.HashSet; import java.util.Set; diff --git a/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/FilterMode.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/FilterMode.java new file mode 100644 index 000000000..6a9174de0 --- /dev/null +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/FilterMode.java @@ -0,0 +1,9 @@ +package com.refinedmods.refinedstorage.api.resource.filter; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public enum FilterMode { + ALLOW, + BLOCK +} diff --git a/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/package-info.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/package-info.java new file mode 100644 index 000000000..5c7a07309 --- /dev/null +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/filter/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.resource.filter; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/AbstractProxyResourceList.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/AbstractProxyResourceList.java similarity index 84% rename from refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/AbstractProxyResourceList.java rename to refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/AbstractProxyResourceList.java index f3e927b8b..c7c6cd581 100644 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/AbstractProxyResourceList.java +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/AbstractProxyResourceList.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.resource.list; +package com.refinedmods.refinedstorage.api.resource.list; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.Collection; import java.util.Optional; diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceList.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/ResourceList.java similarity index 94% rename from refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceList.java rename to refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/ResourceList.java index 5515ccae2..7249e2a40 100644 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceList.java +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/ResourceList.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.resource.list; +package com.refinedmods.refinedstorage.api.resource.list; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.Collection; import java.util.Optional; diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceListImpl.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/ResourceListImpl.java similarity index 93% rename from refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceListImpl.java rename to refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/ResourceListImpl.java index 3ba666d75..f26778ec8 100644 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceListImpl.java +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/ResourceListImpl.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.resource.list; +package com.refinedmods.refinedstorage.api.resource.list; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.Collection; import java.util.HashMap; diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/ListenableResourceList.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/ListenableResourceList.java similarity index 84% rename from refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/ListenableResourceList.java rename to refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/ListenableResourceList.java index 8054799eb..91adadfb2 100644 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/ListenableResourceList.java +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/ListenableResourceList.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.resource.list.listenable; +package com.refinedmods.refinedstorage.api.resource.list.listenable; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.AbstractProxyResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.AbstractProxyResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; import java.util.HashSet; import java.util.Optional; diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/ResourceListListener.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/ResourceListListener.java similarity index 75% rename from refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/ResourceListListener.java rename to refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/ResourceListListener.java index 7b0a6accc..47be7f4bf 100644 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/ResourceListListener.java +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/ResourceListListener.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.resource.list.listenable; +package com.refinedmods.refinedstorage.api.resource.list.listenable; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; import org.apiguardian.api.API; diff --git a/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/package-info.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/package-info.java new file mode 100644 index 000000000..57aaeff33 --- /dev/null +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/listenable/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.resource.list.listenable; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/package-info.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/package-info.java new file mode 100644 index 000000000..f9f2098fa --- /dev/null +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/list/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.resource.list; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/package-info.java b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/package-info.java new file mode 100644 index 000000000..9d721cf13 --- /dev/null +++ b/refinedstorage-resource-api/src/main/java/com/refinedmods/refinedstorage/api/resource/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.resource; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-resource-api/src/main/resources/fabric.mod.json b/refinedstorage-resource-api/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..0a1733787 --- /dev/null +++ b/refinedstorage-resource-api/src/main/resources/fabric.mod.json @@ -0,0 +1,19 @@ +{ + "schemaVersion": 1, + "id": "refinedstorage-resource-api", + "version": "${version}", + "name": "Refined Storage Resource API", + "authors": [ + "Refined Mods" + ], + "license": "MIT", + "environment": "*", + "custom": { + "modmenu": { + "parent": "refinedstorage", + "badges": [ + "library" + ] + } + } +} diff --git a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/ResourceAmountTest.java b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/ResourceAmountTest.java similarity index 98% rename from refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/ResourceAmountTest.java rename to refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/ResourceAmountTest.java index 0802abbbb..b692225de 100644 --- a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/ResourceAmountTest.java +++ b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/ResourceAmountTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.resource; +package com.refinedmods.refinedstorage.api.resource; import org.junit.jupiter.api.Test; diff --git a/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/TestResource.java b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/TestResource.java new file mode 100644 index 000000000..996358103 --- /dev/null +++ b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/TestResource.java @@ -0,0 +1,7 @@ +package com.refinedmods.refinedstorage.api.resource; + +public enum TestResource implements ResourceKey { + A, + B, + C +} diff --git a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/filter/FilterTest.java b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/filter/FilterTest.java similarity index 92% rename from refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/filter/FilterTest.java rename to refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/filter/FilterTest.java index 232edb367..3159957f0 100644 --- a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/filter/FilterTest.java +++ b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/filter/FilterTest.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.api.resource.filter; +package com.refinedmods.refinedstorage.api.resource.filter; import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.api.resource.TestResource.A; -import static com.refinedmods.refinedstorage2.api.resource.TestResource.B; -import static com.refinedmods.refinedstorage2.api.resource.TestResource.C; +import static com.refinedmods.refinedstorage.api.resource.TestResource.A; +import static com.refinedmods.refinedstorage.api.resource.TestResource.B; +import static com.refinedmods.refinedstorage.api.resource.TestResource.C; import static org.assertj.core.api.Assertions.assertThat; class FilterTest { diff --git a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/AbstractResourceListTest.java b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/AbstractResourceListTest.java similarity index 98% rename from refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/AbstractResourceListTest.java rename to refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/AbstractResourceListTest.java index a00fae1d0..78e10ca3e 100644 --- a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/AbstractResourceListTest.java +++ b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/AbstractResourceListTest.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.resource.list; +package com.refinedmods.refinedstorage.api.resource.list; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.TestResource; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.TestResource; import java.util.ArrayList; import java.util.Collection; diff --git a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/ProxyResourceListTest.java b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/ProxyResourceListTest.java similarity index 78% rename from refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/ProxyResourceListTest.java rename to refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/ProxyResourceListTest.java index 527621ddd..326fb994f 100644 --- a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/ProxyResourceListTest.java +++ b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/ProxyResourceListTest.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.resource.list; +package com.refinedmods.refinedstorage.api.resource.list; class ProxyResourceListTest extends AbstractResourceListTest { @Override diff --git a/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/ResourceListImplTest.java b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/ResourceListImplTest.java new file mode 100644 index 000000000..7cf73397e --- /dev/null +++ b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/ResourceListImplTest.java @@ -0,0 +1,8 @@ +package com.refinedmods.refinedstorage.api.resource.list; + +class ResourceListImplTest extends AbstractResourceListTest { + @Override + protected ResourceList createList() { + return new ResourceListImpl(); + } +} diff --git a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/ListenableResourceListTest.java b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/listenable/ListenableResourceListTest.java similarity index 93% rename from refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/ListenableResourceListTest.java rename to refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/listenable/ListenableResourceListTest.java index 90a4d9274..d23729ea9 100644 --- a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/ListenableResourceListTest.java +++ b/refinedstorage-resource-api/src/test/java/com/refinedmods/refinedstorage/api/resource/list/listenable/ListenableResourceListTest.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.resource.list.listenable; +package com.refinedmods.refinedstorage.api.resource.list.listenable; -import com.refinedmods.refinedstorage2.api.resource.TestResource; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.resource.TestResource; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage-storage-api/build.gradle b/refinedstorage-storage-api/build.gradle new file mode 100644 index 000000000..c387e35df --- /dev/null +++ b/refinedstorage-storage-api/build.gradle @@ -0,0 +1,26 @@ +plugins { + id 'java-library' +} + +archivesBaseName = 'refinedstorage-storage-api' + +dependencies { + api libs.apiguardian + api project(':refinedstorage-resource-api') + api project(':refinedstorage-core-api') + implementation libs.slf4j.api + testImplementation libs.junit.api + testImplementation libs.junit.params + testRuntimeOnly libs.junit.engine + testRuntimeOnly libs.slf4j.impl + testImplementation libs.assertj + testImplementation libs.mockito +} + +test { + useJUnitPlatform() +} + +enableMutationTesting() +enableJavadoc() +enablePublishing() diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AbstractProxyStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/AbstractProxyStorage.java similarity index 79% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AbstractProxyStorage.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/AbstractProxyStorage.java index 984ee77ea..5bc90ffbe 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AbstractProxyStorage.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/AbstractProxyStorage.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.Collection; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AccessMode.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/AccessMode.java similarity index 90% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AccessMode.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/AccessMode.java index ecd274f71..66752a96e 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/AccessMode.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/AccessMode.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; import org.apiguardian.api.API; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/Actor.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/Actor.java similarity index 84% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/Actor.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/Actor.java index b223179ef..7ad932be8 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/Actor.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/Actor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; import org.apiguardian.api.API; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/EmptyActor.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/EmptyActor.java similarity index 87% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/EmptyActor.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/EmptyActor.java index f970bfda4..df96dbd5d 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/EmptyActor.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/EmptyActor.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; import org.apiguardian.api.API; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/ExtractableStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/ExtractableStorage.java similarity index 76% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/ExtractableStorage.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/ExtractableStorage.java index dbde6a734..ab055d7c9 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/ExtractableStorage.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/ExtractableStorage.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import org.apiguardian.api.API; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/InMemoryStorageImpl.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/InMemoryStorageImpl.java similarity index 81% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/InMemoryStorageImpl.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/InMemoryStorageImpl.java index dbdf0cb0b..6a558c8c3 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/InMemoryStorageImpl.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/InMemoryStorageImpl.java @@ -1,10 +1,10 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; import java.util.Collection; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/InsertableStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/InsertableStorage.java similarity index 76% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/InsertableStorage.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/InsertableStorage.java index df1519dc8..c8af25eb2 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/InsertableStorage.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/InsertableStorage.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import org.apiguardian.api.API; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/NoopStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/NoopStorage.java new file mode 100644 index 000000000..a4f94a6ea --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/NoopStorage.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.api.storage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +import java.util.Collection; +import java.util.Collections; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.3") +public class NoopStorage implements Storage { + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return 0; + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return 0; + } + + @Override + public Collection getAll() { + return Collections.emptyList(); + } + + @Override + public long getStored() { + return 0; + } +} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/StateTrackedStorage.java similarity index 87% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorage.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/StateTrackedStorage.java index 8b55c0f26..d67f795eb 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorage.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/StateTrackedStorage.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.api.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; +package com.refinedmods.refinedstorage.api.storage; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; import java.util.Collection; import java.util.Optional; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/Storage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/Storage.java similarity index 83% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/Storage.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/Storage.java index f561a613b..496e1ccd4 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/Storage.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/Storage.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; import org.apiguardian.api.API; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StorageState.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/StorageState.java similarity index 92% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StorageState.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/StorageState.java index 917882dae..61b896c35 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StorageState.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/StorageState.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; import org.apiguardian.api.API; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StorageView.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/StorageView.java similarity index 76% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StorageView.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/StorageView.java index 810caed76..dc242ae60 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/StorageView.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/StorageView.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import java.util.Collection; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/TrackedResourceAmount.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/TrackedResourceAmount.java new file mode 100644 index 000000000..262b9f649 --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/TrackedResourceAmount.java @@ -0,0 +1,12 @@ +package com.refinedmods.refinedstorage.api.storage; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; + +import javax.annotation.Nullable; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.0") +public record TrackedResourceAmount(ResourceAmount resourceAmount, @Nullable TrackedResource trackedResource) { +} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/TransferHelper.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/TransferHelper.java similarity index 95% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/TransferHelper.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/TransferHelper.java index 0cbcf5ad2..4d5fb9f84 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/TransferHelper.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/TransferHelper.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import javax.annotation.Nullable; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannel.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannel.java new file mode 100644 index 000000000..2a54a342e --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannel.java @@ -0,0 +1,67 @@ +package com.refinedmods.refinedstorage.api.storage.channel; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.listenable.ResourceListListener; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; + +import java.util.Optional; +import java.util.function.Predicate; + +import org.apiguardian.api.API; + +/** + * A storage channel is the entry-point for various storage operations. + * It acts as a storage, and is usually backed by a + * {@link com.refinedmods.refinedstorage.api.storage.composite.CompositeStorage}. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public interface StorageChannel extends Storage, TrackedStorage { + /** + * Adds a listener to the storage channel. + * + * @param listener the listener + */ + void addListener(ResourceListListener listener); + + /** + * Removes a listener from the storage channel. + * + * @param listener the listener + */ + void removeListener(ResourceListListener listener); + + /** + * @param resource the resource to retrieve + * @return the resource amount for the given resource, if present + */ + Optional get(ResourceKey resource); + + /** + * Sorts the sources in the backing storage. + */ + void sortSources(); + + /** + * Adds a source to the channel and resorts all the sources. + * + * @param source the source + */ + void addSource(Storage source); + + /** + * Removes a source from the channel. + * + * @param source the source + */ + void removeSource(Storage source); + + /** + * Checks if a source is present. + * + * @param matcher a predicate + * @return whether the predicate matched + */ + boolean hasSource(Predicate matcher); +} diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImpl.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImpl.java new file mode 100644 index 000000000..48882a351 --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImpl.java @@ -0,0 +1,95 @@ +package com.refinedmods.refinedstorage.api.storage.channel; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.resource.list.listenable.ListenableResourceList; +import com.refinedmods.refinedstorage.api.resource.list.listenable.ResourceListListener; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.composite.CompositeStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; + +import java.util.Collection; +import java.util.Optional; +import java.util.function.Predicate; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public class StorageChannelImpl implements StorageChannel { + protected final CompositeStorageImpl storage; + private final ListenableResourceList list; + + public StorageChannelImpl() { + this(new ResourceListImpl()); + } + + public StorageChannelImpl(final ResourceList list) { + this.list = new ListenableResourceList(list); + this.storage = new CompositeStorageImpl(this.list); + } + + @Override + public void sortSources() { + storage.sortSources(); + } + + @Override + public void addSource(final Storage source) { + storage.addSource(source); + } + + @Override + public void removeSource(final Storage source) { + storage.removeSource(source); + } + + @Override + public boolean hasSource(final Predicate matcher) { + return storage.getSources().stream().anyMatch(matcher); + } + + @Override + public void addListener(final ResourceListListener listener) { + list.addListener(listener); + } + + @Override + public void removeListener(final ResourceListListener listener) { + list.removeListener(listener); + } + + @Override + public Optional get(final ResourceKey resource) { + return list.get(resource); + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return storage.extract(resource, amount, action, actor); + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return storage.insert(resource, amount, action, actor); + } + + @Override + public Collection getAll() { + return storage.getAll(); + } + + @Override + public long getStored() { + return storage.getStored(); + } + + @Override + public Optional findTrackedResourceByActorType(final ResourceKey resource, + final Class actorType) { + return storage.findTrackedResourceByActorType(resource, actorType); + } +} diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/package-info.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/package-info.java new file mode 100644 index 000000000..b4779aeeb --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/channel/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.storage.channel; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeAwareChild.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeAwareChild.java similarity index 88% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeAwareChild.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeAwareChild.java index 154d25fb8..7c9f0e956 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeAwareChild.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeAwareChild.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; +package com.refinedmods.refinedstorage.api.storage.composite; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; import org.apiguardian.api.API; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorage.java similarity index 80% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorage.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorage.java index ae9749c6b..b87124628 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorage.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorage.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; +package com.refinedmods.refinedstorage.api.storage.composite; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; import java.util.List; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorageImpl.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImpl.java similarity index 92% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorageImpl.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImpl.java index c0dc06497..167538ab4 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorageImpl.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImpl.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; +package com.refinedmods.refinedstorage.api.storage.composite; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; import java.util.ArrayList; import java.util.Collection; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/ParentComposite.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/ParentComposite.java similarity index 85% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/ParentComposite.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/ParentComposite.java index 65bf96361..5db9f5e0e 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/ParentComposite.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/ParentComposite.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; +package com.refinedmods.refinedstorage.api.storage.composite; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Storage; import org.apiguardian.api.API; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PrioritizedStorageComparator.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PrioritizedStorageComparator.java similarity index 81% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PrioritizedStorageComparator.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PrioritizedStorageComparator.java index 35edd04de..c92d604e0 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PrioritizedStorageComparator.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PrioritizedStorageComparator.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; +package com.refinedmods.refinedstorage.api.storage.composite; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.Storage; import java.util.Comparator; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PriorityProvider.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PriorityProvider.java new file mode 100644 index 000000000..c30797e59 --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PriorityProvider.java @@ -0,0 +1,17 @@ +package com.refinedmods.refinedstorage.api.storage.composite; + +import org.apiguardian.api.API; + +/** + * Implement this on {@link com.refinedmods.refinedstorage.api.storage.Storage}s that have a priority that + * are contained in an {@link CompositeStorage}. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") +public interface PriorityProvider { + /** + * The priority. Higher priority storages will be inserted into and extracted from first. + * + * @return the priority + */ + int getPriority(); +} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PriorityStorage.java similarity index 77% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityStorage.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PriorityStorage.java index a31231b91..75d244def 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityStorage.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/PriorityStorage.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; +package com.refinedmods.refinedstorage.api.storage.composite; -import com.refinedmods.refinedstorage2.api.storage.AbstractProxyStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.AbstractProxyStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; import org.apiguardian.api.API; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/package-info.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/package-info.java new file mode 100644 index 000000000..c7c4e03ed --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/composite/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.storage.composite; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorage.java similarity index 89% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorage.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorage.java index feb518341..15e519539 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorage.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorage.java @@ -1,13 +1,13 @@ -package com.refinedmods.refinedstorage2.api.storage.external; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.composite.CompositeAwareChild; -import com.refinedmods.refinedstorage2.api.storage.composite.ParentComposite; +package com.refinedmods.refinedstorage.api.storage.external; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.composite.CompositeAwareChild; +import com.refinedmods.refinedstorage.api.storage.composite.ParentComposite; import java.util.Collection; import java.util.HashSet; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageListener.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageListener.java new file mode 100644 index 000000000..c42a67963 --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageListener.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.api.storage.external; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.5") +public interface ExternalStorageListener { + void beforeDetectChanges(ResourceKey resource, Actor actor); +} diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageProvider.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageProvider.java new file mode 100644 index 000000000..942210260 --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageProvider.java @@ -0,0 +1,14 @@ +package com.refinedmods.refinedstorage.api.storage.external; + +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.ExtractableStorage; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; + +import java.util.Iterator; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") +public interface ExternalStorageProvider extends InsertableStorage, ExtractableStorage { + Iterator iterator(); +} diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/package-info.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/package-info.java new file mode 100644 index 000000000..ae740e3ab --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/external/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.storage.external; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/LimitedStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/LimitedStorage.java new file mode 100644 index 000000000..afa1d669d --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/LimitedStorage.java @@ -0,0 +1,10 @@ +package com.refinedmods.refinedstorage.api.storage.limited; + +import com.refinedmods.refinedstorage.api.storage.Storage; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") +public interface LimitedStorage extends Storage { + long getCapacity(); +} diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/LimitedStorageImpl.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/LimitedStorageImpl.java new file mode 100644 index 000000000..c14b1a5cc --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/LimitedStorageImpl.java @@ -0,0 +1,55 @@ +package com.refinedmods.refinedstorage.api.storage.limited; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.AbstractProxyStorage; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.InsertableStorage; +import com.refinedmods.refinedstorage.api.storage.Storage; + +import org.apiguardian.api.API; + +/** + * This class can decorate any other {@link Storage} to add a capacity to it. + * {@link InsertableStorage#insert(com.refinedmods.refinedstorage.api.resource.ResourceKey, long, Action, Actor)} + * operations will respect this capacity. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.2") +public class LimitedStorageImpl extends AbstractProxyStorage implements LimitedStorage { + private final long capacity; + + /** + * @param delegate the storage that is being decorated + * @param capacity the capacity, must be 0 or larger than 0 + */ + public LimitedStorageImpl(final Storage delegate, final long capacity) { + super(delegate); + this.capacity = CoreValidations.validateNotNegative(capacity, "Capacity cannot be negative"); + } + + /** + * Constructs the limited storage with a {@link InMemoryStorageImpl} storage. + * + * @param capacity the capacity, must be 0 or larger than 0 + */ + public LimitedStorageImpl(final long capacity) { + this(new InMemoryStorageImpl(), capacity); + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + final long spaceRemaining = capacity - delegate.getStored(); + if (spaceRemaining == 0) { + return 0; + } + final long maxInsert = Math.min(amount, spaceRemaining); + return super.insert(resource, maxInsert, action, actor); + } + + @Override + public long getCapacity() { + return capacity; + } +} diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/package-info.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/package-info.java new file mode 100644 index 000000000..4af35ee75 --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/limited/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.storage.limited; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/package-info.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/package-info.java new file mode 100644 index 000000000..4bb6362a5 --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.storage; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/InMemoryTrackedStorageRepository.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/InMemoryTrackedStorageRepository.java similarity index 88% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/InMemoryTrackedStorageRepository.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/InMemoryTrackedStorageRepository.java index b9e6712bf..cc48296ab 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/InMemoryTrackedStorageRepository.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/InMemoryTrackedStorageRepository.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage.tracked; +package com.refinedmods.refinedstorage.api.storage.tracked; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; import java.util.HashMap; import java.util.Map; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedResource.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedResource.java similarity index 92% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedResource.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedResource.java index 138c10b4b..ebc4e1181 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedResource.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedResource.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.storage.tracked; +package com.refinedmods.refinedstorage.api.storage.tracked; import org.apiguardian.api.API; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorage.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorage.java new file mode 100644 index 000000000..1d64eab49 --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorage.java @@ -0,0 +1,24 @@ +package com.refinedmods.refinedstorage.api.storage.tracked; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; + +import java.util.Optional; + +import org.apiguardian.api.API; + +/** + * A storage that is able to track resources being modified. + */ +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") +public interface TrackedStorage extends Storage { + /** + * Finds the tracked resource by actor type. + * + * @param resource the resource + * @param actorType the actor type + * @return the tracked resource modified by the given actor type, if present + */ + Optional findTrackedResourceByActorType(ResourceKey resource, Class actorType); +} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageImpl.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImpl.java similarity index 84% rename from refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageImpl.java rename to refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImpl.java index 600ccd349..dea5584dd 100644 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageImpl.java +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImpl.java @@ -1,11 +1,11 @@ -package com.refinedmods.refinedstorage2.api.storage.tracked; +package com.refinedmods.refinedstorage.api.storage.tracked; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.AbstractProxyStorage; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.core.CoreValidations; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.AbstractProxyStorage; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; import java.util.Optional; import java.util.function.LongSupplier; diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageRepository.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageRepository.java new file mode 100644 index 000000000..1c396e7be --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageRepository.java @@ -0,0 +1,15 @@ +package com.refinedmods.refinedstorage.api.storage.tracked; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import java.util.Optional; + +import org.apiguardian.api.API; + +@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") +public interface TrackedStorageRepository { + void update(ResourceKey resource, Actor actor, long time); + + Optional findTrackedResourceByActorType(ResourceKey resource, Class actorType); +} diff --git a/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/package-info.java b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/package-info.java new file mode 100644 index 000000000..d193a2753 --- /dev/null +++ b/refinedstorage-storage-api/src/main/java/com/refinedmods/refinedstorage/api/storage/tracked/package-info.java @@ -0,0 +1,7 @@ +@ParametersAreNonnullByDefault +@FieldsAndMethodsAreNonnullByDefault +package com.refinedmods.refinedstorage.api.storage.tracked; + +import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage-storage-api/src/main/resources/fabric.mod.json b/refinedstorage-storage-api/src/main/resources/fabric.mod.json new file mode 100644 index 000000000..b7e49a488 --- /dev/null +++ b/refinedstorage-storage-api/src/main/resources/fabric.mod.json @@ -0,0 +1,19 @@ +{ + "schemaVersion": 1, + "id": "refinedstorage-storage-api", + "version": "${version}", + "name": "Refined Storage Storage API", + "authors": [ + "Refined Mods" + ], + "license": "MIT", + "environment": "*", + "custom": { + "modmenu": { + "parent": "refinedstorage", + "badges": [ + "library" + ] + } + } +} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/ActorCapturingStorage.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/ActorCapturingStorage.java similarity index 81% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/ActorCapturingStorage.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/ActorCapturingStorage.java index 2f57ce190..0ad6681d5 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/ActorCapturingStorage.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/ActorCapturingStorage.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; import java.util.ArrayList; import java.util.List; diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/FakeActors.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/FakeActors.java similarity index 90% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/FakeActors.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/FakeActors.java index 7242dceda..914cde273 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/FakeActors.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/FakeActors.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; public final class FakeActors { private FakeActors() { diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/InMemoryStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/InMemoryStorageImplTest.java similarity index 96% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/InMemoryStorageImplTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/InMemoryStorageImplTest.java index 7103ad9a9..0f7447f95 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/InMemoryStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/InMemoryStorageImplTest.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/LimitedStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/LimitedStorageImplTest.java similarity index 94% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/LimitedStorageImplTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/LimitedStorageImplTest.java index 15463034e..810f793a3 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/LimitedStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/LimitedStorageImplTest.java @@ -1,8 +1,8 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/ProxyStorageTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/ProxyStorageTest.java similarity index 94% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/ProxyStorageTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/ProxyStorageTest.java index 347df9139..cfb314432 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/ProxyStorageTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/ProxyStorageTest.java @@ -1,7 +1,7 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorageTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/StateTrackedStorageTest.java similarity index 95% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorageTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/StateTrackedStorageTest.java index bfdc6df44..243556d66 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/StateTrackedStorageTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/StateTrackedStorageTest.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; import java.util.stream.Stream; diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TestResource.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TestResource.java new file mode 100644 index 000000000..f6f2546de --- /dev/null +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TestResource.java @@ -0,0 +1,9 @@ +package com.refinedmods.refinedstorage.api.storage; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +public enum TestResource implements ResourceKey { + A, + B, + C +} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/TransferHelperTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TransferHelperTest.java similarity index 97% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/TransferHelperTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TransferHelperTest.java index 88ac349e0..ef7a787ba 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/TransferHelperTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/TransferHelperTest.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.api.storage; +package com.refinedmods.refinedstorage.api.storage; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import java.util.Objects; import java.util.stream.Stream; @@ -15,7 +15,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.A; +import static com.refinedmods.refinedstorage.api.storage.TestResource.A; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Named.named; diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannelImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java similarity index 90% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannelImplTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java index cf3f1c9cd..aac9d49cc 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannelImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/channel/StorageChannelImplTest.java @@ -1,15 +1,15 @@ -package com.refinedmods.refinedstorage2.api.storage.channel; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.listenable.ResourceListListener; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.composite.PriorityStorage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; +package com.refinedmods.refinedstorage.api.storage.channel; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.list.ResourceList; +import com.refinedmods.refinedstorage.api.resource.list.listenable.ResourceListListener; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.composite.PriorityStorage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; import java.util.Optional; @@ -19,8 +19,8 @@ import org.junit.jupiter.params.provider.EnumSource; import org.mockito.ArgumentCaptor; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.A; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.B; +import static com.refinedmods.refinedstorage.api.storage.TestResource.A; +import static com.refinedmods.refinedstorage.api.storage.TestResource.B; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atMost; diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImplTest.java similarity index 88% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorageImplTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImplTest.java index f8ccd870a..2086629f6 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/CompositeStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/CompositeStorageImplTest.java @@ -1,25 +1,25 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.FakeActors; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; +package com.refinedmods.refinedstorage.api.storage.composite; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.FakeActors; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedResource; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorage; +import com.refinedmods.refinedstorage.api.storage.tracked.TrackedStorageImpl; import java.util.concurrent.atomic.AtomicLong; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.A; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.B; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.C; +import static com.refinedmods.refinedstorage.api.storage.TestResource.A; +import static com.refinedmods.refinedstorage.api.storage.TestResource.B; +import static com.refinedmods.refinedstorage.api.storage.TestResource.C; import static org.assertj.core.api.Assertions.assertThat; class CompositeStorageImplTest { diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/ExtractCompositeStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/ExtractCompositeStorageImplTest.java similarity index 93% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/ExtractCompositeStorageImplTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/ExtractCompositeStorageImplTest.java index 17aff9ed1..576a54b49 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/ExtractCompositeStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/ExtractCompositeStorageImplTest.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ActorCapturingStorage; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.TestResource; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; +package com.refinedmods.refinedstorage.api.storage.composite; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ActorCapturingStorage; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.TestResource; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.A; +import static com.refinedmods.refinedstorage.api.storage.TestResource.A; import static org.assertj.core.api.Assertions.assertThat; class ExtractCompositeStorageImplTest { diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/InsertCompositeStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/InsertCompositeStorageImplTest.java similarity index 91% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/InsertCompositeStorageImplTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/InsertCompositeStorageImplTest.java index 361c86d0e..a71b35f5d 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/InsertCompositeStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/InsertCompositeStorageImplTest.java @@ -1,20 +1,20 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; +package com.refinedmods.refinedstorage.api.storage.composite; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ActorCapturingStorage; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.ActorCapturingStorage; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.A; +import static com.refinedmods.refinedstorage.api.storage.TestResource.A; import static org.assertj.core.api.Assertions.assertThat; class InsertCompositeStorageImplTest { diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/SubCompositeCompositeStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/SubCompositeCompositeStorageImplTest.java similarity index 85% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/SubCompositeCompositeStorageImplTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/SubCompositeCompositeStorageImplTest.java index c6c9d26f0..6bfff4f0c 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/composite/SubCompositeCompositeStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/composite/SubCompositeCompositeStorageImplTest.java @@ -1,17 +1,17 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; +package com.refinedmods.refinedstorage.api.storage.composite; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.list.ResourceListImpl; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; +import com.refinedmods.refinedstorage.api.storage.Storage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.A; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.B; +import static com.refinedmods.refinedstorage.api.storage.TestResource.A; +import static com.refinedmods.refinedstorage.api.storage.TestResource.B; import static org.assertj.core.api.Assertions.assertThat; class SubCompositeCompositeStorageImplTest { diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageProviderImpl.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageProviderImpl.java new file mode 100644 index 000000000..151337b5b --- /dev/null +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageProviderImpl.java @@ -0,0 +1,32 @@ +package com.refinedmods.refinedstorage.api.storage.external; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.Storage; + +import java.util.Iterator; + +class ExternalStorageProviderImpl implements ExternalStorageProvider { + private final Storage storage; + + ExternalStorageProviderImpl(final Storage storage) { + this.storage = storage; + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return storage.extract(resource, amount, action, actor); + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return storage.insert(resource, amount, action, actor); + } + + @Override + public Iterator iterator() { + return storage.getAll().iterator(); + } +} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageTest.java similarity index 94% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageTest.java index fa7c7d6ec..997476120 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalStorageTest.java @@ -1,21 +1,21 @@ -package com.refinedmods.refinedstorage2.api.storage.external; +package com.refinedmods.refinedstorage.api.storage.external; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.A; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.A_TRANSFORMED; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.B; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.B_TRANSFORMED; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.A; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.A_TRANSFORMED; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.B; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.B_TRANSFORMED; import static org.assertj.core.api.Assertions.assertThat; class ExternalStorageTest { diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalTestResource.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalTestResource.java new file mode 100644 index 000000000..7c9b853f1 --- /dev/null +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/ExternalTestResource.java @@ -0,0 +1,11 @@ +package com.refinedmods.refinedstorage.api.storage.external; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; + +enum ExternalTestResource implements ResourceKey { + A, + A_TRANSFORMED, + A_ALTERNATIVE, + B, + B_TRANSFORMED +} diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/SpyingExternalStorageListener.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/SpyingExternalStorageListener.java new file mode 100644 index 000000000..a1f77412b --- /dev/null +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/SpyingExternalStorageListener.java @@ -0,0 +1,18 @@ +package com.refinedmods.refinedstorage.api.storage.external; + +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.Actor; + +import java.util.ArrayList; +import java.util.List; + +class SpyingExternalStorageListener implements ExternalStorageListener { + public final List resources = new ArrayList<>(); + public final List actors = new ArrayList<>(); + + @Override + public void beforeDetectChanges(final ResourceKey resource, final Actor actor) { + resources.add(resource); + actors.add(actor); + } +} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/StorageChannelExternalStorageTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/StorageChannelExternalStorageTest.java similarity index 90% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/StorageChannelExternalStorageTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/StorageChannelExternalStorageTest.java index 8f6ec8624..ce320d947 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/StorageChannelExternalStorageTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/StorageChannelExternalStorageTest.java @@ -1,22 +1,22 @@ -package com.refinedmods.refinedstorage2.api.storage.external; +package com.refinedmods.refinedstorage.api.storage.external; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannelImpl; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceAmount; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.Storage; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannel; +import com.refinedmods.refinedstorage.api.storage.channel.StorageChannelImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.A; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.A_TRANSFORMED; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.B; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.B_TRANSFORMED; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.A; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.A_TRANSFORMED; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.B; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.B_TRANSFORMED; import static org.assertj.core.api.Assertions.assertThat; class StorageChannelExternalStorageTest { diff --git a/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/TransformingStorage.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/TransformingStorage.java new file mode 100644 index 000000000..54301376d --- /dev/null +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/external/TransformingStorage.java @@ -0,0 +1,39 @@ +package com.refinedmods.refinedstorage.api.storage.external; + +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.resource.ResourceKey; +import com.refinedmods.refinedstorage.api.storage.AbstractProxyStorage; +import com.refinedmods.refinedstorage.api.storage.Actor; +import com.refinedmods.refinedstorage.api.storage.InMemoryStorageImpl; + +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.A_ALTERNATIVE; +import static com.refinedmods.refinedstorage.api.storage.external.ExternalTestResource.A_TRANSFORMED; + +class TransformingStorage extends AbstractProxyStorage { + TransformingStorage() { + super(new InMemoryStorageImpl()); + } + + private ResourceKey transform(final ResourceKey resource) { + if (resource == ExternalTestResource.A) { + return A_TRANSFORMED; + } else if (resource == ExternalTestResource.B) { + return ExternalTestResource.B_TRANSFORMED; + } + return resource; + } + + @Override + public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + return super.insert(transform(resource), amount, action, actor); + } + + @Override + public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { + final long extracted = super.extract(resource, amount, action, actor); + if (resource == A_TRANSFORMED) { + super.extract(A_ALTERNATIVE, amount / 2, action, actor); + } + return extracted; + } +} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageImplTest.java b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java similarity index 96% rename from refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageImplTest.java rename to refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java index 04ff6254d..38820558d 100644 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageImplTest.java +++ b/refinedstorage-storage-api/src/test/java/com/refinedmods/refinedstorage/api/storage/tracked/TrackedStorageImplTest.java @@ -1,9 +1,9 @@ -package com.refinedmods.refinedstorage2.api.storage.tracked; +package com.refinedmods.refinedstorage.api.storage.tracked; -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.FakeActors; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; +import com.refinedmods.refinedstorage.api.core.Action; +import com.refinedmods.refinedstorage.api.storage.EmptyActor; +import com.refinedmods.refinedstorage.api.storage.FakeActors; +import com.refinedmods.refinedstorage.api.storage.limited.LimitedStorageImpl; import java.util.Optional; import java.util.concurrent.atomic.AtomicLong; @@ -15,8 +15,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.A; -import static com.refinedmods.refinedstorage2.api.storage.TestResource.B; +import static com.refinedmods.refinedstorage.api.storage.TestResource.A; +import static com.refinedmods.refinedstorage.api.storage.TestResource.B; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/refinedstorage2-core-api/build.gradle b/refinedstorage2-core-api/build.gradle deleted file mode 100644 index 9bad5a1ce..000000000 --- a/refinedstorage2-core-api/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage2-core-api' - -dependencies { - api libs.apiguardian - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/Action.java b/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/Action.java deleted file mode 100644 index 23041ff9c..000000000 --- a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/Action.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.refinedmods.refinedstorage2.api.core; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public enum Action { - SIMULATE, - EXECUTE -} diff --git a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/package-info.java b/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/package-info.java deleted file mode 100644 index a1a6c22ce..000000000 --- a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/component/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.core.component; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/package-info.java b/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/package-info.java deleted file mode 100644 index c6d1f9d87..000000000 --- a/refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.core; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-core-api/src/main/resources/fabric.mod.json b/refinedstorage2-core-api/src/main/resources/fabric.mod.json deleted file mode 100644 index e0056448d..000000000 --- a/refinedstorage2-core-api/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage2-core-api", - "version": "${version}", - "name": "Refined Storage 2 Core API", - "authors": [ - "Refined Mods" - ], - "license": "MIT", - "environment": "*", - "custom": { - "modmenu": { - "parent": "refinedstorage2", - "badges": [ - "library" - ] - } - } -} diff --git a/refinedstorage2-grid-api/build.gradle b/refinedstorage2-grid-api/build.gradle deleted file mode 100644 index 76b4faa44..000000000 --- a/refinedstorage2-grid-api/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage2-grid-api' - -dependencies { - api libs.apiguardian - api project(':refinedstorage2-resource-api') - api project(':refinedstorage2-core-api') - api project(':refinedstorage2-storage-api') - api project(':refinedstorage2-query-parser') - implementation libs.slf4j.api - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testRuntimeOnly libs.slf4j.impl - testImplementation libs.assertj - testImplementation libs.mockito -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/NoopGridOperations.java b/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/NoopGridOperations.java deleted file mode 100644 index 55d2257bb..000000000 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/NoopGridOperations.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.refinedmods.refinedstorage2.api.grid.operations; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; - -public class NoopGridOperations implements GridOperations { - @Override - public boolean extract(final ResourceKey resource, - final GridExtractMode extractMode, - final InsertableStorage destination) { - return false; - } - - @Override - public boolean insert(final ResourceKey resource, - final GridInsertMode insertMode, - final ExtractableStorage source) { - return false; - } -} diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/package-info.java b/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/package-info.java deleted file mode 100644 index f469b2dd1..000000000 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.grid.operations; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParser.java b/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParser.java deleted file mode 100644 index 72fb4665e..000000000 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/GridQueryParser.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.api.grid.query; - -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; - -import java.util.function.Predicate; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public interface GridQueryParser { - Predicate parse(String query) throws GridQueryParserException; -} diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/package-info.java b/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/package-info.java deleted file mode 100644 index e802dd8e9..000000000 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/query/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.grid.query; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/package-info.java b/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/package-info.java deleted file mode 100644 index 55e0c0f69..000000000 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.grid.view; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManager.java b/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManager.java deleted file mode 100644 index 02fe5aca5..000000000 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/GridWatcherManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage2.api.grid.watcher; - -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; - -import javax.annotation.Nullable; - -import org.apiguardian.api.API; - -/** - * This manager helps with attaching and detaching listeners to - * {@link com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel}s. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.3") -public interface GridWatcherManager { - void addWatcher(GridWatcher watcher, - Class actorType, - @Nullable StorageChannel storageChannel); - - void attachAll(@Nullable StorageChannel storageChannel); - - void removeWatcher(GridWatcher watcher, @Nullable StorageChannel storageChannel); - - void detachAll(StorageChannel storageChannel); - - void activeChanged(boolean active); -} diff --git a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/package-info.java b/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/package-info.java deleted file mode 100644 index 6b4f2d6b4..000000000 --- a/refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/watcher/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.grid.watcher; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-grid-api/src/main/resources/fabric.mod.json b/refinedstorage2-grid-api/src/main/resources/fabric.mod.json deleted file mode 100644 index bf3b44100..000000000 --- a/refinedstorage2-grid-api/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage2-grid-api", - "version": "${version}", - "name": "Refined Storage 2 Grid API", - "authors": [ - "Refined Mods" - ], - "license": "MIT", - "environment": "*", - "custom": { - "modmenu": { - "parent": "refinedstorage2", - "badges": [ - "library" - ] - } - } -} diff --git a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/TestResource.java b/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/TestResource.java deleted file mode 100644 index 1843f394f..000000000 --- a/refinedstorage2-grid-api/src/test/java/com/refinedmods/refinedstorage2/api/grid/TestResource.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.refinedmods.refinedstorage2.api.grid; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -public enum TestResource implements ResourceKey { - A, - B, - C, - D -} diff --git a/refinedstorage2-network-api/build.gradle b/refinedstorage2-network-api/build.gradle deleted file mode 100644 index af7d5aaa8..000000000 --- a/refinedstorage2-network-api/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage2-network-api' - -dependencies { - api libs.apiguardian - api project(':refinedstorage2-core-api') - api project(':refinedstorage2-resource-api') - api project(':refinedstorage2-storage-api') - api project(':refinedstorage2-grid-api') -} - -enableJavadoc() -enablePublishing() diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/ConnectionProvider.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/ConnectionProvider.java deleted file mode 100644 index f604c8b97..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/ConnectionProvider.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network; - -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; - -import java.util.List; -import java.util.Set; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public interface ConnectionProvider { - Connections findConnections(NetworkNodeContainer pivot, Set existingConnections); - - List sortDeterministically(Set containers); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/Network.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/Network.java deleted file mode 100644 index 1eaec0ac4..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/Network.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network; - -import com.refinedmods.refinedstorage2.api.core.component.ComponentAccessor; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; - -import java.util.Set; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public interface Network extends ComponentAccessor { - void addContainer(NetworkNodeContainer container); - - void removeContainer(NetworkNodeContainer container); - - void remove(); - - void split(Set networks); - - void merge(Network network); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyNetworkComponent.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyNetworkComponent.java deleted file mode 100644 index e9348891e..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/EnergyNetworkComponent.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.energy; - -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.1") -public interface EnergyNetworkComponent extends NetworkComponent, EnergyProvider { -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/package-info.java deleted file mode 100644 index 61321a3b2..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.energy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/NetworkNode.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/NetworkNode.java deleted file mode 100644 index 04caca23a..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/NetworkNode.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.node; - -import com.refinedmods.refinedstorage2.api.network.Network; - -import javax.annotation.Nullable; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public interface NetworkNode { - @Nullable - Network getNetwork(); - - void setNetwork(@Nullable Network network); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/NetworkNodeActor.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/NetworkNodeActor.java deleted file mode 100644 index 89a13971d..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/NetworkNodeActor.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.node; - -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") -public record NetworkNodeActor(NetworkNode networkNode) implements Actor { - @Override - public String getName() { - return networkNode.getClass().getName(); - } -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/container/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/container/package-info.java deleted file mode 100644 index 26ae6cb7c..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/container/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.node.container; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/exporter/ExporterTransferStrategy.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/exporter/ExporterTransferStrategy.java deleted file mode 100644 index 931008d22..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/exporter/ExporterTransferStrategy.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.node.exporter; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import org.apiguardian.api.API; - -/** - * A transfer strategy that transfers a resource from the network to a destination. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") -public interface ExporterTransferStrategy { - boolean transfer(ResourceKey resource, Actor actor, Network network); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/exporter/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/exporter/package-info.java deleted file mode 100644 index 20e36ce9b..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/exporter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.node.exporter; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/externalstorage/ExternalStorageProviderFactory.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/externalstorage/ExternalStorageProviderFactory.java deleted file mode 100644 index 8b1f3dc98..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/externalstorage/ExternalStorageProviderFactory.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.node.externalstorage; - -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; - -import java.util.Optional; - -import org.apiguardian.api.API; - -/** - * Provides the {@link com.refinedmods.refinedstorage2.api.storage.external.ExternalStorage} - * with an {@link ExternalStorageProvider}. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") -@FunctionalInterface -public interface ExternalStorageProviderFactory { - /** - * @return the external storage provider, if present - */ - Optional create(); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/externalstorage/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/externalstorage/package-info.java deleted file mode 100644 index 35a9531c7..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.node.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/importer/ImporterTransferStrategy.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/importer/ImporterTransferStrategy.java deleted file mode 100644 index e1a035e3c..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/importer/ImporterTransferStrategy.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.node.importer; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import org.apiguardian.api.API; - -/** - * An importer transfer strategy transfers resources from a source to the network. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") -public interface ImporterTransferStrategy { - boolean transfer(Filter filter, Actor actor, Network network); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/importer/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/importer/package-info.java deleted file mode 100644 index 10b88c6b8..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/importer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.node.importer; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/package-info.java deleted file mode 100644 index b09d5f074..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.node; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/Task.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/Task.java deleted file mode 100644 index a4a6bc30d..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/Task.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.node.task; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.11") -@FunctionalInterface -public interface Task { - boolean run(C context); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/package-info.java deleted file mode 100644 index 513967e50..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/node/task/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.node.task; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/package-info.java deleted file mode 100644 index b9852b33c..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/Permission.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/Permission.java deleted file mode 100644 index 83d8d54d9..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/Permission.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.security; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") -public interface Permission { -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityActor.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityActor.java deleted file mode 100644 index 07514890c..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityActor.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.security; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") -public interface SecurityActor { -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityNetworkComponent.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityNetworkComponent.java deleted file mode 100644 index e87cfa4b2..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/SecurityNetworkComponent.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.security; - -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") -public interface SecurityNetworkComponent extends NetworkComponent { - boolean isAllowed(Permission permission, SecurityActor actor); - - boolean contains(SecurityNetworkComponent component); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/package-info.java deleted file mode 100644 index 225161f99..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/security/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.security; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/StorageNetworkComponent.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/StorageNetworkComponent.java deleted file mode 100644 index 29a27ead8..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/StorageNetworkComponent.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.storage; - -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; - -import java.util.List; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.1") -public interface StorageNetworkComponent extends NetworkComponent, StorageChannel { - List getResources(Class actorType); - - boolean contains(Storage storage); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/StorageProvider.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/StorageProvider.java deleted file mode 100644 index ee7e1cad5..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/StorageProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.storage; - -import com.refinedmods.refinedstorage2.api.storage.Storage; - -import org.apiguardian.api.API; - -/** - * Implement this on {@link com.refinedmods.refinedstorage2.api.network.node.NetworkNode}s that can provide a storage - * to the network. - * Never modify a {@link com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel} - * from a {@link com.refinedmods.refinedstorage2.api.network.node.NetworkNode} directly. - * Use this interface to help you manage the lifecycle of your storage, to ensure that your storage is added or removed - * in the right cases. - * Use a {@link com.refinedmods.refinedstorage2.api.storage.composite.CompositeStorage} to conditionally enable/disable - * a provided {@link Storage}. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.2") -public interface StorageProvider { - /** - * This method is called when a {@link com.refinedmods.refinedstorage2.api.network.node.NetworkNode} is added or - * removed from a network. - * - * @return the storage - */ - Storage getStorage(); -} diff --git a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/package-info.java b/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/package-info.java deleted file mode 100644 index 8ed1419ba..000000000 --- a/refinedstorage2-network-api/src/main/java/com/refinedmods/refinedstorage2/api/network/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.storage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-api/src/main/resources/fabric.mod.json b/refinedstorage2-network-api/src/main/resources/fabric.mod.json deleted file mode 100644 index 71a9e64c9..000000000 --- a/refinedstorage2-network-api/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage2-network-api", - "version": "${version}", - "name": "Refined Storage 2 Network API", - "authors": [ - "Refined Mods" - ], - "license": "MIT", - "environment": "*", - "custom": { - "modmenu": { - "parent": "refinedstorage2", - "badges": [ - "library" - ] - } - } -} diff --git a/refinedstorage2-network-test/build.gradle b/refinedstorage2-network-test/build.gradle deleted file mode 100644 index fe53b5495..000000000 --- a/refinedstorage2-network-test/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage2-network-test' - -dependencies { - api project(':refinedstorage2-network-api') - api project(':refinedstorage2-network') - api project(':refinedstorage2-storage-api') - api project(':refinedstorage2-resource-api') - api project(':refinedstorage2-core-api') - api project(':refinedstorage2-grid-api') - implementation libs.junit.api - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTest.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTest.java deleted file mode 100644 index d7cc58db4..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test; - -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.exporter.ExporterNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.grid.GridNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayInputNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayOutputNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; -import com.refinedmods.refinedstorage2.network.test.nodefactory.ControllerNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.DetectorNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.ExporterNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.ExternalStorageNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.GridNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.ImporterNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.InterfaceNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.RelayInputNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.RelayOutputNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.SimpleNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.StorageNetworkNodeFactory; -import com.refinedmods.refinedstorage2.network.test.nodefactory.StorageTransferNetworkNodeFactory; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.junit.jupiter.api.extension.ExtendWith; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -@ExtendWith(NetworkTestExtension.class) -@RegisterNetworkNode(value = ControllerNetworkNodeFactory.class, clazz = ControllerNetworkNode.class) -@RegisterNetworkNode(value = StorageNetworkNodeFactory.class, clazz = StorageNetworkNode.class) -@RegisterNetworkNode(value = ExporterNetworkNodeFactory.class, clazz = ExporterNetworkNode.class) -@RegisterNetworkNode(value = GridNetworkNodeFactory.class, clazz = GridNetworkNode.class) -@RegisterNetworkNode(value = ImporterNetworkNodeFactory.class, clazz = ImporterNetworkNode.class) -@RegisterNetworkNode(value = SimpleNetworkNodeFactory.class, clazz = SimpleNetworkNode.class) -@RegisterNetworkNode(value = InterfaceNetworkNodeFactory.class, clazz = InterfaceNetworkNode.class) -@RegisterNetworkNode(value = ExternalStorageNetworkNodeFactory.class, clazz = ExternalStorageNetworkNode.class) -@RegisterNetworkNode(value = DetectorNetworkNodeFactory.class, clazz = DetectorNetworkNode.class) -@RegisterNetworkNode(value = RelayInputNetworkNodeFactory.class, clazz = RelayInputNetworkNode.class) -@RegisterNetworkNode(value = RelayOutputNetworkNodeFactory.class, clazz = RelayOutputNetworkNode.class) -@RegisterNetworkNode(value = StorageTransferNetworkNodeFactory.class, clazz = StorageTransferNetworkNode.class) -public @interface NetworkTest { -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTestFixtures.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTestFixtures.java deleted file mode 100644 index aa4a5a1c5..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/NetworkTestFixtures.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test; - -import com.refinedmods.refinedstorage2.api.core.component.ComponentMapFactory; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.impl.energy.EnergyNetworkComponentImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.GraphNetworkComponentImpl; -import com.refinedmods.refinedstorage2.api.network.impl.security.SecurityNetworkComponentImpl; -import com.refinedmods.refinedstorage2.api.network.impl.storage.StorageNetworkComponentImpl; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.network.test.fake.FakePermissions; - -import java.util.LinkedHashMap; - -public final class NetworkTestFixtures { - public static final ComponentMapFactory NETWORK_COMPONENT_MAP_FACTORY = - new ComponentMapFactory<>(); - - static { - NETWORK_COMPONENT_MAP_FACTORY.addFactory( - EnergyNetworkComponent.class, - network -> new EnergyNetworkComponentImpl() - ); - NETWORK_COMPONENT_MAP_FACTORY.addFactory( - GraphNetworkComponent.class, - GraphNetworkComponentImpl::new - ); - NETWORK_COMPONENT_MAP_FACTORY.addFactory( - StorageNetworkComponent.class, - network -> new StorageNetworkComponentImpl(new ResourceListImpl(new LinkedHashMap<>())) - ); - NETWORK_COMPONENT_MAP_FACTORY.addFactory( - SecurityNetworkComponent.class, - network -> new SecurityNetworkComponentImpl(SecurityPolicy.of(FakePermissions.ALLOW_BY_DEFAULT)) - ); - } - - private NetworkTestFixtures() { - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/RegisterNetworkNode.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/RegisterNetworkNode.java deleted file mode 100644 index 2ef70ac36..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/RegisterNetworkNode.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test; - -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.network.test.nodefactory.NetworkNodeFactory; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -@Repeatable(RegisterNetworkNodes.class) -public @interface RegisterNetworkNode { - Class value(); - - Class clazz(); -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeActor.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeActor.java deleted file mode 100644 index c746b2e03..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeActor.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.fake; - -import com.refinedmods.refinedstorage2.api.storage.Actor; - -public final class FakeActor implements Actor { - public static final FakeActor INSTANCE = new FakeActor(); - - private FakeActor() { - } - - @Override - public String getName() { - return "Fake"; - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakePermissions.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakePermissions.java deleted file mode 100644 index 8e8e42914..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakePermissions.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.fake; - -import com.refinedmods.refinedstorage2.api.network.security.Permission; - -public enum FakePermissions implements Permission { - ALLOW_BY_DEFAULT, OTHER, OTHER2 -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeResources.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeResources.java deleted file mode 100644 index 3a3f9faca..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeResources.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.fake; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -public enum FakeResources implements ResourceKey { - A, - A_ALTERNATIVE, - A_ALTERNATIVE2, - B, - B_ALTERNATIVE, - C, - D -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeSecurityActors.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeSecurityActors.java deleted file mode 100644 index c0852bf24..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/FakeSecurityActors.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.fake; - -import com.refinedmods.refinedstorage2.api.network.security.SecurityActor; - -public enum FakeSecurityActors implements SecurityActor { - A, B, C -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/package-info.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/package-info.java deleted file mode 100644 index c0900bc54..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/fake/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.network.test.fake; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ControllerNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ControllerNetworkNodeFactory.java deleted file mode 100644 index 4b2e9d739..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ControllerNetworkNodeFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class ControllerNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - return new ControllerNetworkNode(); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/DetectorNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/DetectorNetworkNodeFactory.java deleted file mode 100644 index 84bb4f968..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/DetectorNetworkNodeFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class DetectorNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - return new DetectorNetworkNode(getEnergyUsage(properties)); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ExporterNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ExporterNetworkNodeFactory.java deleted file mode 100644 index 785efded3..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ExporterNetworkNodeFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.exporter.ExporterNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class ExporterNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - return new ExporterNetworkNode(getEnergyUsage(properties)); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java deleted file mode 100644 index dab53f6ce..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ExternalStorageNetworkNodeFactory.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; -import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class ExternalStorageNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - final ExternalStorageNetworkNode externalStorage = new ExternalStorageNetworkNode( - getEnergyUsage(properties), - () -> 0L - ); - externalStorage.setTrackingRepository(new InMemoryTrackedStorageRepository()); - return externalStorage; - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/GridNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/GridNetworkNodeFactory.java deleted file mode 100644 index b44076bb4..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/GridNetworkNodeFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.grid.GridNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class GridNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - return new GridNetworkNode(getEnergyUsage(properties)); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ImporterNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ImporterNetworkNodeFactory.java deleted file mode 100644 index 95cd430c4..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/ImporterNetworkNodeFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class ImporterNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - return new ImporterNetworkNode(getEnergyUsage(properties)); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/InterfaceNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/InterfaceNetworkNodeFactory.java deleted file mode 100644 index 96a33ac88..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/InterfaceNetworkNodeFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class InterfaceNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - return new InterfaceNetworkNode(getEnergyUsage(properties)); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/NetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/NetworkNodeFactory.java deleted file mode 100644 index 9c45fd76a..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/NetworkNodeFactory.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -@FunctionalInterface -public interface NetworkNodeFactory { - NetworkNode create(AddNetworkNode ctx, Map properties); -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/RelayInputNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/RelayInputNetworkNodeFactory.java deleted file mode 100644 index a5a404150..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/RelayInputNetworkNodeFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayInputNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class RelayInputNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - return new RelayInputNetworkNode(getEnergyUsage(properties)); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/RelayOutputNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/RelayOutputNetworkNodeFactory.java deleted file mode 100644 index 5fe51e9f1..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/RelayOutputNetworkNodeFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayOutputNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class RelayOutputNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - return new RelayOutputNetworkNode(getEnergyUsage(properties)); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/SimpleNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/SimpleNetworkNodeFactory.java deleted file mode 100644 index 894ca653f..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/SimpleNetworkNodeFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class SimpleNetworkNodeFactory extends AbstractNetworkNodeFactory { - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - return new SimpleNetworkNode(getEnergyUsage(properties)); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/StorageNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/StorageNetworkNodeFactory.java deleted file mode 100644 index df47e8da8..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/StorageNetworkNodeFactory.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class StorageNetworkNodeFactory extends AbstractNetworkNodeFactory { - public static final String PROPERTY_ENERGY_USAGE_PER_STORAGE = "energy_usage_per_storage"; - public static final String PROPERTY_SIZE = "size"; - - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - final long energyUsagePerStorage = (long) properties.getOrDefault(PROPERTY_ENERGY_USAGE_PER_STORAGE, 0L); - final int size = (int) properties.getOrDefault(PROPERTY_SIZE, 9); - return new StorageNetworkNode( - getEnergyUsage(properties), - energyUsagePerStorage, - size - ); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/StorageTransferNetworkNodeFactory.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/StorageTransferNetworkNodeFactory.java deleted file mode 100644 index 3dc766bd3..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/StorageTransferNetworkNodeFactory.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; - -import java.util.Map; - -public class StorageTransferNetworkNodeFactory extends AbstractNetworkNodeFactory { - public static final String PROPERTY_ENERGY_USAGE_PER_STORAGE = "energy_usage_per_storage"; - public static final String PROPERTY_SIZE = "size"; - - @Override - protected AbstractNetworkNode innerCreate(final AddNetworkNode ctx, final Map properties) { - final long energyUsagePerStorage = (long) properties.getOrDefault(PROPERTY_ENERGY_USAGE_PER_STORAGE, 0L); - final int size = (int) properties.getOrDefault(PROPERTY_SIZE, 6); - return new StorageTransferNetworkNode( - getEnergyUsage(properties), - energyUsagePerStorage, - size - ); - } -} diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/package-info.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/package-info.java deleted file mode 100644 index 5a1af3014..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/nodefactory/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.network.test.nodefactory; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/package-info.java b/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/package-info.java deleted file mode 100644 index 66d4708cd..000000000 --- a/refinedstorage2-network-test/src/main/java/com/refinedmods/refinedstorage2/network/test/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.network.test; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/NetworkNodeFactoryTest.java b/refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/NetworkNodeFactoryTest.java deleted file mode 100644 index cff8bdbf9..000000000 --- a/refinedstorage2-network-test/src/test/java/com/refinedmods/refinedstorage2/network/test/NetworkNodeFactoryTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.refinedmods.refinedstorage2.network.test; - -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.controller.ControllerNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.exporter.ExporterNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.grid.GridNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayInputNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayOutputNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; - -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -@NetworkTest -@SetupNetwork -class NetworkNodeFactoryTest { - @AddNetworkNode - ControllerNetworkNode controller; - @AddNetworkNode - ExporterNetworkNode exporter; - @AddNetworkNode - GridNetworkNode grid; - @AddNetworkNode - ImporterNetworkNode importer; - @AddNetworkNode - SimpleNetworkNode simple; - @AddNetworkNode - StorageNetworkNode storage; - @AddNetworkNode - InterfaceNetworkNode interfaceNode; - @AddNetworkNode - ExternalStorageNetworkNode externalStorage; - @AddNetworkNode - DetectorNetworkNode detector; - @AddNetworkNode - RelayInputNetworkNode relayInput; - @AddNetworkNode - RelayOutputNetworkNode relayOutput; - @AddNetworkNode - StorageTransferNetworkNode storageTransfer; - - @Test - void testInitialization() { - // Assert - assertThat(this).hasNoNullFieldsOrProperties(); - } -} diff --git a/refinedstorage2-network/build.gradle b/refinedstorage2-network/build.gradle deleted file mode 100644 index 32cfed3fe..000000000 --- a/refinedstorage2-network/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage2-network' - -dependencies { - api project(':refinedstorage2-core-api') - api project(':refinedstorage2-network-api') - api project(':refinedstorage2-resource-api') - api project(':refinedstorage2-storage-api') - api project(':refinedstorage2-grid-api') - implementation libs.slf4j.api - testRuntimeOnly libs.slf4j.impl - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj - testImplementation libs.mockito - testImplementation project(':refinedstorage2-network-test') -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enablePublishing() diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkFactory.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkFactory.java deleted file mode 100644 index e03c4d389..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkFactory.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl; - -import com.refinedmods.refinedstorage2.api.core.component.ComponentMapFactory; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; - -public class NetworkFactory { - private final ComponentMapFactory componentMapFactory; - - public NetworkFactory(final ComponentMapFactory componentMapFactory) { - this.componentMapFactory = componentMapFactory; - } - - public Network create() { - return new NetworkImpl(componentMapFactory); - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkImpl.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkImpl.java deleted file mode 100644 index fd14afd8c..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/NetworkImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl; - -import com.refinedmods.refinedstorage2.api.core.component.ComponentMap; -import com.refinedmods.refinedstorage2.api.core.component.ComponentMapFactory; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; - -import java.util.Set; - -public class NetworkImpl implements Network { - private final ComponentMap componentMap; - - public NetworkImpl(final ComponentMapFactory componentMapFactory) { - this.componentMap = componentMapFactory.buildComponentMap(this); - } - - @Override - public void addContainer(final NetworkNodeContainer container) { - componentMap.getComponents().forEach(c -> c.onContainerAdded(container)); - } - - @Override - public void removeContainer(final NetworkNodeContainer container) { - componentMap.getComponents().forEach(c -> c.onContainerRemoved(container)); - } - - @Override - public void remove() { - componentMap.getComponents().forEach(NetworkComponent::onNetworkRemoved); - } - - @Override - public void split(final Set networks) { - componentMap.getComponents().forEach(c -> c.onNetworkSplit(networks)); - } - - @Override - public void merge(final Network network) { - componentMap.getComponents().forEach(c -> c.onNetworkMergedWith(network)); - } - - @Override - public I getComponent(final Class componentType) { - return componentMap.getComponent(componentType); - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/package-info.java deleted file mode 100644 index ee1a6d80d..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.energy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/container/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/container/package-info.java deleted file mode 100644 index 6f99cb202..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/container/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.container; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerEnergyState.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerEnergyState.java deleted file mode 100644 index 43272bc2b..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/ControllerEnergyState.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.controller; - -public enum ControllerEnergyState { - OFF, - NEARLY_ON, - ON, - NEARLY_OFF -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/package-info.java deleted file mode 100644 index f03a10cb7..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/controller/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.controller; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java deleted file mode 100644 index 84000d748..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/AbstractDetectorAmountStrategy.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.detector; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; - -public abstract class AbstractDetectorAmountStrategy implements DetectorAmountStrategy { - protected StorageChannel getStorageChannel(final Network network) { - return network.getComponent(StorageNetworkComponent.class); - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorAmountStrategy.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorAmountStrategy.java deleted file mode 100644 index 931249e0b..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorAmountStrategy.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.detector; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -public interface DetectorAmountStrategy { - long getAmount(Network network, ResourceKey configuredResource); -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorAmountStrategyImpl.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorAmountStrategyImpl.java deleted file mode 100644 index 02ad3a74d..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorAmountStrategyImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.detector; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -public class DetectorAmountStrategyImpl extends AbstractDetectorAmountStrategy { - @Override - public long getAmount(final Network network, final ResourceKey configuredResource) { - return getStorageChannel(network) - .get(configuredResource) - .map(ResourceAmount::getAmount) - .orElse(0L); - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorMode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorMode.java deleted file mode 100644 index 01539c01b..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/DetectorMode.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.detector; - -public enum DetectorMode { - UNDER, - EQUAL, - ABOVE -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/package-info.java deleted file mode 100644 index 20d6a8c1c..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/detector/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.detector; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/CompositeExporterTransferStrategy.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/CompositeExporterTransferStrategy.java deleted file mode 100644 index 354647488..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/CompositeExporterTransferStrategy.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.exporter; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import java.util.List; - -public class CompositeExporterTransferStrategy implements ExporterTransferStrategy { - private final List strategies; - - public CompositeExporterTransferStrategy(final List strategies) { - this.strategies = strategies; - } - - @Override - public boolean transfer(final ResourceKey resource, final Actor actor, final Network network) { - for (final ExporterTransferStrategy strategy : strategies) { - if (strategy.transfer(resource, actor, network)) { - return true; - } - } - return false; - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/package-info.java deleted file mode 100644 index ecc3d6749..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.exporter; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java deleted file mode 100644 index 7a9028ecb..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageNetworkNode.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.storage.NetworkNodeStorageConfiguration; -import com.refinedmods.refinedstorage2.api.network.impl.storage.StorageConfiguration; -import com.refinedmods.refinedstorage2.api.network.node.externalstorage.ExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.api.network.storage.StorageProvider; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageRepository; - -import java.util.function.LongSupplier; -import javax.annotation.Nullable; - -public class ExternalStorageNetworkNode extends AbstractNetworkNode implements StorageProvider { - private final long energyUsage; - private final StorageConfiguration storageConfiguration; - private final ExposedExternalStorage storage; - @Nullable - private ExternalStorage externalStorage; - - public ExternalStorageNetworkNode(final long energyUsage, final LongSupplier clock) { - this.energyUsage = energyUsage; - this.storageConfiguration = new NetworkNodeStorageConfiguration(this); - this.storage = new ExposedExternalStorage(storageConfiguration, clock); - } - - public StorageConfiguration getStorageConfiguration() { - return storageConfiguration; - } - - public void setTrackingRepository(final TrackedStorageRepository trackingRepository) { - storage.setTrackingRepository(trackingRepository); - } - - public void initialize(final ExternalStorageProviderFactory factory) { - storage.tryClearDelegate(); - factory.create().ifPresent(provider -> { - this.externalStorage = new ExternalStorage(provider, storage); - if (isActive()) { - setVisible(true); - } - }); - } - - @Override - protected void onActiveChanged(final boolean newActive) { - super.onActiveChanged(newActive); - setVisible(newActive); - } - - public boolean detectChanges() { - return storage.detectChanges(); - } - - @Override - public long getEnergyUsage() { - return energyUsage; - } - - @Override - public Storage getStorage() { - return storage; - } - - private void setVisible(final boolean visible) { - if (visible) { - if (externalStorage == null) { - return; - } - storage.setDelegate(externalStorage); - } else { - storage.tryClearDelegate(); - } - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/package-info.java deleted file mode 100644 index 5c7d3a7f1..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridNetworkNode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridNetworkNode.java deleted file mode 100644 index 14bd41a2e..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridNetworkNode.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.grid; - -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcherManager; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcherManagerImpl; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import javax.annotation.Nullable; - -import static java.util.Objects.requireNonNull; - -public class GridNetworkNode extends AbstractNetworkNode { - private final long energyUsage; - private final GridWatcherManager watchers = new GridWatcherManagerImpl(); - - public GridNetworkNode(final long energyUsage) { - this.energyUsage = energyUsage; - } - - @Override - public long getEnergyUsage() { - return energyUsage; - } - - public void addWatcher(final GridWatcher watcher, final Class actorType) { - watchers.addWatcher(watcher, actorType, requireNonNull(network).getComponent(StorageNetworkComponent.class)); - } - - public void removeWatcher(final GridWatcher watcher) { - watchers.removeWatcher(watcher, requireNonNull(network).getComponent(StorageNetworkComponent.class)); - } - - @Override - protected void onActiveChanged(final boolean newActive) { - super.onActiveChanged(newActive); - watchers.activeChanged(newActive); - } - - @Override - public void setNetwork(@Nullable final Network network) { - if (this.network != null) { - watchers.detachAll(this.network.getComponent(StorageNetworkComponent.class)); - } - super.setNetwork(network); - if (this.network != null) { - watchers.attachAll(this.network.getComponent(StorageNetworkComponent.class)); - } - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/package-info.java deleted file mode 100644 index 6e4b2986f..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.grid; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProvider.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProvider.java deleted file mode 100644 index 8c463256f..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/InterfaceExternalStorageProvider.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage; - -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; - -import javax.annotation.Nullable; - -public interface InterfaceExternalStorageProvider extends ExternalStorageProvider { - @Nullable - InterfaceNetworkNode getInterface(); -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/package-info.java deleted file mode 100644 index d1c083c7e..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/package-info.java deleted file mode 100644 index 42c689368..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.iface; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterNetworkNode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterNetworkNode.java deleted file mode 100644 index 75174753e..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterNetworkNode.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.importer; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNodeActor; -import com.refinedmods.refinedstorage2.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.function.UnaryOperator; - -public class ImporterNetworkNode extends AbstractNetworkNode { - private long energyUsage; - private final Filter filter = new Filter(); - private final Actor actor = new NetworkNodeActor(this); - private final List transferStrategies = new ArrayList<>(); - - public ImporterNetworkNode(final long energyUsage) { - this.energyUsage = energyUsage; - } - - public void setTransferStrategies(final List transferStrategies) { - this.transferStrategies.clear(); - this.transferStrategies.addAll(transferStrategies); - } - - @Override - public void doWork() { - super.doWork(); - if (network == null || !isActive()) { - return; - } - for (final ImporterTransferStrategy transferStrategy : transferStrategies) { - if (transferStrategy.transfer(filter, actor, network)) { - return; - } - } - } - - public FilterMode getFilterMode() { - return filter.getMode(); - } - - public void setFilterMode(final FilterMode mode) { - filter.setMode(mode); - } - - public void setNormalizer(final UnaryOperator normalizer) { - filter.setNormalizer(normalizer); - } - - public void setFilters(final Set filters) { - filter.setFilters(filters); - } - - public void setEnergyUsage(final long energyUsage) { - this.energyUsage = energyUsage; - } - - @Override - public long getEnergyUsage() { - return energyUsage; - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterSource.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterSource.java deleted file mode 100644 index d7d1a97ff..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/ImporterSource.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.importer; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; - -import java.util.Iterator; - -import org.apiguardian.api.API; - -/** - * Represents a source for the importer. - * A valid source for the importer needs to be an {@link ExtractableStorage}, so the resources can be extracted - * for insertion into the target network. - * A valid source for the importer needs to be a {@link InsertableStorage} as well, so that transfers that end up - * failing can be given back to the source. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") -public interface ImporterSource extends ExtractableStorage, InsertableStorage { - /** - * @return the resources that this source has - */ - Iterator getResources(); -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/package-info.java deleted file mode 100644 index 9c79e32da..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.importer; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/package-info.java deleted file mode 100644 index 17a58d912..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayComponentType.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayComponentType.java deleted file mode 100644 index c9ba9ddcf..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayComponentType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.relay; - -public enum RelayComponentType { - ENERGY, - SECURITY, - STORAGE -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/package-info.java deleted file mode 100644 index 9b2bc6065..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.relay; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/security/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/security/package-info.java deleted file mode 100644 index 777320ebd..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/security/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.security; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/ExposedStorage.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/ExposedStorage.java deleted file mode 100644 index 48a2104f7..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/ExposedStorage.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.storage; - -import com.refinedmods.refinedstorage2.api.network.impl.storage.AbstractImmutableConfiguredProxyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.storage.StorageConfiguration; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.composite.CompositeStorage; -import com.refinedmods.refinedstorage2.api.storage.composite.CompositeStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.composite.ParentComposite; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; - -import java.util.List; -import java.util.Optional; - -class ExposedStorage extends AbstractImmutableConfiguredProxyStorage implements CompositeStorage { - protected ExposedStorage(final StorageConfiguration config) { - super(config, new CompositeStorageImpl(new ResourceListImpl())); - } - - long getCapacity() { - final CompositeStorageImpl delegate = getUnsafeDelegate(); - if (delegate == null) { - return 0; - } - return delegate.getSources() - .stream() - .filter(LimitedStorage.class::isInstance) - .map(LimitedStorage.class::cast) - .mapToLong(LimitedStorage::getCapacity) - .sum(); - } - - @Override - public void sortSources() { - // no-op: cannot sort individual storages. - } - - @Override - public void addSource(final Storage source) { - getDelegate().addSource(source); - } - - @Override - public void removeSource(final Storage source) { - getDelegate().removeSource(source); - } - - @Override - public List getSources() { - return getDelegate().getSources(); - } - - @Override - public void clearSources() { - getDelegate().clearSources(); - } - - @Override - public Optional findTrackedResourceByActorType(final ResourceKey resource, - final Class actorType) { - return getDelegate().findTrackedResourceByActorType(resource, actorType); - } - - @Override - public void onAddedIntoComposite(final ParentComposite parentComposite) { - getDelegate().onAddedIntoComposite(parentComposite); - } - - @Override - public void onRemovedFromComposite(final ParentComposite parentComposite) { - getDelegate().onRemovedFromComposite(parentComposite); - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/package-info.java deleted file mode 100644 index 1b4393220..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.storage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferListener.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferListener.java deleted file mode 100644 index b4e34ced4..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer; - -@FunctionalInterface -public interface StorageTransferListener { - void onTransferSuccess(int index); -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferMode.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferMode.java deleted file mode 100644 index e431b2721..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/StorageTransferMode.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer; - -public enum StorageTransferMode { - INSERT_INTO_NETWORK, - EXTRACT_FROM_NETWORK -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/package-info.java deleted file mode 100644 index 6f817bc33..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/storagetransfer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/DefaultTaskExecutor.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/DefaultTaskExecutor.java deleted file mode 100644 index bc1cbc8e8..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/DefaultTaskExecutor.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.task; - -import com.refinedmods.refinedstorage2.api.network.node.task.Task; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; - -import java.util.List; - -public class DefaultTaskExecutor implements TaskExecutor { - @Override - public void execute(final List> tasks, final C context) { - for (final Task task : tasks) { - if (task.run(context)) { - return; - } - } - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/package-info.java deleted file mode 100644 index 8778daa29..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/task/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.node.task; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/package-info.java deleted file mode 100644 index cb7fcc18d..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/package-info.java deleted file mode 100644 index ea536fa20..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/security/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.security; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageConfiguration.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageConfiguration.java deleted file mode 100644 index f193264c9..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageConfiguration.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.storage; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.api.storage.composite.PriorityProvider; - -import java.util.Set; -import java.util.function.UnaryOperator; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") -public interface StorageConfiguration extends PriorityProvider { - AccessMode getAccessMode(); - - boolean isVoidExcess(); - - void setVoidExcess(boolean voidExcess); - - void setAccessMode(AccessMode accessMode); - - FilterMode getFilterMode(); - - boolean isAllowed(ResourceKey resource); - - void setFilters(Set filters); - - void setNormalizer(UnaryOperator normalizer); - - void setFilterMode(FilterMode filterMode); - - void setPriority(int priority); - - boolean isActive(); -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageNetworkComponentImpl.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageNetworkComponentImpl.java deleted file mode 100644 index 3fbe66dc0..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/StorageNetworkComponentImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.storage; - -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageProvider; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannelImpl; - -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class StorageNetworkComponentImpl extends StorageChannelImpl implements StorageNetworkComponent { - private static final Logger LOGGER = LoggerFactory.getLogger(StorageNetworkComponentImpl.class); - - public StorageNetworkComponentImpl(final ResourceList list) { - super(list); - } - - @Override - public void onContainerAdded(final NetworkNodeContainer container) { - if (container.getNode() instanceof StorageProvider provider) { - final Storage storage = provider.getStorage(); - LOGGER.debug("Adding source {} from provider {}", storage, provider); - addSource(storage); - } - } - - @Override - public void onContainerRemoved(final NetworkNodeContainer container) { - if (container.getNode() instanceof StorageProvider provider) { - final Storage storage = provider.getStorage(); - LOGGER.debug("Removing source {} of provider {}", storage, provider); - removeSource(storage); - } - } - - @Override - public List getResources(final Class actorType) { - return getAll().stream().map(resourceAmount -> new TrackedResourceAmount( - resourceAmount, - findTrackedResourceByActorType(resourceAmount.getResource(), actorType).orElse(null) - )).toList(); - } - - @Override - public boolean contains(final Storage storage) { - return this.storage.contains(storage); - } -} diff --git a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/package-info.java b/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/package-info.java deleted file mode 100644 index d9d432727..000000000 --- a/refinedstorage2-network/src/main/java/com/refinedmods/refinedstorage2/api/network/impl/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.network.impl.storage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-network/src/main/resources/fabric.mod.json b/refinedstorage2-network/src/main/resources/fabric.mod.json deleted file mode 100644 index 2864c268d..000000000 --- a/refinedstorage2-network/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage2-network", - "version": "${version}", - "name": "Refined Storage 2 Network", - "authors": [ - "Refined Mods" - ], - "license": "MIT", - "environment": "*", - "custom": { - "modmenu": { - "parent": "refinedstorage2", - "badges": [ - "library" - ] - } - } -} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/SimpleNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/SimpleNetworkNodeTest.java deleted file mode 100644 index cb3d53eb9..000000000 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/SimpleNetworkNodeTest.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkEnergyComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; - -import org.junit.jupiter.api.Test; - -import static com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; -import static com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ENERGY_USAGE; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; - -@NetworkTest -@SetupNetwork(energyStored = 10, energyCapacity = 100) -class SimpleNetworkNodeTest { - @AddNetworkNode(properties = { - @AddNetworkNode.Property(key = PROPERTY_ENERGY_USAGE, longValue = 10), - @AddNetworkNode.Property(key = PROPERTY_ACTIVE, boolValue = false) - }) - SimpleNetworkNode sut; - - @AddNetworkNode(networkId = "nonexistent") - SimpleNetworkNode sutWithoutNetwork; - - @Test - void testInitialState() { - // Assert - assertThat(sut.isActive()).isFalse(); - assertThat(sut.getNetwork()).isNotNull(); - assertThat(sut.getEnergyUsage()).isEqualTo(10); - - assertThat(sutWithoutNetwork.isActive()).isTrue(); - assertThat(sutWithoutNetwork.getNetwork()).isNull(); - } - - @Test - void shouldNotExtractEnergyWhenInactive(@InjectNetworkEnergyComponent final EnergyNetworkComponent energy) { - // Act - sut.doWork(); - - // Assert - assertThat(energy.getStored()).isEqualTo(10); - } - - @Test - void shouldNotExtractEnergyWithoutNetwork() { - // Act - assertDoesNotThrow(sutWithoutNetwork::doWork); - } - - @Test - void shouldExtractEnergy(@InjectNetworkEnergyComponent final EnergyNetworkComponent energy) { - // Arrange - sut.setActive(true); - - // Act - sut.doWork(); - - // Assert - assertThat(energy.getStored()).isZero(); - } - - @Test - void shouldSetEnergyUsage(@InjectNetworkEnergyComponent final EnergyNetworkComponent energy) { - // Arrange - sut.setActive(true); - sut.setEnergyUsage(2); - - // Act - sut.doWork(); - - // Assert - assertThat(energy.getStored()).isEqualTo(8); - } -} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RandomExporterNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RandomExporterNetworkNodeTest.java deleted file mode 100644 index 8c78adcb9..000000000 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RandomExporterNetworkNodeTest.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.exporter; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.task.RandomTaskExecutor; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; - -import java.util.List; - -import org.junit.jupiter.api.Test; - -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static org.assertj.core.api.Assertions.assertThat; - -class RandomExporterNetworkNodeTest extends AbstractExporterNetworkNodeTest { - @Override - protected TaskExecutor createTaskExecutor() { - return new RandomTaskExecutor<>(list -> { - list.clear(); - list.add(sut.new TaskImpl(A)); - list.add(sut.new TaskImpl(B)); - }); - } - - @Test - void shouldTransfer(@InjectNetworkStorageComponent final StorageNetworkComponent storage) { - // Arrange - storage.addSource(new InMemoryStorageImpl()); - storage.insert(A, 100, Action.EXECUTE, EmptyActor.INSTANCE); - storage.insert(B, 100, Action.EXECUTE, EmptyActor.INSTANCE); - - final Storage destination = new InMemoryStorageImpl(); - final ExporterTransferStrategy strategy = createTransferStrategy(destination, 5); - - sut.setTransferStrategy(strategy); - sut.setFilters(List.of(B, A)); - - // Act & assert - sut.doWork(); - - assertThat(storage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( - new ResourceAmount(A, 95), - new ResourceAmount(B, 100) - ); - assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new ResourceAmount(A, 5) - ); - - sut.doWork(); - - assertThat(storage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( - new ResourceAmount(A, 90), - new ResourceAmount(B, 100) - ); - assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new ResourceAmount(A, 10) - ); - } - - @Test - void shouldUseNextResourceIfFirstOneIsNotAvailableInSameCycle( - @InjectNetworkStorageComponent final StorageNetworkComponent storage - ) { - // Arrange - storage.addSource(new InMemoryStorageImpl()); - storage.insert(B, 7, Action.EXECUTE, EmptyActor.INSTANCE); - - final Storage destination = new InMemoryStorageImpl(); - final ExporterTransferStrategy strategy = createTransferStrategy(destination, 10); - - sut.setTransferStrategy(strategy); - sut.setFilters(List.of(A, B)); - - // Act & assert - sut.doWork(); - - assertThat(storage.getAll()).isEmpty(); - assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( - new ResourceAmount(B, 7) - ); - - sut.doWork(); - - assertThat(storage.getAll()).isEmpty(); - assertThat(destination.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( - new ResourceAmount(B, 7) - ); - } -} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageProviderFactoryImpl.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageProviderFactoryImpl.java deleted file mode 100644 index ef9b2f787..000000000 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/ExternalStorageProviderFactoryImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage; - -import com.refinedmods.refinedstorage2.api.network.node.externalstorage.ExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; - -import java.util.Optional; - -public record ExternalStorageProviderFactoryImpl(ExternalStorageProvider provider) - implements ExternalStorageProviderFactory { - @Override - public Optional create() { - return Optional.of(provider); - } -} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/StorageExternalStorageProvider.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/StorageExternalStorageProvider.java deleted file mode 100644 index b3e79b8c3..000000000 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/externalstorage/StorageExternalStorageProvider.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; - -import java.util.Iterator; - -public class StorageExternalStorageProvider implements ExternalStorageProvider { - private final Storage storage; - - public StorageExternalStorageProvider(final Storage storage) { - this.storage = storage; - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return storage.extract(resource, amount, action, actor); - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return storage.insert(resource, amount, action, actor); - } - - @Override - public Iterator iterator() { - return storage.getAll().iterator(); - } -} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/SelfIoInterfaceExternalStorageProviderImplTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/SelfIoInterfaceExternalStorageProviderImplTest.java deleted file mode 100644 index 12e5d5f7e..000000000 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/iface/externalstorage/SelfIoInterfaceExternalStorageProviderImplTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.iface.externalstorage; - -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.node.externalstorage.ExternalStorageProviderFactoryImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceExportStateImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.iface.InterfaceNetworkNode; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.B; -import static org.assertj.core.api.Assertions.assertThat; - -@NetworkTest -@SetupNetwork -class SelfIoInterfaceExternalStorageProviderImplTest { - @AddNetworkNode - InterfaceNetworkNode iface; - InterfaceExportStateImpl exportState; - @AddNetworkNode - ExternalStorageNetworkNode connection; - - @BeforeEach - void setUp() { - exportState = new InterfaceExportStateImpl(2); - iface.setExportState(exportState); - iface.setTransferQuotaProvider(resource -> 100); - connection.initialize(new ExternalStorageProviderFactoryImpl(new InterfaceExternalStorageProviderImpl(iface))); - } - - // We don't allow self-insertions and self-extractions for the same reasons mentioned in - // IoLoopInterfaceExternalStorageProviderImplTest. - @Test - void shouldNotAllowSelfInsertionOrSelfExtraction( - @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage - ) { - // Arrange - // this would try to do a self-insert as it's an unwanted resource. - exportState.setCurrentlyExported(0, B, 15); - // this would try to do a self-extract because we have the resource. - exportState.setRequestedResource(1, B, 1); - - // Act - iface.doWork(); - connection.detectChanges(); - - // Assert - assertThat(exportState.getExportedResource(0)).isEqualTo(B); - assertThat(exportState.getExportedAmount(0)).isEqualTo(15); - - assertThat(exportState.getExportedResource(1)).isNull(); - assertThat(exportState.getExportedAmount(1)).isZero(); - - assertThat(networkStorage.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new ResourceAmount(B, 15) - ); - } -} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/FakeImporterSource.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/FakeImporterSource.java deleted file mode 100644 index 463d52f00..000000000 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/importer/FakeImporterSource.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.importer; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -public class FakeImporterSource implements ImporterSource { - private final List resources; - private final InMemoryStorageImpl storage = new InMemoryStorageImpl(); - - public FakeImporterSource(final ResourceKey... resources) { - this.resources = Arrays.stream(resources).toList(); - } - - public FakeImporterSource add(final ResourceKey resource, final long amount) { - storage.insert(resource, amount, Action.EXECUTE, EmptyActor.INSTANCE); - return this; - } - - @Override - public Iterator getResources() { - return resources.iterator(); - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - // Extract a maximum of 5 to ensure that we try to extract multiple times from different slots. - return storage.extract(resource, Math.min(amount, 5), action, actor); - } - - public Collection getAll() { - return storage.getAll(); - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return storage.insert(resource, amount, action, actor); - } -} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java deleted file mode 100644 index 60e88ae80..000000000 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/relay/RelayEnergyNetworkNodeTest.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.relay; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetwork; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkEnergyComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkSecurityComponent; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; -import com.refinedmods.refinedstorage2.network.test.fake.FakePermissions; -import com.refinedmods.refinedstorage2.network.test.fake.FakeSecurityActors; - -import java.util.Set; - -import org.junit.jupiter.api.Test; - -import static com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayNetworkNodeTest.addSecurityPolicy; -import static com.refinedmods.refinedstorage2.api.network.impl.node.relay.RelayNetworkNodeTest.addStorageSource; -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static com.refinedmods.refinedstorage2.network.test.nodefactory.AbstractNetworkNodeFactory.PROPERTY_ACTIVE; -import static org.assertj.core.api.Assertions.assertThat; - -@NetworkTest -@SetupNetwork(id = "input") -@SetupNetwork(id = "output", setupEnergy = false) -class RelayEnergyNetworkNodeTest { - @AddNetworkNode(properties = { - @AddNetworkNode.Property(key = PROPERTY_ACTIVE, boolValue = false) - }, networkId = "input") - private RelayInputNetworkNode input; - - @AddNetworkNode(networkId = "output") - private RelayOutputNetworkNode output; - - @Test - void shouldPassEnergyComponent( - @InjectNetworkEnergyComponent(networkId = "input") final EnergyNetworkComponent inputEnergy, - @InjectNetworkSecurityComponent(networkId = "input") final SecurityNetworkComponent inputSecurity, - @InjectNetworkStorageComponent(networkId = "input") final StorageNetworkComponent inputStorage, - @InjectNetworkEnergyComponent(networkId = "output") final EnergyNetworkComponent outputEnergy, - @InjectNetworkSecurityComponent(networkId = "output") final SecurityNetworkComponent outputSecurity, - @InjectNetworkStorageComponent(networkId = "output") final StorageNetworkComponent outputStorage - ) { - // Arrange - input.setActive(true); - input.setOutputNode(output); - - addSecurityPolicy(inputSecurity, FakePermissions.OTHER); - addStorageSource(inputStorage); - - final long originalStored = inputEnergy.getStored(); - - // Act - input.setComponentTypes(Set.of(RelayComponentType.ENERGY)); - final long extracted = output.extract(10); - - // Assert - assertThat(extracted).isEqualTo(10); - assertThat(outputEnergy.getCapacity()).isEqualTo(inputEnergy.getCapacity()); - assertThat(outputEnergy.getStored()).isEqualTo(originalStored - 10); - assertThat(outputSecurity.isAllowed(FakePermissions.ALLOW_BY_DEFAULT, FakeSecurityActors.A)).isTrue(); - assertThat(outputSecurity.isAllowed(FakePermissions.OTHER, FakeSecurityActors.A)).isFalse(); - assertThat(outputStorage.getAll()).isEmpty(); - assertThat(outputStorage.insert(A, 1, Action.EXECUTE, EmptyActor.INSTANCE)).isZero(); - assertThat(input.hasComponentType(RelayComponentType.ENERGY)).isTrue(); - assertThat(input.hasComponentType(RelayComponentType.SECURITY)).isFalse(); - assertThat(input.hasComponentType(RelayComponentType.STORAGE)).isFalse(); - } - - @Test - @SetupNetwork(id = "cycle_input", energyStored = 1, energyCapacity = 2) - @SetupNetwork(id = "cycle_input_alt", energyStored = 3, energyCapacity = 4) - void shouldDetectEnergyCycles( - @InjectNetwork("cycle_input") final Network inputNetwork, - @InjectNetworkEnergyComponent(networkId = "cycle_input") final EnergyNetworkComponent inputEnergy, - @InjectNetwork("cycle_input_alt") final Network inputAlternativeNetwork, - @InjectNetworkEnergyComponent(networkId = "cycle_input_alt") final EnergyNetworkComponent inputAlternativeEnergy - ) { - // Arrange - final RelayOutputNetworkNode cycleOutput = new RelayOutputNetworkNode(0); - cycleOutput.setEnergyDelegate(inputAlternativeEnergy); - cycleOutput.setNetwork(inputNetwork); - inputNetwork.addContainer(() -> cycleOutput); - - final RelayOutputNetworkNode cycleOutputAlternative = new RelayOutputNetworkNode(0); - cycleOutputAlternative.setEnergyDelegate(inputEnergy); - cycleOutputAlternative.setNetwork(inputAlternativeNetwork); - inputAlternativeNetwork.addContainer(() -> cycleOutputAlternative); - - // Assert - assertThat(inputEnergy.getStored()).isEqualTo(1); - assertThat(inputAlternativeEnergy.getStored()).isEqualTo(3); - - assertThat(inputEnergy.getCapacity()).isEqualTo(2); - assertThat(inputAlternativeEnergy.getCapacity()).isEqualTo(4); - - assertThat(inputEnergy.extract(10)).isEqualTo(1); - assertThat(inputAlternativeEnergy.extract(10)).isEqualTo(3); - } -} diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java deleted file mode 100644 index af1a17426..000000000 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/storage/PriorityStorageNetworkNodeTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.refinedmods.refinedstorage2.api.network.impl.node.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.ProviderImpl; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.network.test.AddNetworkNode; -import com.refinedmods.refinedstorage2.network.test.InjectNetworkStorageComponent; -import com.refinedmods.refinedstorage2.network.test.NetworkTest; -import com.refinedmods.refinedstorage2.network.test.SetupNetwork; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - -import static com.refinedmods.refinedstorage2.network.test.fake.FakeResources.A; -import static org.assertj.core.api.Assertions.assertThat; - -@NetworkTest -@SetupNetwork -class PriorityStorageNetworkNodeTest { - @AddNetworkNode - StorageNetworkNode a; - - @AddNetworkNode - StorageNetworkNode b; - - ProviderImpl provider; - - @BeforeEach - void setUp() { - provider = new ProviderImpl(); - } - - @ParameterizedTest - @ValueSource(booleans = {true, false}) - void shouldRespectPriority( - final boolean storageAHasPriority, - @InjectNetworkStorageComponent final StorageNetworkComponent networkStorage - ) { - // Arrange - final Storage storage1 = new LimitedStorageImpl(100); - final ProviderImpl provider1 = new ProviderImpl(); - provider1.set(1, storage1); - a.setProvider(provider1); - a.setActive(true); - - final Storage storage2 = new LimitedStorageImpl(100); - final ProviderImpl provider2 = new ProviderImpl(); - provider2.set(1, storage2); - b.setProvider(provider2); - b.setActive(true); - - if (storageAHasPriority) { - a.getStorageConfiguration().setPriority(5); - b.getStorageConfiguration().setPriority(2); - } else { - a.getStorageConfiguration().setPriority(2); - b.getStorageConfiguration().setPriority(5); - } - - // Act - networkStorage.insert(A, 1, Action.EXECUTE, EmptyActor.INSTANCE); - - // Assert - if (storageAHasPriority) { - assertThat(storage1.getAll()).isNotEmpty(); - assertThat(storage2.getAll()).isEmpty(); - } else { - assertThat(storage1.getAll()).isEmpty(); - assertThat(storage2.getAll()).isNotEmpty(); - } - } -} diff --git a/refinedstorage2-platform-api/build.gradle b/refinedstorage2-platform-api/build.gradle deleted file mode 100644 index 89d14ae0c..000000000 --- a/refinedstorage2-platform-api/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'java-library' -} - -commonProject() - -archivesBaseName = 'refinedstorage2-platform-api' - -dependencies { - api libs.apiguardian - api project(':refinedstorage2-core-api') - api project(':refinedstorage2-storage-api') - api project(':refinedstorage2-resource-api') - api project(':refinedstorage2-network-api') - api project(':refinedstorage2-grid-api') - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj - testImplementation libs.equalsverifier -} - -test { - useJUnitPlatform() -} - -enableJavadoc() -enablePublishing() diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java deleted file mode 100644 index ffec6dfd1..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api; - -import com.refinedmods.refinedstorage2.api.core.component.ComponentMapFactory; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHints; -import com.refinedmods.refinedstorage2.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.security.BuiltinPermissions; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItemHelper; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage2.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceProvider; -import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.api.upgrade.BuiltinUpgradeDestinations; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; - -import java.util.Collection; -import java.util.Optional; -import java.util.Set; -import java.util.function.Supplier; -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public interface PlatformApi { - PlatformApi INSTANCE = new PlatformApiProxy(); - - PlatformRegistry getStorageTypeRegistry(); - - StorageRepository getClientStorageRepository(); - - StorageRepository getStorageRepository(Level level); - - StorageContainerItemHelper getStorageContainerItemHelper(); - - PlatformRegistry getResourceTypeRegistry(); - - PlatformRegistry getImporterTransferStrategyRegistry(); - - PlatformRegistry getExporterTransferStrategyRegistry(); - - void addExternalStorageProviderFactory(PlatformExternalStorageProviderFactory factory); - - Collection getExternalStorageProviderFactories(); - - Collection getDestructorStrategyFactories(); - - void addDestructorStrategyFactory(DestructorStrategyFactory factory); - - Collection getConstructorStrategyFactories(); - - void addConstructorStrategyFactory(ConstructorStrategyFactory factory); - - void addStorageMonitorExtractionStrategy(StorageMonitorExtractionStrategy strategy); - - StorageMonitorExtractionStrategy getStorageMonitorExtractionStrategy(); - - void addStorageMonitorInsertionStrategy(StorageMonitorInsertionStrategy strategy); - - StorageMonitorInsertionStrategy getStorageMonitorInsertionStrategy(); - - ComponentMapFactory getNetworkComponentMapFactory(); - - PlatformRegistry getGridSynchronizerRegistry(); - - UpgradeRegistry getUpgradeRegistry(); - - BuiltinUpgradeDestinations getBuiltinUpgradeDestinations(); - - InWorldNetworkNodeContainer createInWorldNetworkNodeContainer(BlockEntity blockEntity, - NetworkNode node, - String name, - int priority, - ConnectionLogic connectionLogic, - @Nullable Supplier keyProvider); - - void onNetworkNodeContainerInitialized(InWorldNetworkNodeContainer container, - @Nullable Level level, - @Nullable Runnable callback); - - void onNetworkNodeContainerRemoved(InWorldNetworkNodeContainer container, @Nullable Level level); - - void onNetworkNodeContainerUpdated(InWorldNetworkNodeContainer container, @Nullable Level level); - - GridInsertionStrategy createGridInsertionStrategy(AbstractContainerMenu containerMenu, - ServerPlayer player, - Grid grid); - - void addGridInsertionStrategyFactory(GridInsertionStrategyFactory insertionStrategyFactory); - - void addAlternativeGridInsertionHint(GridInsertionHint hint); - - GridInsertionHints getGridInsertionHints(); - - GridExtractionStrategy createGridExtractionStrategy(AbstractContainerMenu containerMenu, - ServerPlayer player, - Grid grid); - - void addGridExtractionStrategyFactory(GridExtractionStrategyFactory extractionStrategyFactory); - - GridScrollingStrategy createGridScrollingStrategy(AbstractContainerMenu containerMenu, - ServerPlayer player, - Grid grid); - - void addGridScrollingStrategyFactory(GridScrollingStrategyFactory scrollingStrategyFactory); - - void addResourceFactory(ResourceFactory factory); - - ResourceFactory getItemResourceFactory(); - - StorageType getItemStorageType(); - - ResourceFactory getFluidResourceFactory(); - - StorageType getFluidStorageType(); - - Set getAlternativeResourceFactories(); - - void registerResourceRendering(Class resourceClass, ResourceRendering rendering); - - ResourceRendering getResourceRendering(ResourceKey resource); - - void addIngredientConverter(RecipeModIngredientConverter converter); - - RecipeModIngredientConverter getIngredientConverter(); - - void addWirelessTransmitterRangeModifier(WirelessTransmitterRangeModifier rangeModifier); - - WirelessTransmitterRangeModifier getWirelessTransmitterRangeModifier(); - - Optional getEnergyStorage(ItemStack stack); - - EnergyItemHelper getEnergyItemHelper(); - - EnergyStorage asItemEnergyStorage(EnergyStorage energyStorage, ItemStack stack); - - EnergyStorage asBlockItemEnergyStorage( - EnergyStorage energyStorage, - ItemStack stack, - BlockEntityType blockEntityType - ); - - NetworkBoundItemHelper getNetworkBoundItemHelper(); - - PlatformRegistry getSlotReferenceFactoryRegistry(); - - void addSlotReferenceProvider(SlotReferenceProvider slotReferenceProvider); - - SlotReference createInventorySlotReference(Player player, InteractionHand hand); - - void useNetworkBoundItem(Player player, Item... items); - - BuiltinPermissions getBuiltinPermissions(); - - PlatformRegistry getPermissionRegistry(); - - SecurityPolicy createDefaultSecurityPolicy(); - - void sendNoPermissionToOpenMessage(ServerPlayer player, Component target); - - void sendNoPermissionMessage(ServerPlayer player, Component message); - - boolean canPlaceNetworkNode(ServerPlayer player, Level level, BlockPos pos, BlockState state); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/package-info.java deleted file mode 100644 index 096af66d9..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.configurationcard; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/ConstructorStrategy.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/ConstructorStrategy.java deleted file mode 100644 index c5daaf2cc..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/ConstructorStrategy.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.constructordestructor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import net.minecraft.world.entity.player.Player; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.11") -@FunctionalInterface -public interface ConstructorStrategy { - boolean apply(ResourceKey resource, Actor actor, Player actingPlayer, Network network); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/package-info.java deleted file mode 100644 index cdb81c84a..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.constructordestructor; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/ExporterTransferStrategyFactory.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/ExporterTransferStrategyFactory.java deleted file mode 100644 index 153e5f9f4..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/ExporterTransferStrategyFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.exporter; - -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") -@FunctionalInterface -public interface ExporterTransferStrategyFactory { - ExporterTransferStrategy create( - ServerLevel level, - BlockPos pos, - Direction direction, - UpgradeState upgradeState, - AmountOverride amountOverride, - boolean fuzzyMode - ); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/package-info.java deleted file mode 100644 index 8c0e409db..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.exporter; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/Grid.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/Grid.java deleted file mode 100644 index 79a2b36b3..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/Grid.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; - -import java.util.List; - -import net.minecraft.server.level.ServerPlayer; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.0") -public interface Grid { - void addWatcher(GridWatcher watcher, Class actorType); - - void removeWatcher(GridWatcher watcher); - - Storage getItemStorage(); - - boolean isGridActive(); - - List getResources(Class actorType); - - GridOperations createOperations(ResourceType resourceType, ServerPlayer player); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridResourceAttributeKeys.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridResourceAttributeKeys.java deleted file mode 100644 index f360f8a14..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridResourceAttributeKeys.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid; - -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceAttributeKey; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") -public enum GridResourceAttributeKeys implements GridResourceAttributeKey { - MOD_ID, - MOD_NAME, - TAGS, - TOOLTIP -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridScrollMode.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridScrollMode.java deleted file mode 100644 index 652978b93..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridScrollMode.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid; - -public enum GridScrollMode { - GRID_TO_INVENTORY, - INVENTORY_TO_GRID, - GRID_TO_CURSOR -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/package-info.java deleted file mode 100644 index 924c4a766..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.grid; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategy.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategy.java deleted file mode 100644 index b53bf0a1c..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategy.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid.strategy; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") -public interface GridExtractionStrategy { - boolean onExtract(PlatformResourceKey resource, GridExtractMode extractMode, boolean cursor); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategyFactory.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategyFactory.java deleted file mode 100644 index 5b5a5340a..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategyFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid.strategy; - -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") -@FunctionalInterface -public interface GridExtractionStrategyFactory { - GridExtractionStrategy create(AbstractContainerMenu containerMenu, ServerPlayer player, Grid grid); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategy.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategy.java deleted file mode 100644 index ef606ff6f..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategy.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid.strategy; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") -public interface GridInsertionStrategy { - boolean onInsert(GridInsertMode insertMode, boolean tryAlternatives); - - boolean onTransfer(int slotIndex); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategyFactory.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategyFactory.java deleted file mode 100644 index fe11f125a..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategyFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid.strategy; - -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") -@FunctionalInterface -public interface GridInsertionStrategyFactory { - GridInsertionStrategy create(AbstractContainerMenu containerMenu, ServerPlayer player, Grid grid); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategy.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategy.java deleted file mode 100644 index a3d4adf96..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategy.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid.strategy; - -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") -public interface GridScrollingStrategy { - boolean onScroll(PlatformResourceKey resource, GridScrollMode scrollMode, int slotIndex); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategyFactory.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategyFactory.java deleted file mode 100644 index f67268b0d..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategyFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid.strategy; - -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") -@FunctionalInterface -public interface GridScrollingStrategyFactory { - GridScrollingStrategy create(AbstractContainerMenu containerMenu, ServerPlayer player, Grid grid); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/package-info.java deleted file mode 100644 index ec1631346..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/PlatformGridResource.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/PlatformGridResource.java deleted file mode 100644 index 52c77f607..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/PlatformGridResource.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.grid.view; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; - -import java.util.List; -import java.util.Optional; -import javax.annotation.Nullable; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.network.chat.Component; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.6") -public interface PlatformGridResource extends GridResource { - void onExtract(GridExtractMode extractMode, - boolean cursor, - GridExtractionStrategy extractionStrategy); - - void onScroll(GridScrollMode scrollMode, - GridScrollingStrategy scrollingStrategy); - - void render(GuiGraphics graphics, int x, int y); - - String getDisplayedAmount(); - - String getAmountInTooltip(); - - List getTooltip(); - - Optional getTooltipImage(); - - int getRegistryId(); - - List getExtractionHints(); - - @Nullable - PlatformResourceKey getUnderlyingResource(); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/package-info.java deleted file mode 100644 index 8303cec5a..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.grid.view; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/ImporterTransferStrategyFactory.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/ImporterTransferStrategyFactory.java deleted file mode 100644 index 9f15f1da9..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/ImporterTransferStrategyFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.importer; - -import com.refinedmods.refinedstorage2.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") -@FunctionalInterface -public interface ImporterTransferStrategyFactory { - ImporterTransferStrategy create( - ServerLevel level, - BlockPos pos, - Direction direction, - UpgradeState upgradeState, - AmountOverride amountOverride - ); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/package-info.java deleted file mode 100644 index 33f2b92a9..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.importer; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/package-info.java deleted file mode 100644 index c8167653a..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/PlatformSecurityNetworkComponent.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/PlatformSecurityNetworkComponent.java deleted file mode 100644 index 6b70ea03d..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/PlatformSecurityNetworkComponent.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.security; - -import com.refinedmods.refinedstorage2.api.network.security.Permission; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; - -import net.minecraft.server.level.ServerPlayer; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.5") -public interface PlatformSecurityNetworkComponent extends SecurityNetworkComponent { - boolean isAllowed(Permission permission, ServerPlayer player); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/package-info.java deleted file mode 100644 index 256520c96..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/security/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.security; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/SerializableStorage.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/SerializableStorage.java deleted file mode 100644 index 57732b1e4..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/SerializableStorage.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; - -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; - -import com.mojang.serialization.Codec; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") -public interface SerializableStorage extends Storage { - StorageType getType(); - - static Codec getCodec(final Runnable listener) { - return PlatformApi.INSTANCE.getStorageTypeRegistry() - .codec() - .dispatch(SerializableStorage::getType, storage -> storage.getMapCodec(listener)); - } -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageInfo.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageInfo.java deleted file mode 100644 index c5dd83fc3..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/StorageInfo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.storage; - -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.2") -public record StorageInfo(long stored, long capacity) { - public static final StorageInfo UNKNOWN = new StorageInfo(0, 0); - - public static StorageInfo of(final Storage storage) { - return new StorageInfo( - storage.getStored(), - storage instanceof LimitedStorage limitedStorage ? limitedStorage.getCapacity() : 0L - ); - } -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/channel/FuzzyStorageChannel.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/channel/FuzzyStorageChannel.java deleted file mode 100644 index f0f70efea..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/channel/FuzzyStorageChannel.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.storage.channel; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; - -import java.util.Collection; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") -public interface FuzzyStorageChannel extends StorageChannel { - Collection getFuzzy(ResourceKey resource); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/channel/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/channel/package-info.java deleted file mode 100644 index d48125407..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/channel/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.storage.channel; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java deleted file mode 100644 index 1a5d81545..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/externalstorage/PlatformExternalStorageProviderFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; - -import java.util.Optional; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") -public interface PlatformExternalStorageProviderFactory { - Optional create(ServerLevel level, BlockPos pos, Direction direction); - - default int getPriority() { - return 0; - } -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/externalstorage/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/externalstorage/package-info.java deleted file mode 100644 index dbe45c708..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/package-info.java deleted file mode 100644 index 26377fe85..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.storage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java deleted file mode 100644 index bec67bec2..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/StorageMonitorExtractionStrategy.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.storagemonitor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import net.minecraft.world.entity.player.Player; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") -@FunctionalInterface -public interface StorageMonitorExtractionStrategy { - boolean extract(ResourceKey resource, boolean fullStack, Player player, Actor actor, Network network); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java deleted file mode 100644 index 81c609ed2..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/StorageMonitorInsertionStrategy.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.storagemonitor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import java.util.Optional; - -import net.minecraft.world.item.ItemStack; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") -@FunctionalInterface -public interface StorageMonitorInsertionStrategy { - Optional insert(ResourceKey configuredResource, ItemStack stack, Actor actor, Network network); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/package-info.java deleted file mode 100644 index 2c9aac42f..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/storagemonitor/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.storagemonitor; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/TransferableBlockEntityEnergy.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/TransferableBlockEntityEnergy.java deleted file mode 100644 index 94b4fe065..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/TransferableBlockEntityEnergy.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.energy; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") -public interface TransferableBlockEntityEnergy { - EnergyStorage getEnergyStorage(); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/package-info.java deleted file mode 100644 index 1fc4d620d..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.support.energy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/InWorldNetworkNodeContainer.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/InWorldNetworkNodeContainer.java deleted file mode 100644 index a72eb59b8..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/InWorldNetworkNodeContainer.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network; - -import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.GlobalPos; -import net.minecraft.world.level.block.state.BlockState; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.1") -public interface InWorldNetworkNodeContainer extends NetworkNodeContainer, ConnectionLogic { - BlockState getBlockState(); - - boolean isRemoved(); - - GlobalPos getPosition(); - - BlockPos getLocalPosition(); - - String getName(); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/NetworkNodeContainerBlockEntity.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/NetworkNodeContainerBlockEntity.java deleted file mode 100644 index 9dd1856bd..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/NetworkNodeContainerBlockEntity.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.security.SecurityHelper; - -import java.util.Set; - -import net.minecraft.server.level.ServerPlayer; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.6") -@FunctionalInterface -public interface NetworkNodeContainerBlockEntity { - Set getContainers(); - - default boolean canBuild(final ServerPlayer player) { - return SecurityHelper.isAllowed(player, PlatformApi.INSTANCE.getBuiltinPermissions().build(), getContainers()); - } -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemSession.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemSession.java deleted file mode 100644 index 65508a695..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemSession.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem; - -import com.refinedmods.refinedstorage2.api.network.Network; - -import java.util.Optional; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.1") -public interface NetworkBoundItemSession { - Optional resolveNetwork(); - - boolean isActive(); - - void drainEnergy(long amount); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java deleted file mode 100644 index 265881940..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/NetworkBoundItemTargetBlockEntity.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem; - -import com.refinedmods.refinedstorage2.api.network.Network; - -import javax.annotation.Nullable; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.6") -public interface NetworkBoundItemTargetBlockEntity { - @Nullable - Network getNetworkForBoundItem(); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/package-info.java deleted file mode 100644 index 37fef92f0..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/package-info.java deleted file mode 100644 index ae0088977..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/network/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.support.network; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/package-info.java deleted file mode 100644 index 03921a727..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.support; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/package-info.java deleted file mode 100644 index 14281e814..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/registry/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.support.registry; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/FuzzyModeNormalizer.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/FuzzyModeNormalizer.java deleted file mode 100644 index 0411ca36a..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/FuzzyModeNormalizer.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.resource; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.3") -public interface FuzzyModeNormalizer { - ResourceKey normalize(); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/PlatformResourceKey.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/PlatformResourceKey.java deleted file mode 100644 index b12fe2831..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/PlatformResourceKey.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.resource; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.4") -public interface PlatformResourceKey extends ResourceKey { - long getInterfaceExportLimit(); - - ResourceType getResourceType(); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceFactory.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceFactory.java deleted file mode 100644 index 5d37f2177..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.resource; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -import java.util.Optional; - -import net.minecraft.world.item.ItemStack; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.13") -public interface ResourceFactory { - Optional create(ItemStack stack); - - boolean isValid(ResourceKey resource); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceType.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceType.java deleted file mode 100644 index f91131952..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/ResourceType.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.resource; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; - -import java.util.Optional; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.resources.ResourceLocation; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.4") -public interface ResourceType { - MapCodec getMapCodec(); - - Codec getCodec(); - - StreamCodec getStreamCodec(); - - MutableComponent getTitle(); - - ResourceLocation getTextureIdentifier(); - - int getXTexture(); - - int getYTexture(); - - long normalizeAmount(double amount); - - double getDisplayAmount(long amount); - - Optional toGridResource(ResourceAmount resourceAmount); - - boolean isGridResourceBelonging(GridResource gridResource); - - long getInterfaceExportLimit(); - - GridOperations createGridOperations(StorageChannel storageChannel, Actor actor); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/list/FuzzyResourceList.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/list/FuzzyResourceList.java deleted file mode 100644 index 0884466cd..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/list/FuzzyResourceList.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.support.resource.list; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.platform.api.support.resource.FuzzyModeNormalizer; - -import java.util.Collection; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") -public interface FuzzyResourceList extends ResourceList { - /** - * Retrieves all resources that match the normalized variant from {@link FuzzyModeNormalizer}. - * - * @param resource the resource, doesn't matter if it's normalized or not - * @return a list of fuzzy matched variants, or empty list if none found - */ - Collection getFuzzy(ResourceKey resource); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/list/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/list/package-info.java deleted file mode 100644 index 0da3ef37c..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/list/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.support.resource.list; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/package-info.java deleted file mode 100644 index 9e1292653..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/support/resource/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.support.resource; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeItem.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeItem.java deleted file mode 100644 index d1a92ae1a..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/UpgradeItem.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.upgrade; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.10") -public interface UpgradeItem { - long getEnergyUsage(); -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/package-info.java deleted file mode 100644 index b62b25a20..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/upgrade/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.upgrade; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java deleted file mode 100644 index aa6cd8b09..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/WirelessTransmitterRangeModifier.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter; - -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.0") -@FunctionalInterface -public interface WirelessTransmitterRangeModifier { - int modifyRange(UpgradeState upgradeState, int range); - - default int getPriority() { - return 0; - } -} diff --git a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/package-info.java b/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/package-info.java deleted file mode 100644 index 33089bb77..000000000 --- a/refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/wirelesstransmitter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-api/src/main/resources/fabric.mod.json b/refinedstorage2-platform-api/src/main/resources/fabric.mod.json deleted file mode 100644 index 922ebcf97..000000000 --- a/refinedstorage2-platform-api/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage2-platform-api", - "version": "${version}", - "name": "Refined Storage 2 Platform API", - "authors": [ - "Refined Mods" - ], - "license": "MIT", - "environment": "*", - "custom": { - "modmenu": { - "parent": "refinedstorage2", - "badges": [ - "library" - ] - } - } -} diff --git a/refinedstorage2-platform-common/build.gradle b/refinedstorage2-platform-common/build.gradle deleted file mode 100644 index 5ff7533e6..000000000 --- a/refinedstorage2-platform-common/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage2-platform-common' - -commonProject() - -dependencies { - api project(':refinedstorage2-platform-api') - api project(':refinedstorage2-core-api') - api project(':refinedstorage2-resource-api') - api project(':refinedstorage2-storage-api') - api project(':refinedstorage2-network-api') - api project(':refinedstorage2-network') - api project(':refinedstorage2-query-parser') - api project(':refinedstorage2-grid-api') - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj - testImplementation libs.equalsverifier -} - -test { - useJUnitPlatform() -} - -enablePublishing() diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_cable.json deleted file mode 100644 index 728530d96..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/black" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_constructor.json deleted file mode 100644 index 51874c7c4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/black" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_controller.json deleted file mode 100644 index 8bed66975..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/black" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_crafting_grid.json deleted file mode 100644 index 5e0be93f4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/black", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/black", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/black", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/black", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/black", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/black" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/black", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/black", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/black", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/black", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/black", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/black", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_creative_controller.json deleted file mode 100644 index 8bed66975..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/black" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_destructor.json deleted file mode 100644 index b2708e4a6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/black" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_detector.json deleted file mode 100644 index b7fe221da..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/black" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/black", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/black", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/black", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/black", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/black", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_disk_interface.json deleted file mode 100644 index 96ab91ebf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/black" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_exporter.json deleted file mode 100644 index 7eee04f15..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/black" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_external_storage.json deleted file mode 100644 index 61dcef10c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/black" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_grid.json deleted file mode 100644 index 1defb1e60..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/black", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/black", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/black", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/black", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/black", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/black" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/black", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/black", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/black", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/black", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/black", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/black", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_importer.json deleted file mode 100644 index b25420d28..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/black" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/black", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_network_receiver.json deleted file mode 100644 index 7c3d97c33..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/black" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_network_transmitter.json deleted file mode 100644 index c85efd707..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/black" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_relay.json deleted file mode 100644 index cb770d118..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/black", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/black", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/black" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/black", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/black", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/black", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_security_manager.json deleted file mode 100644 index 8b1b082d0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/black", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/black" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/black", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/black", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_wireless_transmitter.json deleted file mode 100644 index cf655c2c7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/black_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/black" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/black", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/black", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/black", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/black", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/black", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_cable.json deleted file mode 100644 index 626d83128..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_constructor.json deleted file mode 100644 index bef091ef7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_controller.json deleted file mode 100644 index d3a597ddf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/blue" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_crafting_grid.json deleted file mode 100644 index 228f26de7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/blue", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/blue", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/blue", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/blue", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/blue", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/blue" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/blue", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/blue", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/blue", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/blue", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/blue", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/blue", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_creative_controller.json deleted file mode 100644 index d3a597ddf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/blue" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_destructor.json deleted file mode 100644 index b5b27cb1f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_detector.json deleted file mode 100644 index a2197b24c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/blue" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/blue", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/blue", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/blue", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/blue", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/blue", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_disk_interface.json deleted file mode 100644 index f587c6a20..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/blue" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_exporter.json deleted file mode 100644 index 6eaae725a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_external_storage.json deleted file mode 100644 index ea6e4ab4f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_grid.json deleted file mode 100644 index f8ff49193..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/blue", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/blue", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/blue", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/blue", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/blue", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/blue" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/blue", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/blue", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/blue", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/blue", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/blue", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/blue", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_importer.json deleted file mode 100644 index 4b09315b2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_network_receiver.json deleted file mode 100644 index f86cea069..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/blue" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_network_transmitter.json deleted file mode 100644 index 26d0a4788..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/blue" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_relay.json deleted file mode 100644 index 795311c42..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/blue", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/blue", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/blue" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/blue", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/blue", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/blue", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_security_manager.json deleted file mode 100644 index e3e6cf425..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/blue", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/blue" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/blue", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/blue", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_wireless_transmitter.json deleted file mode 100644 index a937ae334..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/blue_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/blue" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/blue", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/blue", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/blue", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/blue", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/blue", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_cable.json deleted file mode 100644 index be7e51fd6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/brown" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_constructor.json deleted file mode 100644 index 575f109fe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/brown" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_controller.json deleted file mode 100644 index 3bf0e3259..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/brown" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_crafting_grid.json deleted file mode 100644 index 25fb7469c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/brown", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/brown", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/brown", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/brown", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/brown", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/brown" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/brown", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/brown", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/brown", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/brown", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/brown", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/brown", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_creative_controller.json deleted file mode 100644 index 3bf0e3259..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/brown" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_destructor.json deleted file mode 100644 index ed30f3a03..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/brown" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_detector.json deleted file mode 100644 index d62fd1500..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/brown" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/brown", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/brown", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/brown", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/brown", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/brown", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_disk_interface.json deleted file mode 100644 index b5ac4702d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/brown" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_exporter.json deleted file mode 100644 index 07558e73a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/brown" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_external_storage.json deleted file mode 100644 index 86e2bd0d3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/brown" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_grid.json deleted file mode 100644 index 734ac175a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/brown", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/brown", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/brown", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/brown", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/brown", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/brown" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/brown", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/brown", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/brown", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/brown", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/brown", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/brown", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_importer.json deleted file mode 100644 index 815e922f0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/brown" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/brown", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_network_receiver.json deleted file mode 100644 index 272697d4f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/brown" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_network_transmitter.json deleted file mode 100644 index 7308e85d6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/brown" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_relay.json deleted file mode 100644 index 749c6e38e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/brown", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/brown", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/brown" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/brown", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/brown", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/brown", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_security_manager.json deleted file mode 100644 index 94c2baa51..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/brown", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/brown" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/brown", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/brown", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_wireless_transmitter.json deleted file mode 100644 index ec87ad816..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/brown_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/brown" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/brown", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/brown", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/brown", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/brown", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/brown", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cable.json deleted file mode 100644 index 648e8f3e1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/constructor.json deleted file mode 100644 index 367d8ee11..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/controller.json deleted file mode 100644 index 7a51f2639..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/light_blue" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/crafting_grid.json deleted file mode 100644 index 4a5b3ff3d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/light_blue" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/light_blue", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/creative_controller.json deleted file mode 100644 index 7a51f2639..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/light_blue" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_cable.json deleted file mode 100644 index c90f395d1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/cyan" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_constructor.json deleted file mode 100644 index 4bc40ef8e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/cyan" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_controller.json deleted file mode 100644 index d4d9fd4ae..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/cyan" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_crafting_grid.json deleted file mode 100644 index ecf5b1149..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/cyan" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/cyan", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_creative_controller.json deleted file mode 100644 index d4d9fd4ae..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/cyan" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_destructor.json deleted file mode 100644 index 763540a31..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/cyan" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_detector.json deleted file mode 100644 index fd61d5fff..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/cyan" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/cyan", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/cyan", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/cyan", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/cyan", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/cyan", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_disk_interface.json deleted file mode 100644 index b0099c895..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/cyan" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_exporter.json deleted file mode 100644 index 12c566f35..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/cyan" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_external_storage.json deleted file mode 100644 index e29d982a8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/cyan" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_grid.json deleted file mode 100644 index 3b31d839d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/cyan", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/cyan", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/cyan", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/cyan", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/cyan", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/cyan" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/cyan", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/cyan", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/cyan", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/cyan", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/cyan", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/cyan", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_importer.json deleted file mode 100644 index 5e588f524..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/cyan" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/cyan", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_network_receiver.json deleted file mode 100644 index 03ed7c3b1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/cyan" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_network_transmitter.json deleted file mode 100644 index 7c93cab21..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/cyan" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_relay.json deleted file mode 100644 index a16b269c8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/cyan", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/cyan", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/cyan" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/cyan", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/cyan", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/cyan", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_security_manager.json deleted file mode 100644 index 39a4f2936..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/cyan", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/cyan" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/cyan", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/cyan", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_wireless_transmitter.json deleted file mode 100644 index 601db88a7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/cyan_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/cyan" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/cyan", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/cyan", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/cyan", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/cyan", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/cyan", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/destructor.json deleted file mode 100644 index 15932d37c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/detector.json deleted file mode 100644 index 0489adf82..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/light_blue" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/light_blue", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/light_blue", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/light_blue", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/light_blue", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/light_blue", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/disk_interface.json deleted file mode 100644 index 2755db47a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/light_blue" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/exporter.json deleted file mode 100644 index 3c57b4213..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/external_storage.json deleted file mode 100644 index 6f28beac0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_controller.json deleted file mode 100644 index 57d651274..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/gray" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_crafting_grid.json deleted file mode 100644 index f74dcf4b9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/gray", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/gray", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/gray", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/gray", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/gray", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/gray" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/gray", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/gray", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/gray", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/gray", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/gray", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/gray", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_creative_controller.json deleted file mode 100644 index 57d651274..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/gray" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_detector.json deleted file mode 100644 index e2695f5ab..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/gray" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/gray", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/gray", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/gray", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/gray", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/gray", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_disk_interface.json deleted file mode 100644 index 7a051d882..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/gray" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_grid.json deleted file mode 100644 index a11aa6dcc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/gray", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/gray", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/gray", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/gray", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/gray", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/gray" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/gray", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/gray", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/gray", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/gray", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/gray", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/gray", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_network_receiver.json deleted file mode 100644 index 6bbc9fb00..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/gray" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_network_transmitter.json deleted file mode 100644 index 004f915c9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/gray" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_relay.json deleted file mode 100644 index be0738666..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/gray", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/gray", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/gray" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/gray", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/gray", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/gray", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_security_manager.json deleted file mode 100644 index b81f036ca..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/gray", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/gray" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/gray", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/gray", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_wireless_transmitter.json deleted file mode 100644 index 6f2994d89..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/gray_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/gray" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/gray", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/gray", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/gray", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/gray", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/gray", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_cable.json deleted file mode 100644 index b91e98e18..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/green" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_constructor.json deleted file mode 100644 index 05142c593..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/green" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_controller.json deleted file mode 100644 index 4d3db4600..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/green" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_crafting_grid.json deleted file mode 100644 index 7d3ba40f9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/green", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/green", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/green", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/green", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/green", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/green" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/green", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/green", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/green", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/green", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/green", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/green", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_creative_controller.json deleted file mode 100644 index 4d3db4600..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/green" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_destructor.json deleted file mode 100644 index 5f1dac176..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/green" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_detector.json deleted file mode 100644 index 0fd944ec9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/green" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/green", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/green", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/green", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/green", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/green", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_disk_interface.json deleted file mode 100644 index 1adce57bc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/green" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_exporter.json deleted file mode 100644 index 6fc14a5ae..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/green" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_external_storage.json deleted file mode 100644 index 80c533ae0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/green" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_grid.json deleted file mode 100644 index 81b3632c8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/green", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/green", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/green", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/green", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/green", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/green" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/green", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/green", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/green", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/green", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/green", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/green", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_importer.json deleted file mode 100644 index 2d1a2cdd8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/green" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/green", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_network_receiver.json deleted file mode 100644 index 86e310337..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/green" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_network_transmitter.json deleted file mode 100644 index ed8ae4451..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/green" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_relay.json deleted file mode 100644 index 89112dcdb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/green", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/green", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/green" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/green", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/green", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/green", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_security_manager.json deleted file mode 100644 index a441897fd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/green", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/green" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/green", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/green", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_wireless_transmitter.json deleted file mode 100644 index de7d61c01..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/green_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/green" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/green", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/green", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/green", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/green", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/green", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/grid.json deleted file mode 100644 index ae2fcc6c4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/light_blue", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/light_blue", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/light_blue", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/light_blue", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/light_blue", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/light_blue" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/light_blue", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/light_blue", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/light_blue", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/light_blue", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/light_blue", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/light_blue", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/importer.json deleted file mode 100644 index d172dcf54..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_cable.json deleted file mode 100644 index 8b3120cbc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_constructor.json deleted file mode 100644 index e5bd42db2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_destructor.json deleted file mode 100644 index ae5481616..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_exporter.json deleted file mode 100644 index 759fa81a2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_external_storage.json deleted file mode 100644 index 537c9f4e8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_importer.json deleted file mode 100644 index f4e91a59c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_blue_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_blue" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_blue", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_cable.json deleted file mode 100644 index 4d27e1ac2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_constructor.json deleted file mode 100644 index 5cbb0d6c2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_controller.json deleted file mode 100644 index 4d0a041d5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/light_gray" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_crafting_grid.json deleted file mode 100644 index 32f8e8cae..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/light_gray" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/light_gray", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_creative_controller.json deleted file mode 100644 index 4d0a041d5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/light_gray" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_destructor.json deleted file mode 100644 index f8794c70e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_detector.json deleted file mode 100644 index fbcf9e12c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/light_gray" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/light_gray", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/light_gray", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/light_gray", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/light_gray", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/light_gray", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_disk_interface.json deleted file mode 100644 index 8a4c6ed50..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/light_gray" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_exporter.json deleted file mode 100644 index 23e703061..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_external_storage.json deleted file mode 100644 index 10814dcd9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_grid.json deleted file mode 100644 index 315545f65..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/light_gray", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/light_gray", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/light_gray", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/light_gray", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/light_gray", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/light_gray" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/light_gray", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/light_gray", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/light_gray", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/light_gray", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/light_gray", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/light_gray", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_importer.json deleted file mode 100644 index 195968b11..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/light_gray" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/light_gray", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_network_receiver.json deleted file mode 100644 index 80e4ab4db..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/light_gray" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_network_transmitter.json deleted file mode 100644 index 6bef823bb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/light_gray" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_relay.json deleted file mode 100644 index 2f3e1c1f9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/light_gray", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/light_gray", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/light_gray" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/light_gray", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/light_gray", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/light_gray", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_security_manager.json deleted file mode 100644 index 0d4e1f070..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/light_gray", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/light_gray" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/light_gray", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/light_gray", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_wireless_transmitter.json deleted file mode 100644 index ff3ae52e7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/light_gray_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/light_gray" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/light_gray", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/light_gray", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/light_gray", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/light_gray", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/light_gray", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_cable.json deleted file mode 100644 index 5b770c0ce..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/lime" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_constructor.json deleted file mode 100644 index 127d599f6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/lime" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_controller.json deleted file mode 100644 index b13f7d03a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/lime" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_crafting_grid.json deleted file mode 100644 index 786c942f8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/lime", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/lime", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/lime", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/lime", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/lime", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/lime" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/lime", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/lime", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/lime", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/lime", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/lime", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/lime", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_creative_controller.json deleted file mode 100644 index b13f7d03a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/lime" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_destructor.json deleted file mode 100644 index 5880d3db8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/lime" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_detector.json deleted file mode 100644 index 9da496902..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/lime" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/lime", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/lime", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/lime", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/lime", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/lime", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_disk_interface.json deleted file mode 100644 index de167f2db..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/lime" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_exporter.json deleted file mode 100644 index 67ab89cd8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/lime" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_external_storage.json deleted file mode 100644 index 0c64af0de..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/lime" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_grid.json deleted file mode 100644 index 418690e39..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/lime", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/lime", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/lime", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/lime", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/lime", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/lime" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/lime", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/lime", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/lime", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/lime", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/lime", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/lime", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_importer.json deleted file mode 100644 index 76caad9df..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/lime" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/lime", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_network_receiver.json deleted file mode 100644 index 1c06161a2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/lime" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_network_transmitter.json deleted file mode 100644 index 6962c78ff..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/lime" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_relay.json deleted file mode 100644 index 468f24466..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/lime", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/lime", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/lime" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/lime", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/lime", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/lime", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_security_manager.json deleted file mode 100644 index 1e4b8ecf6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/lime", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/lime" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/lime", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/lime", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_wireless_transmitter.json deleted file mode 100644 index 5d975ed16..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/lime_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/lime" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/lime", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/lime", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/lime", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/lime", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/lime", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_cable.json deleted file mode 100644 index 31f8984a6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/magenta" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_constructor.json deleted file mode 100644 index ab5262233..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/magenta" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_controller.json deleted file mode 100644 index 5374f4978..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/magenta" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_crafting_grid.json deleted file mode 100644 index 3716e9ec5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/magenta" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/magenta", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_creative_controller.json deleted file mode 100644 index 5374f4978..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/magenta" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_destructor.json deleted file mode 100644 index 499c4623a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/magenta" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_detector.json deleted file mode 100644 index 33a8ff50b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/magenta" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/magenta", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/magenta", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/magenta", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/magenta", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/magenta", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_disk_interface.json deleted file mode 100644 index 517a38631..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/magenta" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_exporter.json deleted file mode 100644 index 2813cce4d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/magenta" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_external_storage.json deleted file mode 100644 index 702fea690..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/magenta" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_grid.json deleted file mode 100644 index 04d3925f2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/magenta", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/magenta", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/magenta", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/magenta", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/magenta", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/magenta" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/magenta", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/magenta", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/magenta", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/magenta", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/magenta", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/magenta", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_importer.json deleted file mode 100644 index b7ebc77a9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/magenta" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/magenta", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_network_receiver.json deleted file mode 100644 index 0496045b1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/magenta" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_network_transmitter.json deleted file mode 100644 index a9cfe5a30..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/magenta" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_relay.json deleted file mode 100644 index abe6cac51..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/magenta", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/magenta", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/magenta" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/magenta", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/magenta", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/magenta", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_security_manager.json deleted file mode 100644 index 94aa92374..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/magenta", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/magenta" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/magenta", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/magenta", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_wireless_transmitter.json deleted file mode 100644 index c114a2514..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/magenta_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/magenta" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/magenta", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/magenta", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/magenta", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/magenta", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/magenta", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/network_receiver.json deleted file mode 100644 index 6fd106527..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/light_blue" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/network_transmitter.json deleted file mode 100644 index 49484a53f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/light_blue" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_cable.json deleted file mode 100644 index de14ff843..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/orange" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_constructor.json deleted file mode 100644 index cc9d1ced6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/orange" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_controller.json deleted file mode 100644 index ca28e2ebf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/orange" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_crafting_grid.json deleted file mode 100644 index 0f594ce47..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/orange", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/orange", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/orange", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/orange", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/orange", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/orange" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/orange", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/orange", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/orange", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/orange", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/orange", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/orange", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_creative_controller.json deleted file mode 100644 index ca28e2ebf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/orange" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_destructor.json deleted file mode 100644 index a650512d2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/orange" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_detector.json deleted file mode 100644 index 011d6cf2d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/orange" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/orange", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/orange", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/orange", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/orange", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/orange", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_disk_interface.json deleted file mode 100644 index c1e249d23..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/orange" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_exporter.json deleted file mode 100644 index 026c4a17b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/orange" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_external_storage.json deleted file mode 100644 index 3a31f4741..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/orange" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_grid.json deleted file mode 100644 index 6256cbfcd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/orange", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/orange", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/orange", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/orange", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/orange", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/orange" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/orange", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/orange", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/orange", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/orange", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/orange", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/orange", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_importer.json deleted file mode 100644 index 030e17752..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/orange" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/orange", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_network_receiver.json deleted file mode 100644 index f42263881..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/orange" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_network_transmitter.json deleted file mode 100644 index 46030998b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/orange" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_relay.json deleted file mode 100644 index b88a78a2e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/orange", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/orange", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/orange" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/orange", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/orange", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/orange", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_security_manager.json deleted file mode 100644 index 9b0f12848..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/orange", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/orange" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/orange", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/orange", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_wireless_transmitter.json deleted file mode 100644 index df7228375..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/orange_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/orange" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/orange", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/orange", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/orange", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/orange", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/orange", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_cable.json deleted file mode 100644 index 637d7ad06..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/pink" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_constructor.json deleted file mode 100644 index f5eb58f1f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/pink" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_controller.json deleted file mode 100644 index fbf1c8e08..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/pink" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_crafting_grid.json deleted file mode 100644 index d3a0ceab2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/pink", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/pink", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/pink", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/pink", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/pink", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/pink" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/pink", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/pink", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/pink", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/pink", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/pink", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/pink", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_creative_controller.json deleted file mode 100644 index fbf1c8e08..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/pink" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_destructor.json deleted file mode 100644 index 0fbf386fc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/pink" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_detector.json deleted file mode 100644 index 9a2e2bfec..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/pink" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/pink", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/pink", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/pink", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/pink", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/pink", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_disk_interface.json deleted file mode 100644 index 5a4930113..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/pink" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_exporter.json deleted file mode 100644 index 4aa9e9fb7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/pink" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_external_storage.json deleted file mode 100644 index c6e2f92e8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/pink" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_grid.json deleted file mode 100644 index fc281214a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/pink", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/pink", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/pink", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/pink", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/pink", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/pink" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/pink", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/pink", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/pink", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/pink", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/pink", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/pink", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_importer.json deleted file mode 100644 index ee16e2ff1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/pink" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/pink", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_network_receiver.json deleted file mode 100644 index f72f2d31c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/pink" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_network_transmitter.json deleted file mode 100644 index 5c7009994..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/pink" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_relay.json deleted file mode 100644 index fad05f6fd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/pink", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/pink", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/pink" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/pink", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/pink", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/pink", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_security_manager.json deleted file mode 100644 index 07715e635..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/pink", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/pink" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/pink", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/pink", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_wireless_transmitter.json deleted file mode 100644 index 744c8852f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/pink_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/pink" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/pink", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/pink", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/pink", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/pink", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/pink", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_cable.json deleted file mode 100644 index 5614d04a3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/purple" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_constructor.json deleted file mode 100644 index 546b92c07..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/purple" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_controller.json deleted file mode 100644 index b9c46d4b7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/purple" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_crafting_grid.json deleted file mode 100644 index 0334d59a4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/purple", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/purple", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/purple", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/purple", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/purple", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/purple" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/purple", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/purple", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/purple", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/purple", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/purple", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/purple", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_creative_controller.json deleted file mode 100644 index b9c46d4b7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/purple" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_destructor.json deleted file mode 100644 index e15576450..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/purple" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_detector.json deleted file mode 100644 index f13e0a2cb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/purple" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/purple", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/purple", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/purple", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/purple", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/purple", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_disk_interface.json deleted file mode 100644 index 5615980b9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/purple" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_exporter.json deleted file mode 100644 index c15e1ba89..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/purple" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_external_storage.json deleted file mode 100644 index 9e8ec7e4e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/purple" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_grid.json deleted file mode 100644 index 85f0aa98d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/purple", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/purple", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/purple", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/purple", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/purple", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/purple" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/purple", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/purple", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/purple", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/purple", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/purple", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/purple", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_importer.json deleted file mode 100644 index 283e3ece4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/purple" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/purple", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_network_receiver.json deleted file mode 100644 index f62a02452..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/purple" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_network_transmitter.json deleted file mode 100644 index d1def1e5b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/purple" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_relay.json deleted file mode 100644 index 64092cee3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/purple", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/purple", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/purple" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/purple", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/purple", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/purple", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_security_manager.json deleted file mode 100644 index 1862553e8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/purple", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/purple" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/purple", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/purple", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_wireless_transmitter.json deleted file mode 100644 index b2d30a531..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/purple_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/purple" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/purple", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/purple", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/purple", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/purple", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/purple", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_cable.json deleted file mode 100644 index 7e9a478a8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/red" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_constructor.json deleted file mode 100644 index 0662a5486..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/red" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_controller.json deleted file mode 100644 index 69f95a78d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/red" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_crafting_grid.json deleted file mode 100644 index 7ba05a602..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/red", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/red", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/red", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/red", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/red", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/red" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/red", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/red", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/red", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/red", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/red", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/red", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_creative_controller.json deleted file mode 100644 index 69f95a78d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/red" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_destructor.json deleted file mode 100644 index 11e491827..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/red" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_detector.json deleted file mode 100644 index 30f868271..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/red" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/red", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/red", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/red", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/red", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/red", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_disk_interface.json deleted file mode 100644 index 93d056560..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/red" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_exporter.json deleted file mode 100644 index 69854d7eb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/red" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_external_storage.json deleted file mode 100644 index 27dcca052..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/red" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_grid.json deleted file mode 100644 index ed4e880da..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/red", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/red", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/red", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/red", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/red", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/red" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/red", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/red", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/red", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/red", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/red", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/red", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_importer.json deleted file mode 100644 index f9f17228e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/red" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/red", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_network_receiver.json deleted file mode 100644 index a4db02c72..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/red" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_network_transmitter.json deleted file mode 100644 index efaf94767..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/red" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_relay.json deleted file mode 100644 index d8d0481ff..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/red", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/red", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/red" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/red", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/red", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/red", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_security_manager.json deleted file mode 100644 index b9341743d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/red", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/red" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/red", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/red", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_wireless_transmitter.json deleted file mode 100644 index 8e18d1e4c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/red_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/red" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/red", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/red", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/red", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/red", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/red", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/relay.json deleted file mode 100644 index 81c13e2df..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/light_blue", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/light_blue", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/light_blue" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/light_blue", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/light_blue", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/light_blue", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/security_manager.json deleted file mode 100644 index 9bc1d02f9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/light_blue", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/light_blue" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/light_blue", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/light_blue", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_cable.json deleted file mode 100644 index 5baf3e4d2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/white" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_constructor.json deleted file mode 100644 index a1f4ec804..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/white" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_controller.json deleted file mode 100644 index 82a1189b5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/white" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_crafting_grid.json deleted file mode 100644 index 52fb2479c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/white", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/white", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/white", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/white", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/white", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/white" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/white", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/white", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/white", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/white", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/white", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/white", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_creative_controller.json deleted file mode 100644 index 82a1189b5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/white" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_destructor.json deleted file mode 100644 index f171fa4e3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/white" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_detector.json deleted file mode 100644 index dd3354c68..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/white" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/white", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/white", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/white", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/white", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/white", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_disk_interface.json deleted file mode 100644 index 4c4a2eaf8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/white" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_exporter.json deleted file mode 100644 index 4ffface01..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/white" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_external_storage.json deleted file mode 100644 index 171ee9cd3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/white" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_grid.json deleted file mode 100644 index e173c9b5d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/white", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/white", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/white", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/white", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/white", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/white" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/white", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/white", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/white", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/white", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/white", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/white", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_importer.json deleted file mode 100644 index 34a7814e1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/white" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/white", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_network_receiver.json deleted file mode 100644 index 9d47582c7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/white" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_network_transmitter.json deleted file mode 100644 index 3019869df..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/white" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_relay.json deleted file mode 100644 index fc3ee23ce..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/white", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/white", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/white" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/white", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/white", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/white", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_security_manager.json deleted file mode 100644 index 348271d18..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/white", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/white" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/white", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/white", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_wireless_transmitter.json deleted file mode 100644 index 5e8c29e49..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/white_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/white" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/white", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/white", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/white", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/white", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/white", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/wireless_transmitter.json deleted file mode 100644 index 25d401ac6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/light_blue" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/light_blue", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/light_blue", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/light_blue", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/light_blue", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/light_blue", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_cable.json deleted file mode 100644 index 394e44beb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_cable.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/yellow" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 90 - }, - "when": { - "east": "true" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_constructor.json deleted file mode 100644 index 040c8835d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_constructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/yellow" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/constructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_controller.json deleted file mode 100644 index c7d0b43e6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/yellow" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_crafting_grid.json deleted file mode 100644 index 3f4394609..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_crafting_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/crafting_grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/crafting_grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/crafting_grid/yellow" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/crafting_grid/yellow", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_creative_controller.json deleted file mode 100644 index c7d0b43e6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_creative_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "energy_type=nearly_off": { - "model": "refinedstorage2:block/controller/nearly_off" - }, - "energy_type=nearly_on": { - "model": "refinedstorage2:block/controller/nearly_on" - }, - "energy_type=off": { - "model": "refinedstorage2:block/controller/off" - }, - "energy_type=on": { - "model": "refinedstorage2:block/controller/yellow" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_destructor.json deleted file mode 100644 index fb6d65d0a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_destructor.json +++ /dev/null @@ -1,180 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/yellow" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 90 - }, - "when": { - "active": "true", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 90 - }, - "when": { - "active": "false", - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 270 - }, - "when": { - "active": "true", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 270 - }, - "when": { - "active": "false", - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active" - }, - "when": { - "active": "true", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive" - }, - "when": { - "active": "false", - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "x": 180 - }, - "when": { - "active": "true", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "x": 180 - }, - "when": { - "active": "false", - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 270 - }, - "when": { - "active": "true", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 270 - }, - "when": { - "active": "false", - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/active", - "y": 90 - }, - "when": { - "active": "true", - "direction": "east" - } - }, - { - "apply": { - "model": "refinedstorage2:block/destructor/inactive", - "y": 90 - }, - "when": { - "active": "false", - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_detector.json deleted file mode 100644 index faf291642..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_detector.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "direction=down,powered=false": { - "model": "refinedstorage2:block/detector/unpowered" - }, - "direction=down,powered=true": { - "model": "refinedstorage2:block/detector/yellow" - }, - "direction=east,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 270 - }, - "direction=east,powered=true": { - "model": "refinedstorage2:block/detector/yellow", - "x": 90, - "y": 270 - }, - "direction=north,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 180 - }, - "direction=north,powered=true": { - "model": "refinedstorage2:block/detector/yellow", - "x": 90, - "y": 180 - }, - "direction=south,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90 - }, - "direction=south,powered=true": { - "model": "refinedstorage2:block/detector/yellow", - "x": 90 - }, - "direction=up,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 180 - }, - "direction=up,powered=true": { - "model": "refinedstorage2:block/detector/yellow", - "x": 180 - }, - "direction=west,powered=false": { - "model": "refinedstorage2:block/detector/unpowered", - "x": 90, - "y": 90 - }, - "direction=west,powered=true": { - "model": "refinedstorage2:block/detector/yellow", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_disk_interface.json deleted file mode 100644 index 3e12c26dc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_disk_interface.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_interface/yellow" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_exporter.json deleted file mode 100644 index 2b45d8775..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_exporter.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/yellow" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/exporter", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_external_storage.json deleted file mode 100644 index 793fc5e3d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_external_storage.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/yellow" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/external_storage", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_grid.json deleted file mode 100644 index 38c21abb7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_grid.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "variants": { - "active=false,direction=down_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": -90 - }, - "active=false,direction=down_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90 - }, - "active=false,direction=down_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=down_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/grid/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/grid/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/grid/inactive", - "y": 180 - }, - "active=false,direction=up_east": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": -90 - }, - "active=false,direction=up_north": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=up_south": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90 - }, - "active=false,direction=up_west": { - "model": "refinedstorage2:block/grid/inactive", - "x": -90, - "y": 90 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/grid/inactive", - "y": 270 - }, - "active=true,direction=down_east": { - "model": "refinedstorage2:block/grid/yellow", - "x": 90, - "y": -90 - }, - "active=true,direction=down_north": { - "model": "refinedstorage2:block/grid/yellow", - "x": 90 - }, - "active=true,direction=down_south": { - "model": "refinedstorage2:block/grid/yellow", - "x": 90, - "y": 180 - }, - "active=true,direction=down_west": { - "model": "refinedstorage2:block/grid/yellow", - "x": 90, - "y": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/grid/yellow", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/grid/yellow" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/grid/yellow", - "y": 180 - }, - "active=true,direction=up_east": { - "model": "refinedstorage2:block/grid/yellow", - "x": -90, - "y": -90 - }, - "active=true,direction=up_north": { - "model": "refinedstorage2:block/grid/yellow", - "x": -90, - "y": 180 - }, - "active=true,direction=up_south": { - "model": "refinedstorage2:block/grid/yellow", - "x": -90 - }, - "active=true,direction=up_west": { - "model": "refinedstorage2:block/grid/yellow", - "x": -90, - "y": 90 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/grid/yellow", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_importer.json deleted file mode 100644 index 1010f9397..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_importer.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "refinedstorage2:block/cable/core/yellow" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 90 - }, - "when": { - "down": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 270 - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow" - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "x": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 270 - }, - "when": { - "west": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/cable/extension/yellow", - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 90 - }, - "when": { - "direction": "down" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 270 - }, - "when": { - "direction": "up" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer" - }, - "when": { - "direction": "north" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "x": 180 - }, - "when": { - "direction": "south" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 270 - }, - "when": { - "direction": "west" - } - }, - { - "apply": { - "model": "refinedstorage2:block/importer", - "y": 90 - }, - "when": { - "direction": "east" - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_network_receiver.json deleted file mode 100644 index f553637ea..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_network_receiver.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "refinedstorage2:block/network_receiver/inactive" - }, - "active=true": { - "model": "refinedstorage2:block/network_receiver/yellow" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_network_transmitter.json deleted file mode 100644 index e18ebc477..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_network_transmitter.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "state=active": { - "model": "refinedstorage2:block/network_transmitter/yellow" - }, - "state=error": { - "model": "refinedstorage2:block/network_transmitter/error" - }, - "state=inactive": { - "model": "refinedstorage2:block/network_transmitter/inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_relay.json deleted file mode 100644 index 335a4983f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_relay.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/relay/inactive", - "x": 90 - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/relay/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/relay/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/relay/inactive", - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/relay/inactive", - "x": -90, - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/relay/inactive", - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/relay/yellow", - "x": 90 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/relay/yellow", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/relay/yellow" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/relay/yellow", - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/relay/yellow", - "x": -90, - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/relay/yellow", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_security_manager.json deleted file mode 100644 index cce362476..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_security_manager.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "active=false,direction=east": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/security_manager/inactive" - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/security_manager/inactive", - "y": 270 - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/security_manager/yellow", - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/security_manager/yellow" - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/security_manager/yellow", - "y": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/security_manager/yellow", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_wireless_transmitter.json deleted file mode 100644 index 1fdb6428c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/blockstates/yellow_wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/inactive" - }, - "active=false,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 270 - }, - "active=false,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90 - }, - "active=false,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 180 - }, - "active=false,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/inactive", - "x": 90, - "y": 90 - }, - "active=true,direction=down": { - "model": "refinedstorage2:block/wireless_transmitter/yellow" - }, - "active=true,direction=east": { - "model": "refinedstorage2:block/wireless_transmitter/yellow", - "x": 90, - "y": 270 - }, - "active=true,direction=north": { - "model": "refinedstorage2:block/wireless_transmitter/yellow", - "x": 90, - "y": 180 - }, - "active=true,direction=south": { - "model": "refinedstorage2:block/wireless_transmitter/yellow", - "x": 90 - }, - "active=true,direction=up": { - "model": "refinedstorage2:block/wireless_transmitter/yellow", - "x": 180 - }, - "active=true,direction=west": { - "model": "refinedstorage2:block/wireless_transmitter/yellow", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/black.json deleted file mode 100644 index 60f0301c2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/black.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/black", - "particle": "refinedstorage2:block/cable/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/blue.json deleted file mode 100644 index dbbc58708..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/blue.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/blue", - "particle": "refinedstorage2:block/cable/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/brown.json deleted file mode 100644 index 3052777ba..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/brown.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/brown", - "particle": "refinedstorage2:block/cable/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/cyan.json deleted file mode 100644 index d17ddf875..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/cyan.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/cyan", - "particle": "refinedstorage2:block/cable/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/gray.json deleted file mode 100644 index a5b0db721..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/gray.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/gray", - "particle": "refinedstorage2:block/cable/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/green.json deleted file mode 100644 index cee4fdb8f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/green.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/green", - "particle": "refinedstorage2:block/cable/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/light_blue.json deleted file mode 100644 index 36d5a4772..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/light_blue.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_blue", - "particle": "refinedstorage2:block/cable/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/light_gray.json deleted file mode 100644 index 46b570022..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/light_gray.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_gray", - "particle": "refinedstorage2:block/cable/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/lime.json deleted file mode 100644 index 7b26e95e9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/lime.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/lime", - "particle": "refinedstorage2:block/cable/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/magenta.json deleted file mode 100644 index 2038f1224..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/magenta.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/magenta", - "particle": "refinedstorage2:block/cable/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/orange.json deleted file mode 100644 index ab3beb360..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/orange.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/orange", - "particle": "refinedstorage2:block/cable/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/pink.json deleted file mode 100644 index 67fd3a180..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/pink.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/pink", - "particle": "refinedstorage2:block/cable/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/purple.json deleted file mode 100644 index 4cf4962df..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/purple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/purple", - "particle": "refinedstorage2:block/cable/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/red.json deleted file mode 100644 index 0db33e8d2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/red.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/red", - "particle": "refinedstorage2:block/cable/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/white.json deleted file mode 100644 index eb6a4a0f5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/white.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/white", - "particle": "refinedstorage2:block/cable/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/yellow.json deleted file mode 100644 index ed817aff0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/core/yellow.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/core/base", - "textures": { - "cable": "refinedstorage2:block/cable/yellow", - "particle": "refinedstorage2:block/cable/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/black.json deleted file mode 100644 index a20bece5b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/black.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/black", - "particle": "refinedstorage2:block/cable/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/blue.json deleted file mode 100644 index cfc83c951..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/blue.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/blue", - "particle": "refinedstorage2:block/cable/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/brown.json deleted file mode 100644 index 0cf3e2ad3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/brown.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/brown", - "particle": "refinedstorage2:block/cable/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/cyan.json deleted file mode 100644 index f30b8c643..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/cyan.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/cyan", - "particle": "refinedstorage2:block/cable/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/gray.json deleted file mode 100644 index a273b7e78..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/gray.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/gray", - "particle": "refinedstorage2:block/cable/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/green.json deleted file mode 100644 index c64fcf1f4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/green.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/green", - "particle": "refinedstorage2:block/cable/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/light_blue.json deleted file mode 100644 index 6b83e85dd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/light_blue.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_blue", - "particle": "refinedstorage2:block/cable/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/light_gray.json deleted file mode 100644 index 6a92b33b4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/light_gray.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_gray", - "particle": "refinedstorage2:block/cable/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/lime.json deleted file mode 100644 index af37b9cf2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/lime.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/lime", - "particle": "refinedstorage2:block/cable/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/magenta.json deleted file mode 100644 index 5289aca41..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/magenta.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/magenta", - "particle": "refinedstorage2:block/cable/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/orange.json deleted file mode 100644 index c6d343cb7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/orange.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/orange", - "particle": "refinedstorage2:block/cable/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/pink.json deleted file mode 100644 index aa7cf8442..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/pink.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/pink", - "particle": "refinedstorage2:block/cable/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/purple.json deleted file mode 100644 index ecdb096eb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/purple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/purple", - "particle": "refinedstorage2:block/cable/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/red.json deleted file mode 100644 index defc53618..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/red.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/red", - "particle": "refinedstorage2:block/cable/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/white.json deleted file mode 100644 index c268b06ac..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/white.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/white", - "particle": "refinedstorage2:block/cable/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/yellow.json deleted file mode 100644 index f916c6b63..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/cable/extension/yellow.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "refinedstorage2:block/cable/extension/base", - "textures": { - "cable": "refinedstorage2:block/cable/yellow", - "particle": "refinedstorage2:block/cable/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/black.json deleted file mode 100644 index 8a0c694e4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/black.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/black", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/blue.json deleted file mode 100644 index 9456ffbc5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/blue.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/blue", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/brown.json deleted file mode 100644 index 1752fc45a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/brown.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/brown", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/cyan.json deleted file mode 100644 index b349e5535..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/cyan.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/cyan", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/gray.json deleted file mode 100644 index 3a07df71d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/gray.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/gray", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/green.json deleted file mode 100644 index 4a965bb51..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/green.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/green", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/light_blue.json deleted file mode 100644 index d9023d67e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/light_blue.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/light_blue", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/light_gray.json deleted file mode 100644 index a7e72218a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/light_gray.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/light_gray", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/lime.json deleted file mode 100644 index b20f02c33..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/lime.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/lime", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/magenta.json deleted file mode 100644 index e7a5ab77c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/magenta.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/magenta", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/orange.json deleted file mode 100644 index bb88fc91c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/orange.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/orange", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/pink.json deleted file mode 100644 index 21ccc92ff..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/pink.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/pink", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/purple.json deleted file mode 100644 index ab50ee257..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/purple.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/purple", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/red.json deleted file mode 100644 index 5fee6dbfb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/red.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/red", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/white.json deleted file mode 100644 index 2ed154f70..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/white.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/white", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/yellow.json deleted file mode 100644 index 580b93719..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/controller/yellow.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/controller/on", - "cutout": "refinedstorage2:block/controller/cutouts/yellow", - "particle": "refinedstorage2:block/controller/off" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/black.json deleted file mode 100644 index 9981f236c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/black.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/black", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/blue.json deleted file mode 100644 index 91789e98b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/blue.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/blue", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/brown.json deleted file mode 100644 index e0aaa4be8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/brown.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/brown", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/cyan.json deleted file mode 100644 index a3e205712..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/cyan.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/cyan", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/gray.json deleted file mode 100644 index dfca8ee78..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/gray.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/gray", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/green.json deleted file mode 100644 index 3f808e63a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/green.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/green", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/inactive.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/inactive.json deleted file mode 100644 index 295540085..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/inactive.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/inactive", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/light_blue.json deleted file mode 100644 index 8cd20a835..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/light_blue.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/light_blue", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/light_gray.json deleted file mode 100644 index f73a1cffd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/light_gray.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/light_gray", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/lime.json deleted file mode 100644 index 75da882fb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/lime.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/lime", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/magenta.json deleted file mode 100644 index e6b068b5e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/magenta.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/magenta", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/orange.json deleted file mode 100644 index ccb6416a4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/orange.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/orange", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/pink.json deleted file mode 100644 index c45de98b6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/pink.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/pink", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/purple.json deleted file mode 100644 index 378fbabe8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/purple.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/purple", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/red.json deleted file mode 100644 index d2fd30adc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/red.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/red", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/white.json deleted file mode 100644 index 8e95a17a4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/white.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/white", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/yellow.json deleted file mode 100644 index 86dd62d41..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/crafting_grid/yellow.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/crafting_grid/cutouts/yellow", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/crafting_grid/right", - "north": "refinedstorage2:block/crafting_grid/front", - "particle": "refinedstorage2:block/crafting_grid/right", - "south": "refinedstorage2:block/crafting_grid/back", - "up": "refinedstorage2:block/crafting_grid/top", - "west": "refinedstorage2:block/crafting_grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/black.json deleted file mode 100644 index f078e5b2f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/black.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/blue.json deleted file mode 100644 index 4167629ad..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/blue.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/brown.json deleted file mode 100644 index 75f7cd095..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/brown.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/cyan.json deleted file mode 100644 index fc8a39f93..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/cyan.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/gray.json deleted file mode 100644 index 767ed3727..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/gray.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/green.json deleted file mode 100644 index afb4d303b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/green.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/light_blue.json deleted file mode 100644 index 870502e89..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/light_blue.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/light_gray.json deleted file mode 100644 index 0314dd844..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/light_gray.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/lime.json deleted file mode 100644 index e88955ccc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/lime.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/magenta.json deleted file mode 100644 index ac7135e30..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/magenta.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/orange.json deleted file mode 100644 index 4a74e0255..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/orange.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/pink.json deleted file mode 100644 index e6864bf09..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/pink.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/purple.json deleted file mode 100644 index bab87e901..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/purple.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/red.json deleted file mode 100644 index 221ad6cf8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/red.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/white.json deleted file mode 100644 index 2421b9997..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/white.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/yellow.json deleted file mode 100644 index 61599e1f7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/detector/yellow.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/powered", - "textures": { - "bottom": "refinedstorage2:block/detector/bottom", - "particle": "refinedstorage2:block/detector/side", - "side": "refinedstorage2:block/detector/side", - "top": "refinedstorage2:block/detector/top", - "torch": "refinedstorage2:block/detector/cutouts/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_black.json deleted file mode 100644 index 5997a55f2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_black.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/black", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_blue.json deleted file mode 100644 index 492f404c9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_blue.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/blue", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_brown.json deleted file mode 100644 index 7812329fc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_brown.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/brown", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_cyan.json deleted file mode 100644 index a5f7b6075..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_cyan.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/cyan", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_gray.json deleted file mode 100644 index 99b86705d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_gray.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/gray", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_green.json deleted file mode 100644 index 8226df1fe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_green.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/green", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_light_blue.json deleted file mode 100644 index dfbe37916..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_light_blue.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/light_blue", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_light_gray.json deleted file mode 100644 index 80c05ac2b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_light_gray.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/light_gray", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_lime.json deleted file mode 100644 index f072cb384..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_lime.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/lime", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_magenta.json deleted file mode 100644 index d00996234..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_magenta.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/magenta", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_orange.json deleted file mode 100644 index b16aa07f1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_orange.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/orange", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_pink.json deleted file mode 100644 index d160c7088..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_pink.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/pink", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_purple.json deleted file mode 100644 index d1dafa174..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_purple.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/purple", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_red.json deleted file mode 100644 index 3d7900695..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_red.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/red", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_white.json deleted file mode 100644 index 88bc33d05..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_white.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/white", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_yellow.json deleted file mode 100644 index 9da598c1b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/base_yellow.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/yellow", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/black.json deleted file mode 100644 index 10c745d24..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/black.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:black_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/blue.json deleted file mode 100644 index f01f48431..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/blue.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:blue_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/brown.json deleted file mode 100644 index b089a425b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/brown.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:brown_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/cyan.json deleted file mode 100644 index bfa13bcbe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/cyan.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:cyan_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/gray.json deleted file mode 100644 index 4595afd28..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/gray.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:gray_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/green.json deleted file mode 100644 index 9571d8ad7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/green.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:green_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/inactive.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/inactive.json deleted file mode 100644 index 39389d14b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/inactive.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/north_cutout", - "textures": { - "cutout": "refinedstorage2:block/disk_interface/cutouts/inactive", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/disk_interface/right", - "north": "refinedstorage2:block/disk_interface/front", - "particle": "refinedstorage2:block/disk_interface/right", - "south": "refinedstorage2:block/disk_interface/back", - "up": "refinedstorage2:block/disk_interface/top", - "west": "refinedstorage2:block/disk_interface/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/light_blue.json deleted file mode 100644 index 685ef04f2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/light_blue.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/light_gray.json deleted file mode 100644 index bb6bc83f1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/light_gray.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:light_gray_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/lime.json deleted file mode 100644 index d2bea5f74..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/lime.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:lime_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/magenta.json deleted file mode 100644 index c9a7acb6c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/magenta.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:magenta_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/orange.json deleted file mode 100644 index d77cb23ee..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/orange.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:orange_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/pink.json deleted file mode 100644 index 4fce17282..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/pink.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:pink_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/purple.json deleted file mode 100644 index 980a06800..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/purple.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:purple_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/red.json deleted file mode 100644 index 636e74d81..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/red.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:red_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/white.json deleted file mode 100644 index 58e6fd775..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/white.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:white_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/yellow.json deleted file mode 100644 index 9f2b4eec6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/disk_interface/yellow.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:yellow_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/black.json deleted file mode 100644 index 115aee48c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/black.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/black", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/blue.json deleted file mode 100644 index f10c2f8c9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/blue.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/blue", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/brown.json deleted file mode 100644 index b4178bd25..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/brown.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/brown", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/cyan.json deleted file mode 100644 index 2b1c394c0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/cyan.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/cyan", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/gray.json deleted file mode 100644 index 0e76672ed..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/gray.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/gray", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/green.json deleted file mode 100644 index 0fe3cd36a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/green.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/green", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/inactive.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/inactive.json deleted file mode 100644 index ad5734a24..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/inactive.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/inactive", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/light_blue.json deleted file mode 100644 index 5ca5ca047..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/light_blue.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/light_blue", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/light_gray.json deleted file mode 100644 index bb3572cbb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/light_gray.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/light_gray", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/lime.json deleted file mode 100644 index b34b75d83..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/lime.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/lime", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/magenta.json deleted file mode 100644 index 821b6022e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/magenta.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/magenta", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/orange.json deleted file mode 100644 index d45d7c01c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/orange.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/orange", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/pink.json deleted file mode 100644 index 33c421aec..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/pink.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/pink", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/purple.json deleted file mode 100644 index 9676a324a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/purple.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/purple", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/red.json deleted file mode 100644 index 4d0fda5d2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/red.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/red", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/white.json deleted file mode 100644 index 7b8e7e60e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/white.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/white", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/yellow.json deleted file mode 100644 index d54628989..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/grid/yellow.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_north_cutout", - "textures": { - "cutout": "refinedstorage2:block/grid/cutouts/yellow", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/grid/right", - "north": "refinedstorage2:block/grid/front", - "particle": "refinedstorage2:block/grid/right", - "south": "refinedstorage2:block/grid/back", - "up": "refinedstorage2:block/grid/top", - "west": "refinedstorage2:block/grid/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/black.json deleted file mode 100644 index b353d302b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/black.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/black", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/blue.json deleted file mode 100644 index e37eb0248..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/blue.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/blue", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/brown.json deleted file mode 100644 index a7068e51e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/brown.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/brown", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/cyan.json deleted file mode 100644 index c48b00fc0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/cyan.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/cyan", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/gray.json deleted file mode 100644 index 5bf2981bd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/gray.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/gray", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/green.json deleted file mode 100644 index 552c8d37c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/green.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/green", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/inactive.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/inactive.json deleted file mode 100644 index c89d61d94..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/inactive.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/inactive", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/light_blue.json deleted file mode 100644 index 44b9e35b1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/light_blue.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/light_blue", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/light_gray.json deleted file mode 100644 index f19ff741c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/light_gray.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/light_gray", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/lime.json deleted file mode 100644 index bbfdb16ee..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/lime.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/lime", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/magenta.json deleted file mode 100644 index daf1629ed..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/magenta.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/magenta", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/orange.json deleted file mode 100644 index 57808fc14..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/orange.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/orange", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/pink.json deleted file mode 100644 index b7ac3a556..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/pink.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/pink", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/purple.json deleted file mode 100644 index aa8f409de..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/purple.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/purple", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/red.json deleted file mode 100644 index c8c0c9d00..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/red.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/red", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/white.json deleted file mode 100644 index 5643b7496..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/white.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/white", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/yellow.json deleted file mode 100644 index 6ad1d45b0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_receiver/yellow.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_receiver/base", - "cutout": "refinedstorage2:block/network_receiver/cutouts/yellow", - "particle": "refinedstorage2:block/network_receiver/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/black.json deleted file mode 100644 index 0f8886928..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/black.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/black", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/blue.json deleted file mode 100644 index 6ce433dea..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/blue.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/blue", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/brown.json deleted file mode 100644 index d59d72fe1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/brown.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/brown", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/cyan.json deleted file mode 100644 index edb07ae19..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/cyan.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/cyan", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/error.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/error.json deleted file mode 100644 index bde24ffc1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/error.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/error", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/gray.json deleted file mode 100644 index e2a9d7adb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/gray.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/gray", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/green.json deleted file mode 100644 index 2a02cc52e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/green.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/green", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/inactive.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/inactive.json deleted file mode 100644 index 3d57239b5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/inactive.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/inactive", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/light_blue.json deleted file mode 100644 index af0723908..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/light_blue.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/light_blue", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/light_gray.json deleted file mode 100644 index b6c0f2ad4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/light_gray.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/light_gray", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/lime.json deleted file mode 100644 index 40dcbaff2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/lime.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/lime", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/magenta.json deleted file mode 100644 index 6026f8131..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/magenta.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/magenta", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/orange.json deleted file mode 100644 index 4a982bb88..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/orange.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/orange", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/pink.json deleted file mode 100644 index 6789f6949..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/pink.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/pink", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/purple.json deleted file mode 100644 index 7963ee4fc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/purple.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/purple", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/red.json deleted file mode 100644 index 47c6d2a06..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/red.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/red", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/white.json deleted file mode 100644 index c534f78e2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/white.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/white", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/yellow.json deleted file mode 100644 index 3054b74fd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/network_transmitter/yellow.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_all_cutout", - "textures": { - "all": "refinedstorage2:block/network_transmitter/base", - "cutout": "refinedstorage2:block/network_transmitter/cutouts/yellow", - "particle": "refinedstorage2:block/network_transmitter/base" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/black.json deleted file mode 100644 index 914e403fd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/black.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/black", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/black", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/black", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/black", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/black", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/black", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/blue.json deleted file mode 100644 index 93491c2d2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/blue.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/blue", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/blue", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/blue", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/blue", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/blue", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/blue", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/brown.json deleted file mode 100644 index b4e379ea6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/brown.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/brown", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/brown", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/brown", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/brown", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/brown", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/brown", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/cyan.json deleted file mode 100644 index 8487e8b95..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/cyan.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/cyan", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/cyan", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/cyan", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/cyan", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/cyan", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/cyan", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/gray.json deleted file mode 100644 index 0cc0a2ace..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/gray.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/gray", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/gray", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/gray", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/gray", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/gray", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/gray", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/green.json deleted file mode 100644 index f22c4d555..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/green.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/green", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/green", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/green", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/green", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/green", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/green", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/inactive.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/inactive.json deleted file mode 100644 index c33e16f41..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/inactive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/inactive", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/inactive", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/inactive", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/inactive", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/inactive", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/inactive", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/light_blue.json deleted file mode 100644 index b7509e1e4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/light_blue.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/light_blue", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/light_blue", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/light_blue", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/light_blue", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/light_blue", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/light_blue", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/light_gray.json deleted file mode 100644 index cd4f2c280..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/light_gray.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/light_gray", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/light_gray", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/light_gray", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/light_gray", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/light_gray", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/light_gray", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/lime.json deleted file mode 100644 index a4a606c67..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/lime.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/lime", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/lime", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/lime", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/lime", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/lime", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/lime", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/magenta.json deleted file mode 100644 index 5d8aec8b0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/magenta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/magenta", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/magenta", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/magenta", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/magenta", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/magenta", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/magenta", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/orange.json deleted file mode 100644 index 8b237cab8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/orange.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/orange", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/orange", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/orange", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/orange", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/orange", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/orange", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/pink.json deleted file mode 100644 index 89fbb71be..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/pink.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/pink", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/pink", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/pink", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/pink", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/pink", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/pink", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/purple.json deleted file mode 100644 index a2c080940..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/purple.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/purple", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/purple", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/purple", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/purple", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/purple", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/purple", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/red.json deleted file mode 100644 index fb2aa93d2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/red.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/red", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/red", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/red", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/red", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/red", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/red", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/white.json deleted file mode 100644 index 1adac00bc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/white.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/white", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/white", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/white", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/white", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/white", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/white", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/yellow.json deleted file mode 100644 index 2096a76e2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/relay/yellow.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/relay/cutouts/in/yellow", - "cutout_east": "refinedstorage2:block/relay/cutouts/in/yellow", - "cutout_north": "refinedstorage2:block/relay/cutouts/out/yellow", - "cutout_south": "refinedstorage2:block/relay/cutouts/in/yellow", - "cutout_up": "refinedstorage2:block/relay/cutouts/in/yellow", - "cutout_west": "refinedstorage2:block/relay/cutouts/in/yellow", - "down": "refinedstorage2:block/relay/in", - "east": "refinedstorage2:block/relay/in", - "north": "refinedstorage2:block/relay/out", - "particle": "refinedstorage2:block/relay/in", - "south": "refinedstorage2:block/relay/in", - "up": "refinedstorage2:block/relay/in", - "west": "refinedstorage2:block/relay/in" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/black.json deleted file mode 100644 index f0e16728a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/black.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/black", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/black", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/black", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/black", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/black", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/blue.json deleted file mode 100644 index 84c0ea549..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/blue.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/blue", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/blue", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/blue", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/blue", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/blue", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/brown.json deleted file mode 100644 index 77150c297..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/brown.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/brown", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/brown", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/brown", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/brown", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/brown", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/cyan.json deleted file mode 100644 index 476b8ebc1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/cyan.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/cyan", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/cyan", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/cyan", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/cyan", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/cyan", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/gray.json deleted file mode 100644 index 6d098c4e4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/gray.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/gray", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/gray", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/gray", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/gray", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/gray", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/green.json deleted file mode 100644 index 408f308b8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/green.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/green", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/green", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/green", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/green", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/green", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/inactive.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/inactive.json deleted file mode 100644 index 6ae233e27..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/inactive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/inactive", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/inactive", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/inactive", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/inactive", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/inactive", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/light_blue.json deleted file mode 100644 index f8a18ecf9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/light_blue.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/light_blue", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/light_blue", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/light_blue", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/light_blue", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/light_blue", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/light_gray.json deleted file mode 100644 index 03840489f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/light_gray.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/light_gray", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/light_gray", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/light_gray", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/light_gray", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/light_gray", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/lime.json deleted file mode 100644 index dedd0d204..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/lime.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/lime", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/lime", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/lime", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/lime", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/lime", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/magenta.json deleted file mode 100644 index ed56a5d31..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/magenta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/magenta", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/magenta", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/magenta", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/magenta", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/magenta", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/orange.json deleted file mode 100644 index 42d6d1cb4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/orange.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/orange", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/orange", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/orange", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/orange", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/orange", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/pink.json deleted file mode 100644 index 5b26e7557..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/pink.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/pink", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/pink", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/pink", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/pink", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/pink", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/purple.json deleted file mode 100644 index d079f109b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/purple.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/purple", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/purple", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/purple", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/purple", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/purple", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/red.json deleted file mode 100644 index 3eb01cbbc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/red.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/red", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/red", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/red", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/red", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/red", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/white.json deleted file mode 100644 index 9db7a41bb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/white.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/white", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/white", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/white", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/white", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/white", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/yellow.json deleted file mode 100644 index d82bec405..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/security_manager/yellow.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage2:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage2:block/bottom", - "cutout_east": "refinedstorage2:block/security_manager/cutouts/right/yellow", - "cutout_north": "refinedstorage2:block/security_manager/cutouts/front/yellow", - "cutout_south": "refinedstorage2:block/security_manager/cutouts/back/yellow", - "cutout_up": "refinedstorage2:block/security_manager/cutouts/top/yellow", - "cutout_west": "refinedstorage2:block/security_manager/cutouts/left/yellow", - "down": "refinedstorage2:block/bottom", - "east": "refinedstorage2:block/security_manager/right", - "north": "refinedstorage2:block/security_manager/front", - "particle": "refinedstorage2:block/security_manager/back", - "south": "refinedstorage2:block/security_manager/back", - "up": "refinedstorage2:block/security_manager/top", - "west": "refinedstorage2:block/security_manager/left" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/black.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/black.json deleted file mode 100644 index 5f82d9540..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/black.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/blue.json deleted file mode 100644 index f0a7c7890..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/brown.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/brown.json deleted file mode 100644 index d80fa6195..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/brown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/cyan.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/cyan.json deleted file mode 100644 index bb5ce8442..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/gray.json deleted file mode 100644 index 4cb0eb53e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/green.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/green.json deleted file mode 100644 index 97c627421..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_blue.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_blue.json deleted file mode 100644 index 25b97783f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_gray.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_gray.json deleted file mode 100644 index 1f3dfe616..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/light_gray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/lime.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/lime.json deleted file mode 100644 index 8a3df2c1c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/magenta.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/magenta.json deleted file mode 100644 index 709cf5525..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/magenta.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/orange.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/orange.json deleted file mode 100644 index f359f9aca..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/orange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/pink.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/pink.json deleted file mode 100644 index f4752b655..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/pink.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/purple.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/purple.json deleted file mode 100644 index f37c313db..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/purple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/red.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/red.json deleted file mode 100644 index 6b171dab0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/red.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/white.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/white.json deleted file mode 100644 index 6da437453..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/white.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/yellow.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/yellow.json deleted file mode 100644 index c688136cf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/block/wireless_transmitter/yellow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/active", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_cable.json deleted file mode 100644 index 19239ec95..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_constructor.json deleted file mode 100644 index 5a2cacf65..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_controller.json deleted file mode 100644 index 6bb155fab..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/black", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_crafting_grid.json deleted file mode 100644 index 93d33c3ee..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/black" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_creative_controller.json deleted file mode 100644 index 6a8552a78..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/black" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_destructor.json deleted file mode 100644 index 420f3b56b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_detector.json deleted file mode 100644 index 23df319f9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/black" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_disk_interface.json deleted file mode 100644 index 10c745d24..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:black_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_exporter.json deleted file mode 100644 index a601e19cf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_external_storage.json deleted file mode 100644 index 5a0a2a8ed..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_grid.json deleted file mode 100644 index bb52cacd4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/black" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_importer.json deleted file mode 100644 index dbb00d771..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_network_receiver.json deleted file mode 100644 index ade596183..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_network_transmitter.json deleted file mode 100644 index 8a95bdad0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_relay.json deleted file mode 100644 index b662ba05e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/black" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_security_manager.json deleted file mode 100644 index ee13ead75..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/black" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_wireless_transmitter.json deleted file mode 100644 index e1ff55758..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/black_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/black" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_cable.json deleted file mode 100644 index b5ca71ce3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_constructor.json deleted file mode 100644 index 4b86fc367..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_controller.json deleted file mode 100644 index 5b97df019..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/blue", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_crafting_grid.json deleted file mode 100644 index 307b8c9cf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_creative_controller.json deleted file mode 100644 index 5896c7220..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_destructor.json deleted file mode 100644 index b3cb0ce63..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_detector.json deleted file mode 100644 index 76db6cfd4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_disk_interface.json deleted file mode 100644 index f01f48431..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:blue_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_exporter.json deleted file mode 100644 index 345fc9a36..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_external_storage.json deleted file mode 100644 index 8d23ef034..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_grid.json deleted file mode 100644 index 710f882fe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_importer.json deleted file mode 100644 index 6102c4af1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_network_receiver.json deleted file mode 100644 index bcf3097c7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_network_transmitter.json deleted file mode 100644 index 5d4bcba6f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_relay.json deleted file mode 100644 index 11ac25440..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_security_manager.json deleted file mode 100644 index 5b2b172fd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_wireless_transmitter.json deleted file mode 100644 index 65cfb5050..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/blue_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_cable.json deleted file mode 100644 index b8f239474..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_constructor.json deleted file mode 100644 index 34fa3a5c4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_controller.json deleted file mode 100644 index bbf354539..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/brown", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_crafting_grid.json deleted file mode 100644 index 23597552d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/brown" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_creative_controller.json deleted file mode 100644 index e1fa857df..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/brown" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_destructor.json deleted file mode 100644 index 2eba4f9cc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_detector.json deleted file mode 100644 index 63d0efb83..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/brown" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_disk_interface.json deleted file mode 100644 index b089a425b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:brown_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_exporter.json deleted file mode 100644 index 2dbe7d32e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_external_storage.json deleted file mode 100644 index 85af74499..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_grid.json deleted file mode 100644 index 5a39b0f14..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/brown" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_importer.json deleted file mode 100644 index ccd5aed2e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_network_receiver.json deleted file mode 100644 index 249d08271..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_network_transmitter.json deleted file mode 100644 index b4b236ff4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_relay.json deleted file mode 100644 index c2520d02c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/brown" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_security_manager.json deleted file mode 100644 index e4d259faf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/brown" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_wireless_transmitter.json deleted file mode 100644 index c025eb4ca..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/brown_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/brown" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cable.json deleted file mode 100644 index be90ec70a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/constructor.json deleted file mode 100644 index 7a28de47f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/controller.json deleted file mode 100644 index 06f3d9dc9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/light_blue", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/crafting_grid.json deleted file mode 100644 index 98f0d390c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/light_blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/creative_controller.json deleted file mode 100644 index 0fe3a7076..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/light_blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_cable.json deleted file mode 100644 index 743d51863..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_constructor.json deleted file mode 100644 index 21368a8f6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_controller.json deleted file mode 100644 index d03c94a1b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/cyan", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_crafting_grid.json deleted file mode 100644 index 229819483..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/cyan" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_creative_controller.json deleted file mode 100644 index 3b39d43ef..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/cyan" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_destructor.json deleted file mode 100644 index 91a1a7692..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_detector.json deleted file mode 100644 index 1f5b60d24..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/cyan" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_disk_interface.json deleted file mode 100644 index bfa13bcbe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:cyan_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_exporter.json deleted file mode 100644 index ef23bc196..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_external_storage.json deleted file mode 100644 index f69652d24..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_grid.json deleted file mode 100644 index 9954fd137..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/cyan" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_importer.json deleted file mode 100644 index 2ac0e26b4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_network_receiver.json deleted file mode 100644 index be8369e76..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_network_transmitter.json deleted file mode 100644 index b6d2d901e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_relay.json deleted file mode 100644 index fc8c86be2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/cyan" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_security_manager.json deleted file mode 100644 index d4ac29b94..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/cyan" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_wireless_transmitter.json deleted file mode 100644 index 09e3a6d52..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/cyan_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/cyan" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/destructor.json deleted file mode 100644 index 9889b072d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/detector.json deleted file mode 100644 index 9f13d2754..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/light_blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/disk_interface.json deleted file mode 100644 index 685ef04f2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/exporter.json deleted file mode 100644 index c63c75e2b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/external_storage.json deleted file mode 100644 index 94ca338d2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_controller.json deleted file mode 100644 index 173912d17..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/gray", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_crafting_grid.json deleted file mode 100644 index d45507c15..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_creative_controller.json deleted file mode 100644 index b94ca36be..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_detector.json deleted file mode 100644 index 0085fd4bb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_disk_interface.json deleted file mode 100644 index 4595afd28..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:gray_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_grid.json deleted file mode 100644 index f1c71a13a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_network_receiver.json deleted file mode 100644 index e91a0cbb1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_network_transmitter.json deleted file mode 100644 index 044b5ed1e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_relay.json deleted file mode 100644 index 9d2c654e0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_security_manager.json deleted file mode 100644 index f82d44b8a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_wireless_transmitter.json deleted file mode 100644 index 22092dae1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/gray_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_cable.json deleted file mode 100644 index 2fdb8aa20..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_constructor.json deleted file mode 100644 index b87d686c5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_controller.json deleted file mode 100644 index 37c078207..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/green", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_crafting_grid.json deleted file mode 100644 index af963eb68..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/green" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_creative_controller.json deleted file mode 100644 index eb5b9b7c5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/green" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_destructor.json deleted file mode 100644 index 063fd2420..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_detector.json deleted file mode 100644 index ef213668b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/green" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_disk_interface.json deleted file mode 100644 index 9571d8ad7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:green_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_exporter.json deleted file mode 100644 index 7f48860cb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_external_storage.json deleted file mode 100644 index 7b55e048e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_grid.json deleted file mode 100644 index 476fd7035..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/green" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_importer.json deleted file mode 100644 index df95ecd2c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_network_receiver.json deleted file mode 100644 index 509ec28ad..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_network_transmitter.json deleted file mode 100644 index 7def81806..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_relay.json deleted file mode 100644 index a50ef1165..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/green" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_security_manager.json deleted file mode 100644 index 922448244..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/green" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_wireless_transmitter.json deleted file mode 100644 index fcf5eb934..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/green_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/green" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/grid.json deleted file mode 100644 index d1495273c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/light_blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/importer.json deleted file mode 100644 index 7694ffd60..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_cable.json deleted file mode 100644 index 8cbf69e93..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_constructor.json deleted file mode 100644 index 64d973198..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_destructor.json deleted file mode 100644 index 84dffd347..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_exporter.json deleted file mode 100644 index 91435e761..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_external_storage.json deleted file mode 100644 index a22b60b64..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_importer.json deleted file mode 100644 index 14c8016c9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_blue_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_cable.json deleted file mode 100644 index 72033a94c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_constructor.json deleted file mode 100644 index 8c641f7e5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_controller.json deleted file mode 100644 index 022bb7842..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/light_gray", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_crafting_grid.json deleted file mode 100644 index 72800f05b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/light_gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_creative_controller.json deleted file mode 100644 index 8463156c5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/light_gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_destructor.json deleted file mode 100644 index 11406cf07..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_detector.json deleted file mode 100644 index bb4073278..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/light_gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_disk_interface.json deleted file mode 100644 index bb6bc83f1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:light_gray_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_exporter.json deleted file mode 100644 index c648099f9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_external_storage.json deleted file mode 100644 index 576e7877b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_grid.json deleted file mode 100644 index ee47d485c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/light_gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_importer.json deleted file mode 100644 index 6629635e2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_network_receiver.json deleted file mode 100644 index cf103c918..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_network_transmitter.json deleted file mode 100644 index 79961be77..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_relay.json deleted file mode 100644 index 51a372bad..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/light_gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_security_manager.json deleted file mode 100644 index 3ca73b68d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/light_gray" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_wireless_transmitter.json deleted file mode 100644 index 79d7f8f33..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/light_gray_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/light_gray" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_cable.json deleted file mode 100644 index 132d7fe48..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_constructor.json deleted file mode 100644 index 30eba86ca..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_controller.json deleted file mode 100644 index 522c95577..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/lime", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_crafting_grid.json deleted file mode 100644 index 3e53bc48b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/lime" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_creative_controller.json deleted file mode 100644 index 9fbaf4b1e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/lime" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_destructor.json deleted file mode 100644 index 16c778212..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_detector.json deleted file mode 100644 index 46b9b8c30..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/lime" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_disk_interface.json deleted file mode 100644 index d2bea5f74..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:lime_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_exporter.json deleted file mode 100644 index d2682a442..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_external_storage.json deleted file mode 100644 index 6e59dd532..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_grid.json deleted file mode 100644 index 44c1d8fcb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/lime" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_importer.json deleted file mode 100644 index 78a3139d1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_network_receiver.json deleted file mode 100644 index 7acce74fa..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_network_transmitter.json deleted file mode 100644 index d82a2cba6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_relay.json deleted file mode 100644 index 0f12fad98..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/lime" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_security_manager.json deleted file mode 100644 index d9a5821ab..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/lime" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_wireless_transmitter.json deleted file mode 100644 index 18066c311..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/lime_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/lime" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_cable.json deleted file mode 100644 index 1ecfed6d0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_constructor.json deleted file mode 100644 index 8e130aeeb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_controller.json deleted file mode 100644 index b7aa8082d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/magenta", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_crafting_grid.json deleted file mode 100644 index 605846aef..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/magenta" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_creative_controller.json deleted file mode 100644 index c5f5653cb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/magenta" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_destructor.json deleted file mode 100644 index c3b524a8f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_detector.json deleted file mode 100644 index d78057080..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/magenta" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_disk_interface.json deleted file mode 100644 index c9a7acb6c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:magenta_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_exporter.json deleted file mode 100644 index 65fbea9cc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_external_storage.json deleted file mode 100644 index 0f08bf902..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_grid.json deleted file mode 100644 index 2e109e60e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/magenta" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_importer.json deleted file mode 100644 index c8c7e2891..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_network_receiver.json deleted file mode 100644 index c1952d7e5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_network_transmitter.json deleted file mode 100644 index f3f93d427..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_relay.json deleted file mode 100644 index 13c4bd8af..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/magenta" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_security_manager.json deleted file mode 100644 index b3b6dbfc0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/magenta" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_wireless_transmitter.json deleted file mode 100644 index 55e545d09..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/magenta_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/magenta" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/network_receiver.json deleted file mode 100644 index c237c3d55..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/network_transmitter.json deleted file mode 100644 index a81a65c0f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_cable.json deleted file mode 100644 index 9ecbfe089..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_constructor.json deleted file mode 100644 index fb5081f08..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_controller.json deleted file mode 100644 index 47ad1a0d4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/orange", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_crafting_grid.json deleted file mode 100644 index 54026146d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/orange" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_creative_controller.json deleted file mode 100644 index b557d72d0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/orange" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_destructor.json deleted file mode 100644 index 909a56878..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_detector.json deleted file mode 100644 index c3bafca52..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/orange" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_disk_interface.json deleted file mode 100644 index d77cb23ee..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:orange_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_exporter.json deleted file mode 100644 index bd445474f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_external_storage.json deleted file mode 100644 index f8f910555..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_grid.json deleted file mode 100644 index 8b9132806..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/orange" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_importer.json deleted file mode 100644 index 36c6c951a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_network_receiver.json deleted file mode 100644 index 8ef759ae0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_network_transmitter.json deleted file mode 100644 index 5272d4ab9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_relay.json deleted file mode 100644 index deaa01aca..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/orange" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_security_manager.json deleted file mode 100644 index 40e80c498..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/orange" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_wireless_transmitter.json deleted file mode 100644 index 3d53d67e2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/orange_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/orange" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_cable.json deleted file mode 100644 index f07426120..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_constructor.json deleted file mode 100644 index b3b4fdb81..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_controller.json deleted file mode 100644 index cf95407a3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/pink", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_crafting_grid.json deleted file mode 100644 index e27172b15..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/pink" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_creative_controller.json deleted file mode 100644 index 5c9410fd6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/pink" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_destructor.json deleted file mode 100644 index 0fec233c0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_detector.json deleted file mode 100644 index f056c3110..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/pink" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_disk_interface.json deleted file mode 100644 index 4fce17282..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:pink_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_exporter.json deleted file mode 100644 index 1fb5bfddd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_external_storage.json deleted file mode 100644 index d271b8a36..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_grid.json deleted file mode 100644 index 87ba01812..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/pink" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_importer.json deleted file mode 100644 index 837f75ab8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_network_receiver.json deleted file mode 100644 index c9d5ae064..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_network_transmitter.json deleted file mode 100644 index d78d47f94..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_relay.json deleted file mode 100644 index 7b56295eb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/pink" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_security_manager.json deleted file mode 100644 index 94f2729d4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/pink" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_wireless_transmitter.json deleted file mode 100644 index 2f33a8fe5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/pink_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/pink" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_cable.json deleted file mode 100644 index 41fa101e0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_constructor.json deleted file mode 100644 index e092438b8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_controller.json deleted file mode 100644 index c0b2cb2fb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/purple", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_crafting_grid.json deleted file mode 100644 index 6a198d1b3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/purple" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_creative_controller.json deleted file mode 100644 index 1587b67c9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/purple" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_destructor.json deleted file mode 100644 index 7ad5266e0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_detector.json deleted file mode 100644 index a28fdbf00..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/purple" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_disk_interface.json deleted file mode 100644 index 980a06800..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:purple_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_exporter.json deleted file mode 100644 index 57247d548..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_external_storage.json deleted file mode 100644 index b3313057c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_grid.json deleted file mode 100644 index 86d00220c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/purple" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_importer.json deleted file mode 100644 index 19344caa7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_network_receiver.json deleted file mode 100644 index df74529c0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_network_transmitter.json deleted file mode 100644 index ddad1fd12..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_relay.json deleted file mode 100644 index a51cd5fd7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/purple" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_security_manager.json deleted file mode 100644 index d36ab505b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/purple" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_wireless_transmitter.json deleted file mode 100644 index 80c889144..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/purple_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/purple" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_cable.json deleted file mode 100644 index ce7d1059d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_constructor.json deleted file mode 100644 index a97f5b079..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_controller.json deleted file mode 100644 index b643b3794..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/red", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_crafting_grid.json deleted file mode 100644 index 33f1f38ec..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/red" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_creative_controller.json deleted file mode 100644 index d5eb7842b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/red" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_destructor.json deleted file mode 100644 index e947b3d06..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_detector.json deleted file mode 100644 index 7ed497d77..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/red" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_disk_interface.json deleted file mode 100644 index 636e74d81..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:red_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_exporter.json deleted file mode 100644 index 83c875ba2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_external_storage.json deleted file mode 100644 index 22597cb21..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_grid.json deleted file mode 100644 index be70be746..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/red" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_importer.json deleted file mode 100644 index 12a7d0567..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_network_receiver.json deleted file mode 100644 index 24e8dff77..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_network_transmitter.json deleted file mode 100644 index 969a2ee85..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_relay.json deleted file mode 100644 index 7c94769ee..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/red" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_security_manager.json deleted file mode 100644 index 256ec88fc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/red" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_wireless_transmitter.json deleted file mode 100644 index ddd8adffa..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/red_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/red" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/relay.json deleted file mode 100644 index a6634495e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/light_blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/security_manager.json deleted file mode 100644 index 6d3285847..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/light_blue" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_cable.json deleted file mode 100644 index 1266fe7e9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_constructor.json deleted file mode 100644 index aa7ce36e7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_controller.json deleted file mode 100644 index f64829ee2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/white", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_crafting_grid.json deleted file mode 100644 index b823bb8c1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/white" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_creative_controller.json deleted file mode 100644 index 023a02aec..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/white" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_destructor.json deleted file mode 100644 index 3b586b987..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_detector.json deleted file mode 100644 index cede6a3e7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/white" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_disk_interface.json deleted file mode 100644 index 58e6fd775..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:white_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_exporter.json deleted file mode 100644 index 19167989e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_external_storage.json deleted file mode 100644 index a992fc7f6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_grid.json deleted file mode 100644 index 333459ae4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/white" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_importer.json deleted file mode 100644 index 0870cbdfb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_network_receiver.json deleted file mode 100644 index 5654fa20c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_network_transmitter.json deleted file mode 100644 index 8596e093f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_relay.json deleted file mode 100644 index b2badbd1e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/white" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_security_manager.json deleted file mode 100644 index 6edd61a27..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/white" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_wireless_transmitter.json deleted file mode 100644 index fa1e3b66d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/white_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/white" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/wireless_transmitter.json deleted file mode 100644 index 4d994ede4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/light_blue" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_cable.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_cable.json deleted file mode 100644 index fdeed5234..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_cable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/cable/base", - "textures": { - "cable": "refinedstorage2:block/cable/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_constructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_constructor.json deleted file mode 100644 index a3ecfd948..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_constructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/constructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_controller.json deleted file mode 100644 index 1657e16f8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_controller.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "refinedstorage2:block/controller/off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.0 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_off", - "predicate": { - "refinedstorage2:stored_in_controller": 0.01 - } - }, - { - "model": "refinedstorage2:block/controller/nearly_on", - "predicate": { - "refinedstorage2:stored_in_controller": 0.3 - } - }, - { - "model": "refinedstorage2:block/controller/yellow", - "predicate": { - "refinedstorage2:stored_in_controller": 0.4 - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_crafting_grid.json deleted file mode 100644 index 12b94fd62..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_crafting_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/crafting_grid/yellow" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_creative_controller.json deleted file mode 100644 index 0c07fa961..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_creative_controller.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/yellow" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_destructor.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_destructor.json deleted file mode 100644 index fb5dd1098..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_destructor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/destructor/base", - "textures": { - "cable": "refinedstorage2:block/cable/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_detector.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_detector.json deleted file mode 100644 index 6a44f2076..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/detector/yellow" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_disk_interface.json deleted file mode 100644 index 9f2b4eec6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_disk_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "refinedstorage2:yellow_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_exporter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_exporter.json deleted file mode 100644 index e1d6fc36d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_exporter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/exporter/base", - "textures": { - "cable": "refinedstorage2:block/cable/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_external_storage.json deleted file mode 100644 index 2e1843de3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_external_storage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/external_storage/base", - "textures": { - "cable": "refinedstorage2:block/cable/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_grid.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_grid.json deleted file mode 100644 index 5ecfe0d12..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/grid/yellow" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_importer.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_importer.json deleted file mode 100644 index fecf2540a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_importer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:item/importer/base", - "textures": { - "cable": "refinedstorage2:block/cable/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_network_receiver.json deleted file mode 100644 index cb901d1bd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_network_receiver.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_receiver/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_receiver/cutouts/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_network_transmitter.json deleted file mode 100644 index 6c4c3dcfd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_network_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/network_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/network_transmitter/cutouts/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_relay.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_relay.json deleted file mode 100644 index 8486447ab..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_relay.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/relay/yellow" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_security_manager.json deleted file mode 100644 index e1e4c506f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_security_manager.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/security_manager/yellow" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_wireless_transmitter.json deleted file mode 100644 index fa82c3620..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/assets/refinedstorage2/models/item/yellow_wireless_transmitter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/wireless_transmitter/inactive", - "textures": { - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/yellow" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_cable.json deleted file mode 100644 index ab4bdd4ec..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_constructor.json deleted file mode 100644 index aeb4c584f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_controller.json deleted file mode 100644 index a5f09a2e2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_crafting_grid.json deleted file mode 100644 index 64ac26b02..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_destructor.json deleted file mode 100644 index f60464039..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_detector.json deleted file mode 100644 index e38cf2ea4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_disk_interface.json deleted file mode 100644 index 659d2dde5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_exporter.json deleted file mode 100644 index 187e40bba..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_external_storage.json deleted file mode 100644 index e6ef99543..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_grid.json deleted file mode 100644 index 79d1c6cc1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_importer.json deleted file mode 100644 index 7fe610011..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_receiver.json deleted file mode 100644 index ec3342f03..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_transmitter.json deleted file mode 100644 index 035a09847..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_relay.json deleted file mode 100644 index cf3855aba..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_security_manager.json deleted file mode 100644 index 46d3f4359..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_wireless_transmitter.json deleted file mode 100644 index 71757e533..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/black_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/black_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/black_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_cable.json deleted file mode 100644 index 887460773..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_constructor.json deleted file mode 100644 index 462cb7d94..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_controller.json deleted file mode 100644 index 9fd5c5017..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_crafting_grid.json deleted file mode 100644 index acac86f6f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_destructor.json deleted file mode 100644 index bd31981f4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_detector.json deleted file mode 100644 index 23195504e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_disk_interface.json deleted file mode 100644 index 04dbd716c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_exporter.json deleted file mode 100644 index 59349bfd7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_external_storage.json deleted file mode 100644 index 2f5be5923..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_grid.json deleted file mode 100644 index 918085fc4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_importer.json deleted file mode 100644 index ff786a7b1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_receiver.json deleted file mode 100644 index 73e02bd65..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_transmitter.json deleted file mode 100644 index 9bdfe44f9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_relay.json deleted file mode 100644 index c632b9f0d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_security_manager.json deleted file mode 100644 index b05c0ea9c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_wireless_transmitter.json deleted file mode 100644 index 0da302949..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/blue_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/blue_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/blue_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_cable.json deleted file mode 100644 index 1114fc3ba..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_constructor.json deleted file mode 100644 index 0802a7620..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_controller.json deleted file mode 100644 index 695e39e8d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_crafting_grid.json deleted file mode 100644 index e79e6defe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_destructor.json deleted file mode 100644 index 07750f9dc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_detector.json deleted file mode 100644 index 02a226bf0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_disk_interface.json deleted file mode 100644 index 0ec7a7bce..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_exporter.json deleted file mode 100644 index 3ecd6d90d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_external_storage.json deleted file mode 100644 index ec47de81e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_grid.json deleted file mode 100644 index bff3a2da3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_importer.json deleted file mode 100644 index 53f6390c3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_receiver.json deleted file mode 100644 index c528846d3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_transmitter.json deleted file mode 100644 index 21ad97f20..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_relay.json deleted file mode 100644 index 7cfd069de..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_security_manager.json deleted file mode 100644 index 765f9db04..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_wireless_transmitter.json deleted file mode 100644 index 3c993f21e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/brown_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/brown_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/brown_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_cable.json deleted file mode 100644 index 818e8688a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_constructor.json deleted file mode 100644 index ea007af43..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_controller.json deleted file mode 100644 index 84a7203ef..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_crafting_grid.json deleted file mode 100644 index a8093f848..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_destructor.json deleted file mode 100644 index 005eb9abb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_detector.json deleted file mode 100644 index b54a6dbdc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_disk_interface.json deleted file mode 100644 index 10bafc03f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_exporter.json deleted file mode 100644 index 172dac938..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_external_storage.json deleted file mode 100644 index 6e9d813da..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_grid.json deleted file mode 100644 index 65d08104a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_importer.json deleted file mode 100644 index 99579df09..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_receiver.json deleted file mode 100644 index 34a1bd5ba..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_transmitter.json deleted file mode 100644 index 11be23a3a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_relay.json deleted file mode 100644 index 1d2891dff..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_security_manager.json deleted file mode 100644 index bf696080d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json deleted file mode 100644 index 81d706af3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/cyan_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/cyan_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/cyan_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_cable.json deleted file mode 100644 index 992e45a17..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_constructor.json deleted file mode 100644 index 8fdb3a574..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_controller.json deleted file mode 100644 index 39260847d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_crafting_grid.json deleted file mode 100644 index 374f9b1a8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_destructor.json deleted file mode 100644 index 51c84af5a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_detector.json deleted file mode 100644 index 0b26f68b9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_disk_interface.json deleted file mode 100644 index 9fc5b6617..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_exporter.json deleted file mode 100644 index bfef9412b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_external_storage.json deleted file mode 100644 index c082be2f9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_grid.json deleted file mode 100644 index 7c30db465..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_importer.json deleted file mode 100644 index 72c4237be..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_receiver.json deleted file mode 100644 index 37a41b196..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_transmitter.json deleted file mode 100644 index 1eae61331..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_relay.json deleted file mode 100644 index 2bd2d0f3b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_security_manager.json deleted file mode 100644 index 06a91266e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_wireless_transmitter.json deleted file mode 100644 index 8869b2e84..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/gray_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/gray_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/gray_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_cable.json deleted file mode 100644 index cad2e17ac..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_constructor.json deleted file mode 100644 index 49f4a6cb0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_controller.json deleted file mode 100644 index e9df569ff..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_crafting_grid.json deleted file mode 100644 index d9455ec6d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_destructor.json deleted file mode 100644 index 2cf25b095..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_detector.json deleted file mode 100644 index 88bc00f52..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_disk_interface.json deleted file mode 100644 index 273634d77..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_exporter.json deleted file mode 100644 index 0784ffe2c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_external_storage.json deleted file mode 100644 index 636dfd661..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_grid.json deleted file mode 100644 index 3f57b02aa..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_importer.json deleted file mode 100644 index 5ebf53839..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_receiver.json deleted file mode 100644 index ac73fada5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_transmitter.json deleted file mode 100644 index 7dfd6647d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_relay.json deleted file mode 100644 index 9c2d5a8f6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_security_manager.json deleted file mode 100644 index 44e6cb5c7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_wireless_transmitter.json deleted file mode 100644 index 8402525ad..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/green_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/green_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/green_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_cable.json deleted file mode 100644 index b25eac900..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_constructor.json deleted file mode 100644 index dffd46d35..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_controller.json deleted file mode 100644 index cd06eeb69..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_crafting_grid.json deleted file mode 100644 index c16b97ab5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_destructor.json deleted file mode 100644 index 5227118a7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_detector.json deleted file mode 100644 index 8cab3fb1b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_disk_interface.json deleted file mode 100644 index 95b484a9f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_exporter.json deleted file mode 100644 index 43796a9ea..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_external_storage.json deleted file mode 100644 index 34a655642..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_grid.json deleted file mode 100644 index 7d5011598..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_importer.json deleted file mode 100644 index 86e4e49ea..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_receiver.json deleted file mode 100644 index 149e495f0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_transmitter.json deleted file mode 100644 index f691c712b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_relay.json deleted file mode 100644 index f45e93526..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_security_manager.json deleted file mode 100644 index 1f44c5ff0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json deleted file mode 100644 index 03423f6c3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_blue_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_blue_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_blue_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_cable.json deleted file mode 100644 index 0d2ae3acc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_constructor.json deleted file mode 100644 index 95e632cb8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_controller.json deleted file mode 100644 index c8a6ae6d0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_crafting_grid.json deleted file mode 100644 index 9506f708b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_destructor.json deleted file mode 100644 index 5802b49dd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_detector.json deleted file mode 100644 index b39d6cf9f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_disk_interface.json deleted file mode 100644 index 5b5391441..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_exporter.json deleted file mode 100644 index bb8b77c72..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_external_storage.json deleted file mode 100644 index 89259016e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_grid.json deleted file mode 100644 index 0c5b98aaf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_importer.json deleted file mode 100644 index b894c97a8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_receiver.json deleted file mode 100644 index 27041877d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_transmitter.json deleted file mode 100644 index 18eba00c8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_relay.json deleted file mode 100644 index f838a20ba..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_security_manager.json deleted file mode 100644 index a97c2c689..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json deleted file mode 100644 index 866f6b0d0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/light_gray_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/light_gray_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/light_gray_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_cable.json deleted file mode 100644 index b36f1200d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_constructor.json deleted file mode 100644 index f04dd8e06..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_controller.json deleted file mode 100644 index 759cce2f4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_crafting_grid.json deleted file mode 100644 index 2f38abb49..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_destructor.json deleted file mode 100644 index b263d9b09..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_detector.json deleted file mode 100644 index 29e3772f1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_disk_interface.json deleted file mode 100644 index 0862348c4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_exporter.json deleted file mode 100644 index ed0d1fce6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_external_storage.json deleted file mode 100644 index 8f6a90bfd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_grid.json deleted file mode 100644 index 6d7934f1c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_importer.json deleted file mode 100644 index 32a9d974e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_receiver.json deleted file mode 100644 index 922f20e1c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_transmitter.json deleted file mode 100644 index bfa5e9530..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_relay.json deleted file mode 100644 index 9ee088762..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_security_manager.json deleted file mode 100644 index 4839ab98a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_wireless_transmitter.json deleted file mode 100644 index dafef7bab..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/lime_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/lime_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/lime_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_cable.json deleted file mode 100644 index 27e8ab7f6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_constructor.json deleted file mode 100644 index 40106ad61..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_controller.json deleted file mode 100644 index 7384a9b78..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_crafting_grid.json deleted file mode 100644 index 5e2ac7077..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_destructor.json deleted file mode 100644 index f2fed5377..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_detector.json deleted file mode 100644 index 3380cd263..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_disk_interface.json deleted file mode 100644 index a8ca43d8f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_exporter.json deleted file mode 100644 index d81e1e842..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_external_storage.json deleted file mode 100644 index 03452cd2b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_grid.json deleted file mode 100644 index 7a717dd89..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_importer.json deleted file mode 100644 index 565d37f4a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_receiver.json deleted file mode 100644 index a888735f0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_transmitter.json deleted file mode 100644 index d31c07686..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_relay.json deleted file mode 100644 index 98ce17bfd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_security_manager.json deleted file mode 100644 index 5e995a1c0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json deleted file mode 100644 index 538a7f3f5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/magenta_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/magenta_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/magenta_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_cable.json deleted file mode 100644 index b828e936c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_constructor.json deleted file mode 100644 index d5421099e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_controller.json deleted file mode 100644 index 45a04416f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_crafting_grid.json deleted file mode 100644 index 3f4adea8e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_destructor.json deleted file mode 100644 index 0e8278b53..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_detector.json deleted file mode 100644 index 352bed32a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_disk_interface.json deleted file mode 100644 index 292a7f033..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_exporter.json deleted file mode 100644 index d8480b016..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_external_storage.json deleted file mode 100644 index 07f6171bf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_grid.json deleted file mode 100644 index ce7e23c70..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_importer.json deleted file mode 100644 index c37a08599..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_receiver.json deleted file mode 100644 index 4acec5b00..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_transmitter.json deleted file mode 100644 index d9d4e6854..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_relay.json deleted file mode 100644 index 2b37288ca..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_security_manager.json deleted file mode 100644 index cb361b1e7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_wireless_transmitter.json deleted file mode 100644 index 84fae67ba..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/orange_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/orange_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/orange_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_cable.json deleted file mode 100644 index 9b896d5d9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_constructor.json deleted file mode 100644 index 590235f5a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_controller.json deleted file mode 100644 index dd6844a90..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_crafting_grid.json deleted file mode 100644 index f789f3df2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_destructor.json deleted file mode 100644 index 80d1e140b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_detector.json deleted file mode 100644 index c5cb09fb0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_disk_interface.json deleted file mode 100644 index bb6af5ac6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_exporter.json deleted file mode 100644 index 5737ee7cf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_external_storage.json deleted file mode 100644 index f7c193d0e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_grid.json deleted file mode 100644 index 57cf192eb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_importer.json deleted file mode 100644 index b467bda6d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_receiver.json deleted file mode 100644 index 110da26fc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_transmitter.json deleted file mode 100644 index 67c6b7c05..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_relay.json deleted file mode 100644 index 59f925d4a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_security_manager.json deleted file mode 100644 index cebfd1411..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_wireless_transmitter.json deleted file mode 100644 index 94d9e6930..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/pink_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/pink_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/pink_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_cable.json deleted file mode 100644 index 73948842b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_constructor.json deleted file mode 100644 index 532a6a107..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_controller.json deleted file mode 100644 index 5d749fce1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_crafting_grid.json deleted file mode 100644 index fddbcf83b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_destructor.json deleted file mode 100644 index 3fcd7e7aa..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_detector.json deleted file mode 100644 index a1a88d96d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_disk_interface.json deleted file mode 100644 index 6b8c1c548..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_exporter.json deleted file mode 100644 index d8c675f45..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_external_storage.json deleted file mode 100644 index 52f3be2c5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_grid.json deleted file mode 100644 index 120a948c9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_importer.json deleted file mode 100644 index d31b9eec4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_receiver.json deleted file mode 100644 index 624fbc222..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_transmitter.json deleted file mode 100644 index 74a3abcb7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_relay.json deleted file mode 100644 index a6ea128cb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_security_manager.json deleted file mode 100644 index 28f07edc0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_wireless_transmitter.json deleted file mode 100644 index 72c8ca98a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/purple_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/purple_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/purple_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_cable.json deleted file mode 100644 index c6bfbceda..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_constructor.json deleted file mode 100644 index e29bb0e07..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_controller.json deleted file mode 100644 index a1ee215d4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_crafting_grid.json deleted file mode 100644 index 0f66ba87f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_destructor.json deleted file mode 100644 index 83fbcbb36..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_detector.json deleted file mode 100644 index d4d2f421f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_disk_interface.json deleted file mode 100644 index d3c68dbfe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_exporter.json deleted file mode 100644 index 62c4a3cc8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_external_storage.json deleted file mode 100644 index d8b3da12a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_grid.json deleted file mode 100644 index cafd73caa..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_importer.json deleted file mode 100644 index ef6c08452..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_receiver.json deleted file mode 100644 index dab15f6a6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_transmitter.json deleted file mode 100644 index 05abb06a7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_relay.json deleted file mode 100644 index 22699a7ad..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_security_manager.json deleted file mode 100644 index 92f1a2643..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_wireless_transmitter.json deleted file mode 100644 index 8119ecad7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/red_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/red_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/red_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_cable.json deleted file mode 100644 index 5c01b2dda..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_constructor.json deleted file mode 100644 index 9ac402a84..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_controller.json deleted file mode 100644 index 5d9a2bf31..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_crafting_grid.json deleted file mode 100644 index aaf1827b8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_destructor.json deleted file mode 100644 index f8dd49d83..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_detector.json deleted file mode 100644 index 2f29558be..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_disk_interface.json deleted file mode 100644 index 596d4c3db..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_exporter.json deleted file mode 100644 index edc903ed8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_external_storage.json deleted file mode 100644 index be9bdd23d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_grid.json deleted file mode 100644 index 4752ba123..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_importer.json deleted file mode 100644 index e96405e91..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_receiver.json deleted file mode 100644 index c43a3c3ed..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_transmitter.json deleted file mode 100644 index a5cd19a0e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_relay.json deleted file mode 100644 index 08f44a42b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_security_manager.json deleted file mode 100644 index c74df0f1e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_wireless_transmitter.json deleted file mode 100644 index a83b407a1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/white_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/white_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/white_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_cable.json deleted file mode 100644 index 8e1e26eb8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_cable.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_cables": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_cable" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_cables" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_cable" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_constructor.json deleted file mode 100644 index 7be5a92ba..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_constructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_constructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_constructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_constructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_constructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_controller.json deleted file mode 100644 index e3989aa47..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_controller.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_controllers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_controller" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_controllers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_controller" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_crafting_grid.json deleted file mode 100644 index 55878f9a0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_crafting_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafting_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_crafting_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafting_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_crafting_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_destructor.json deleted file mode 100644 index 271941d65..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_destructor.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_destructors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_destructor" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_destructors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_destructor" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_detector.json deleted file mode 100644 index 0c241b64d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_detector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_detectors": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_detector" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_detectors" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_detector" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_disk_interface.json deleted file mode 100644 index 787f2f838..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_disk_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_disk_interfaces": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_disk_interface" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_disk_interfaces" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_disk_interface" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_exporter.json deleted file mode 100644 index 96328752c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_exporter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_exporters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_exporter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_exporters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_exporter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_external_storage.json deleted file mode 100644 index 683e67880..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_external_storage.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_external_storages": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_external_storage" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_external_storages" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_external_storage" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_grid.json deleted file mode 100644 index 70affa4f3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_grid.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_grids": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_grid" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_grids" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_grid" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_importer.json deleted file mode 100644 index 75ec200e6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_importer.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_importers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_importer" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_importers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_importer" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_receiver.json deleted file mode 100644 index cbb5a32be..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_receiver.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_receivers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_receivers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_network_receiver" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_receivers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_network_receiver" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_transmitter.json deleted file mode 100644 index b6dcf8edd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_network_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_network_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_network_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_network_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_network_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_relay.json deleted file mode 100644 index f9c2f6021..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_relay.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_relays": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_relay" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_relays" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_relay" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_security_manager.json deleted file mode 100644 index 7fb7a521e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_security_manager.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_security_managers": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_security_manager" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_security_managers" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_security_manager" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json deleted file mode 100644 index e76b3bafe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/advancement/recipes/misc/coloring/yellow_wireless_transmitter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage2:coloring/yellow_wireless_transmitter" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_wireless_transmitters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_wireless_transmitters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage2:coloring/yellow_wireless_transmitter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_cable.json deleted file mode 100644 index eff94e73f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_constructor.json deleted file mode 100644 index 753922d66..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_controller.json deleted file mode 100644 index 01bc58310..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_crafting_grid.json deleted file mode 100644 index 4a80bf7d7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_creative_controller.json deleted file mode 100644 index d43a40079..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_destructor.json deleted file mode 100644 index 3ac5fd96a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_detector.json deleted file mode 100644 index 55dca85cf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_disk_interface.json deleted file mode 100644 index 08ff727bd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_grid.json deleted file mode 100644 index b74138620..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_receiver.json deleted file mode 100644 index 2a5a00d4e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_transmitter.json deleted file mode 100644 index 2ce2581b7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_relay.json deleted file mode 100644 index 4936678f4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_security_manager.json deleted file mode 100644 index 4fd9781dd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_wireless_transmitter.json deleted file mode 100644 index 71b4c8adb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/black_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:black_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/black_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_cable.json deleted file mode 100644 index 563325194..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_constructor.json deleted file mode 100644 index 388e5bdc0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_controller.json deleted file mode 100644 index 390df51b6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_crafting_grid.json deleted file mode 100644 index 1750a90b1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_creative_controller.json deleted file mode 100644 index 64cf2a64e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_destructor.json deleted file mode 100644 index e1005c998..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_detector.json deleted file mode 100644 index acef0289b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_disk_interface.json deleted file mode 100644 index f4a5125a6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_grid.json deleted file mode 100644 index be447f5c9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_receiver.json deleted file mode 100644 index 7f7f55aaf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_transmitter.json deleted file mode 100644 index 4b6d5871a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_relay.json deleted file mode 100644 index 565c2fba3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_security_manager.json deleted file mode 100644 index c6b69b0e3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_wireless_transmitter.json deleted file mode 100644 index 376e0aa4b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/blue_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:blue_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/blue_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_cable.json deleted file mode 100644 index 0100a7b2c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_constructor.json deleted file mode 100644 index 9c07417e5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_controller.json deleted file mode 100644 index b01b69478..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_crafting_grid.json deleted file mode 100644 index ce03dd013..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_creative_controller.json deleted file mode 100644 index 06c1cd897..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_destructor.json deleted file mode 100644 index 28591c9e7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_detector.json deleted file mode 100644 index ceb90498a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_disk_interface.json deleted file mode 100644 index 995cbabe6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_grid.json deleted file mode 100644 index a5573be2e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_receiver.json deleted file mode 100644 index 4968b9168..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_transmitter.json deleted file mode 100644 index 3196e10e6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_relay.json deleted file mode 100644 index 08d3ff147..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_security_manager.json deleted file mode 100644 index 316fbf1f7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_wireless_transmitter.json deleted file mode 100644 index e8deea0e8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/brown_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:brown_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/brown_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cable.json deleted file mode 100644 index b1be9e0da..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/constructor.json deleted file mode 100644 index 7c2b6d059..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/controller.json deleted file mode 100644 index c90360d3b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/crafting_grid.json deleted file mode 100644 index c96954927..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/creative_controller.json deleted file mode 100644 index e4657e54b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_cable.json deleted file mode 100644 index 339b1c487..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_constructor.json deleted file mode 100644 index 8d0b3bd0a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_controller.json deleted file mode 100644 index d67a53588..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_crafting_grid.json deleted file mode 100644 index ed3650356..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_creative_controller.json deleted file mode 100644 index c67540990..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_destructor.json deleted file mode 100644 index a78b7a597..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_detector.json deleted file mode 100644 index aae8bcf1e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_disk_interface.json deleted file mode 100644 index 21df5a33e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_grid.json deleted file mode 100644 index f4ef95783..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_receiver.json deleted file mode 100644 index 336cfb96a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_transmitter.json deleted file mode 100644 index b0ad4ad1f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_relay.json deleted file mode 100644 index 37304c1b4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_security_manager.json deleted file mode 100644 index 6e3cd9ddf..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_wireless_transmitter.json deleted file mode 100644 index ffa5b37d4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/cyan_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:cyan_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/cyan_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/destructor.json deleted file mode 100644 index daed8dffa..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/detector.json deleted file mode 100644 index e49d218e0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/disk_interface.json deleted file mode 100644 index e248ac4d6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_controller.json deleted file mode 100644 index 023383749..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_crafting_grid.json deleted file mode 100644 index ef824f9e8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_creative_controller.json deleted file mode 100644 index 0efaad58a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_detector.json deleted file mode 100644 index e42e98f0d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_disk_interface.json deleted file mode 100644 index 6c26b51f7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_grid.json deleted file mode 100644 index 093482b2c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_receiver.json deleted file mode 100644 index 391a6546c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_transmitter.json deleted file mode 100644 index 496d28ea7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_relay.json deleted file mode 100644 index b14675039..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_security_manager.json deleted file mode 100644 index d90110b34..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_wireless_transmitter.json deleted file mode 100644 index 663c4db65..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/gray_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:gray_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/gray_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_cable.json deleted file mode 100644 index 1b14dae94..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_constructor.json deleted file mode 100644 index 1d25fc4b6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_controller.json deleted file mode 100644 index 083a51bc7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_crafting_grid.json deleted file mode 100644 index a806a35b6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_creative_controller.json deleted file mode 100644 index a76bf9664..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_destructor.json deleted file mode 100644 index cd2d9f2f3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_detector.json deleted file mode 100644 index bc173e80a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_disk_interface.json deleted file mode 100644 index c276943c4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_grid.json deleted file mode 100644 index 23f41e9cc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_receiver.json deleted file mode 100644 index 439eb4a2d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_transmitter.json deleted file mode 100644 index 8a9a96cdc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_relay.json deleted file mode 100644 index a25a064b2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_security_manager.json deleted file mode 100644 index b63db65e0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_wireless_transmitter.json deleted file mode 100644 index 4c1dfaff6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/green_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:green_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/green_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/grid.json deleted file mode 100644 index 20c0277bb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_cable.json deleted file mode 100644 index 7491212a7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_blue_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_blue_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_constructor.json deleted file mode 100644 index 32bbf6e2f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_blue_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_blue_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_destructor.json deleted file mode 100644 index 49af40ee0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_blue_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_blue_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_blue_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_cable.json deleted file mode 100644 index 91b44a8db..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_constructor.json deleted file mode 100644 index 156bcec4c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_controller.json deleted file mode 100644 index 28742125c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_crafting_grid.json deleted file mode 100644 index 4aad99ac8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_creative_controller.json deleted file mode 100644 index e8b44c91a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_destructor.json deleted file mode 100644 index 72bbe173d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_detector.json deleted file mode 100644 index 99971e977..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_disk_interface.json deleted file mode 100644 index 86fb8c088..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_grid.json deleted file mode 100644 index cba39f571..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_receiver.json deleted file mode 100644 index fffe0d175..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_transmitter.json deleted file mode 100644 index 7c7b2060e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_relay.json deleted file mode 100644 index 10f10db8e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_security_manager.json deleted file mode 100644 index ebf2714e3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_wireless_transmitter.json deleted file mode 100644 index 05dcfb99a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/light_gray_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:light_gray_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/light_gray_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_cable.json deleted file mode 100644 index e5ba63283..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_constructor.json deleted file mode 100644 index 5cbc5a8bb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_controller.json deleted file mode 100644 index def85bb51..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_crafting_grid.json deleted file mode 100644 index 3119b1de4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_creative_controller.json deleted file mode 100644 index abda659ee..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_destructor.json deleted file mode 100644 index 35204ed7f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_detector.json deleted file mode 100644 index 4ced33fd0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_disk_interface.json deleted file mode 100644 index b14c6fd0c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_grid.json deleted file mode 100644 index f617cf60a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_receiver.json deleted file mode 100644 index a77be133b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_transmitter.json deleted file mode 100644 index 3003ee5ca..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_relay.json deleted file mode 100644 index 7b4771a9f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_security_manager.json deleted file mode 100644 index 99a7b4554..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_wireless_transmitter.json deleted file mode 100644 index e661ef3b1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/lime_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:lime_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/lime_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_cable.json deleted file mode 100644 index a9925716d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_constructor.json deleted file mode 100644 index e03d2e406..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_controller.json deleted file mode 100644 index d2d6e9785..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_crafting_grid.json deleted file mode 100644 index 8ec7cedb1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_creative_controller.json deleted file mode 100644 index fb9cfcd94..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_destructor.json deleted file mode 100644 index 8e461396e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_detector.json deleted file mode 100644 index 0dc9901a6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_disk_interface.json deleted file mode 100644 index 3f382a679..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_grid.json deleted file mode 100644 index 2e8e1464d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_receiver.json deleted file mode 100644 index 176a955c1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_transmitter.json deleted file mode 100644 index 782b74e49..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_relay.json deleted file mode 100644 index def0bf407..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_security_manager.json deleted file mode 100644 index 3c90dc9c2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_wireless_transmitter.json deleted file mode 100644 index a63f5a601..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/magenta_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:magenta_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/magenta_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_receiver.json deleted file mode 100644 index 47358ed7a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_transmitter.json deleted file mode 100644 index df0825083..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_cable.json deleted file mode 100644 index 5910707d0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_constructor.json deleted file mode 100644 index 22d46c36f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_controller.json deleted file mode 100644 index 48cc35100..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_crafting_grid.json deleted file mode 100644 index c9321c88d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_creative_controller.json deleted file mode 100644 index d027af4b9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_destructor.json deleted file mode 100644 index 19a0e2596..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_detector.json deleted file mode 100644 index db1e1ed96..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_disk_interface.json deleted file mode 100644 index 31d93f3a6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_grid.json deleted file mode 100644 index b011aaecd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_receiver.json deleted file mode 100644 index 98722f49f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_transmitter.json deleted file mode 100644 index 4c3beee56..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_relay.json deleted file mode 100644 index 646af5e56..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_security_manager.json deleted file mode 100644 index 326088094..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_wireless_transmitter.json deleted file mode 100644 index e3ef20fc5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/orange_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:orange_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/orange_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_cable.json deleted file mode 100644 index 31d0a4961..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_constructor.json deleted file mode 100644 index 690f0268f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_controller.json deleted file mode 100644 index af41cdaa9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_crafting_grid.json deleted file mode 100644 index 703b20845..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_creative_controller.json deleted file mode 100644 index 7ab6dbfc7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_destructor.json deleted file mode 100644 index 40e00870c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_detector.json deleted file mode 100644 index 895fca408..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_disk_interface.json deleted file mode 100644 index fb8d77572..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_grid.json deleted file mode 100644 index f39fc6644..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_receiver.json deleted file mode 100644 index 30297ee72..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_transmitter.json deleted file mode 100644 index 46de8d798..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_relay.json deleted file mode 100644 index 6255d9b7d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_security_manager.json deleted file mode 100644 index e2ff9bf92..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_wireless_transmitter.json deleted file mode 100644 index da03da537..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/pink_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:pink_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/pink_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_cable.json deleted file mode 100644 index f96f27896..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_constructor.json deleted file mode 100644 index 322f8ee65..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_controller.json deleted file mode 100644 index 8686b8aae..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_crafting_grid.json deleted file mode 100644 index e2d0b1a01..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_creative_controller.json deleted file mode 100644 index dc8360927..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_destructor.json deleted file mode 100644 index 5112e726d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_detector.json deleted file mode 100644 index bbaa5a9cc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_disk_interface.json deleted file mode 100644 index 1a19c8891..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_grid.json deleted file mode 100644 index 7107b2627..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_receiver.json deleted file mode 100644 index ac5c1f0e2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_transmitter.json deleted file mode 100644 index 7fb4dd113..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_relay.json deleted file mode 100644 index f92f4e4a8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_security_manager.json deleted file mode 100644 index 6975ab4da..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_wireless_transmitter.json deleted file mode 100644 index f3674203f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/purple_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:purple_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/purple_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_cable.json deleted file mode 100644 index 4c23ac676..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_constructor.json deleted file mode 100644 index 90122e7c5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_controller.json deleted file mode 100644 index 0b9348890..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_crafting_grid.json deleted file mode 100644 index 7246dc446..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_creative_controller.json deleted file mode 100644 index fc039287a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_destructor.json deleted file mode 100644 index e4a8e5050..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_detector.json deleted file mode 100644 index d394bd026..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_disk_interface.json deleted file mode 100644 index 9d3ce96c5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_grid.json deleted file mode 100644 index c894a3ca4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_receiver.json deleted file mode 100644 index fc732590f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_transmitter.json deleted file mode 100644 index 2d253ea54..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_relay.json deleted file mode 100644 index d050f5995..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_security_manager.json deleted file mode 100644 index 989b85699..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_wireless_transmitter.json deleted file mode 100644 index a2ebfb507..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/red_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:red_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/red_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/relay.json deleted file mode 100644 index d79ebcf77..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/security_manager.json deleted file mode 100644 index b98b0b671..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_cable.json deleted file mode 100644 index a748edeac..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_constructor.json deleted file mode 100644 index 5b6a1c86d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_controller.json deleted file mode 100644 index 04ae38487..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_crafting_grid.json deleted file mode 100644 index 6ae9c631a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_creative_controller.json deleted file mode 100644 index 927a4cd6c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_destructor.json deleted file mode 100644 index ad803f531..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_detector.json deleted file mode 100644 index d149876b4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_disk_interface.json deleted file mode 100644 index 1cdec3118..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_grid.json deleted file mode 100644 index edfd2aba3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_receiver.json deleted file mode 100644 index beab19808..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_transmitter.json deleted file mode 100644 index b3407b6b8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_relay.json deleted file mode 100644 index 7e6246c65..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_security_manager.json deleted file mode 100644 index 1bb6ac5e7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_wireless_transmitter.json deleted file mode 100644 index d3cc6214a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/white_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:white_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/white_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/wireless_transmitter.json deleted file mode 100644 index f86b96a1a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_cable.json deleted file mode 100644 index ccebb6c10..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_cable.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_cable" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_cable" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_constructor.json deleted file mode 100644 index 72570910d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_constructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_constructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_constructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_controller.json deleted file mode 100644 index 351b5d8e1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_controller.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "refinedstorage2:energy" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_crafting_grid.json deleted file mode 100644 index 450c5b703..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_crafting_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_crafting_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_crafting_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_creative_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_creative_controller.json deleted file mode 100644 index 2ee3240be..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_creative_controller.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_creative_controller" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_creative_controller" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_destructor.json deleted file mode 100644 index cc5abe315..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_destructor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_destructor" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_destructor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_detector.json deleted file mode 100644 index a0cea357f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_detector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_detector" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_detector" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_disk_interface.json deleted file mode 100644 index 37d73407a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_disk_interface.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_disk_interface" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_disk_interface" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_grid.json deleted file mode 100644 index 4a2960442..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_grid.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_grid" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_grid" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_receiver.json deleted file mode 100644 index 5dd21ad2a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_receiver.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_network_receiver" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_network_receiver" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_transmitter.json deleted file mode 100644 index b92dc2c60..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_network_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_network_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_network_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_relay.json deleted file mode 100644 index 3e2872c11..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_relay.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_relay" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_relay" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_security_manager.json deleted file mode 100644 index 47f43dbc6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_security_manager.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_security_manager" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_security_manager" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_wireless_transmitter.json deleted file mode 100644 index 74fe8195b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/loot_table/blocks/yellow_wireless_transmitter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:yellow_wireless_transmitter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage2:blocks/yellow_wireless_transmitter" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json deleted file mode 100644 index 03e63bbb9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json deleted file mode 100644 index 32ca15707..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json deleted file mode 100644 index da70cba63..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json deleted file mode 100644 index beebf8557..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json deleted file mode 100644 index c744936ec..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json deleted file mode 100644 index 7db11ead0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json deleted file mode 100644 index 5836010d7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json deleted file mode 100644 index 04b64328c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json deleted file mode 100644 index e36270d58..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json deleted file mode 100644 index 649e749e6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json deleted file mode 100644 index b7cc4b41f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json deleted file mode 100644 index b45f4de42..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json deleted file mode 100644 index 820d0ce10..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json deleted file mode 100644 index e7abfb22b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json deleted file mode 100644 index 50d5ca6d6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json deleted file mode 100644 index 0535acd01..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/black_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/black" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:black_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json deleted file mode 100644 index 4ae2d05b2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json deleted file mode 100644 index d687c2af0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json deleted file mode 100644 index d320cae3e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json deleted file mode 100644 index d3a196264..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json deleted file mode 100644 index a708e4ad6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json deleted file mode 100644 index 0e138060c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json deleted file mode 100644 index d299123ff..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json deleted file mode 100644 index 20bd87294..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json deleted file mode 100644 index 6c921bf61..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json deleted file mode 100644 index 115cd6c74..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json deleted file mode 100644 index 2ea50f408..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json deleted file mode 100644 index 403bc7375..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json deleted file mode 100644 index 8be4d4e60..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json deleted file mode 100644 index bb4eb773a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json deleted file mode 100644 index 9e87cc46d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json deleted file mode 100644 index 44e3613f6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/blue_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:blue_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json deleted file mode 100644 index ad32527e8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json deleted file mode 100644 index f20534db3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json deleted file mode 100644 index 8409658e4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json deleted file mode 100644 index f56d1b876..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json deleted file mode 100644 index 99f5e9be9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json deleted file mode 100644 index 27f6a510d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json deleted file mode 100644 index dd296db52..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json deleted file mode 100644 index 4b07d1027..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json deleted file mode 100644 index 0cc0d22d7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json deleted file mode 100644 index e516ebe7d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json deleted file mode 100644 index 4cb69c75f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json deleted file mode 100644 index c4730baf1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json deleted file mode 100644 index 232cd88da..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json deleted file mode 100644 index c2badda03..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json deleted file mode 100644 index 5be1302c6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json deleted file mode 100644 index d8e395648..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/brown_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/brown" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:brown_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json deleted file mode 100644 index d228b7c61..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json deleted file mode 100644 index 00dfa3c23..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json deleted file mode 100644 index 60d8cc2c7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json deleted file mode 100644 index c700f3db9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json deleted file mode 100644 index 34256882d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json deleted file mode 100644 index 2ab2214fe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json deleted file mode 100644 index 5ebcdb864..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json deleted file mode 100644 index 89cab1c9d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json deleted file mode 100644 index c3180f0f9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json deleted file mode 100644 index d8daa1078..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json deleted file mode 100644 index 18c77399e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json deleted file mode 100644 index ec8d2f1ac..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json deleted file mode 100644 index f269d67a9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json deleted file mode 100644 index 8ab6ba19b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json deleted file mode 100644 index 9b6da20a4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json deleted file mode 100644 index 4462764fd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/cyan_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/cyan" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cyan_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json deleted file mode 100644 index 9191ca1a9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json deleted file mode 100644 index 5747968ec..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json deleted file mode 100644 index 31ede6bfc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json deleted file mode 100644 index fab3c0f6b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json deleted file mode 100644 index f064ea824..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json deleted file mode 100644 index f33bf5e21..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json deleted file mode 100644 index ffbfd9158..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json deleted file mode 100644 index 3747bf611..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json deleted file mode 100644 index 0c2217f9f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json deleted file mode 100644 index 5ec6e0de2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json deleted file mode 100644 index 5368c7193..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json deleted file mode 100644 index deec3b4ae..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json deleted file mode 100644 index 2793c6e3e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json deleted file mode 100644 index 3aac0399f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json deleted file mode 100644 index 61b687fd9..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json deleted file mode 100644 index ef92e5275..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/gray_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:gray_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json deleted file mode 100644 index 351d302d7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json deleted file mode 100644 index e80c19944..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json deleted file mode 100644 index cea91ce3f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json deleted file mode 100644 index ad74e4cee..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json deleted file mode 100644 index 4c49d4811..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json deleted file mode 100644 index 9cfb98f44..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json deleted file mode 100644 index c109912e8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json deleted file mode 100644 index ae15a5428..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json deleted file mode 100644 index 2003f9ad0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json deleted file mode 100644 index 3eb975e80..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json deleted file mode 100644 index cd60a7b22..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json deleted file mode 100644 index f2c3d2ffb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json deleted file mode 100644 index ba28a1cbc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json deleted file mode 100644 index a5e2d01ef..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json deleted file mode 100644 index 7402ab676..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json deleted file mode 100644 index daf4a1d28..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/green_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/green" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:green_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json deleted file mode 100644 index c28060e32..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_blue_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json deleted file mode 100644 index 70c835907..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_blue_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json deleted file mode 100644 index 49260c7c1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json deleted file mode 100644 index 16f83b36f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json deleted file mode 100644 index f151debf7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_blue_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json deleted file mode 100644 index e947ad6a0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json deleted file mode 100644 index 2ac76a396..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json deleted file mode 100644 index 822bd2733..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_blue_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json deleted file mode 100644 index abdbb3e49..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_blue_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json deleted file mode 100644 index 67034f6df..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json deleted file mode 100644 index 8eb130eff..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_blue_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json deleted file mode 100644 index 9dad64ea6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json deleted file mode 100644 index d7ff88b12..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json deleted file mode 100644 index 20fdd3cce..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json deleted file mode 100644 index cd369f2aa..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json deleted file mode 100644 index e2dc65581..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_blue_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/light_blue" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json deleted file mode 100644 index 038cc58d8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json deleted file mode 100644 index 5572f094b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json deleted file mode 100644 index 0c16764b6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json deleted file mode 100644 index d79d44673..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json deleted file mode 100644 index e71784736..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json deleted file mode 100644 index ddc394cac..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json deleted file mode 100644 index 101704f98..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json deleted file mode 100644 index 918455fcc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json deleted file mode 100644 index e49fcd37b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json deleted file mode 100644 index 700d8ca6b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json deleted file mode 100644 index 26b0fcd1c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json deleted file mode 100644 index 686fb392e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json deleted file mode 100644 index c73d67956..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json deleted file mode 100644 index 7f9f60966..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json deleted file mode 100644 index 1c4fe7e35..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json deleted file mode 100644 index ed3483bdd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/light_gray_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/light_gray" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:light_gray_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json deleted file mode 100644 index 4d0bbd578..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json deleted file mode 100644 index 6c1c1db2e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json deleted file mode 100644 index 8494d1c01..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json deleted file mode 100644 index 6d7191376..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json deleted file mode 100644 index 4da64644c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json deleted file mode 100644 index 7c9c8f534..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json deleted file mode 100644 index bfba3cf95..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json deleted file mode 100644 index f1b6baafb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json deleted file mode 100644 index 1af110c21..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json deleted file mode 100644 index 0a5523b41..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json deleted file mode 100644 index be9b64557..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json deleted file mode 100644 index 66225b228..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json deleted file mode 100644 index b231fb27c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json deleted file mode 100644 index 3e2d61dff..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json deleted file mode 100644 index a72be5501..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json deleted file mode 100644 index 26c826265..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/lime_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/lime" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:lime_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json deleted file mode 100644 index 39b48880d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json deleted file mode 100644 index 7312efd0e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json deleted file mode 100644 index 95927d1b4..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json deleted file mode 100644 index 79ceecc32..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json deleted file mode 100644 index 021be5dde..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json deleted file mode 100644 index ac6efb24c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json deleted file mode 100644 index 4929305ae..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json deleted file mode 100644 index 199b014c6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json deleted file mode 100644 index faf220f63..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json deleted file mode 100644 index 3631d11d5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json deleted file mode 100644 index 3f3a035bc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json deleted file mode 100644 index df94c0295..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json deleted file mode 100644 index 076a0199f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json deleted file mode 100644 index 1ad3cc52f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json deleted file mode 100644 index a5234e733..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json deleted file mode 100644 index 8d491194b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/magenta_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/magenta" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:magenta_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json deleted file mode 100644 index c2f9e2281..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json deleted file mode 100644 index 4580106fb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json deleted file mode 100644 index 5bf7cffb0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json deleted file mode 100644 index cee1f00c0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json deleted file mode 100644 index 936ff6cc5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json deleted file mode 100644 index 42735138d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json deleted file mode 100644 index d50062231..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json deleted file mode 100644 index 981491e1e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json deleted file mode 100644 index 1f5f81924..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json deleted file mode 100644 index eab9ee8f8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json deleted file mode 100644 index 920512f37..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json deleted file mode 100644 index 7ab6a1346..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json deleted file mode 100644 index 24c7e0248..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json deleted file mode 100644 index 51d41b545..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json deleted file mode 100644 index 02f331278..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json deleted file mode 100644 index 6b6a067d3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/orange_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/orange" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:orange_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json deleted file mode 100644 index 79ac356cd..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json deleted file mode 100644 index 37f7d3de6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json deleted file mode 100644 index ec9d3e00c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json deleted file mode 100644 index 302885632..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json deleted file mode 100644 index 9611e0bd8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json deleted file mode 100644 index 6b1a9e8ac..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json deleted file mode 100644 index 5d350f306..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json deleted file mode 100644 index 99a57b0bc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json deleted file mode 100644 index 8dfba1125..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json deleted file mode 100644 index bdb00cccc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json deleted file mode 100644 index 4cec37e64..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json deleted file mode 100644 index 9f32b0cf5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json deleted file mode 100644 index 1a76a0d82..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json deleted file mode 100644 index 6ab94dffe..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json deleted file mode 100644 index 2ddcec9d7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json deleted file mode 100644 index 0e53e3dac..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/pink_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/pink" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:pink_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json deleted file mode 100644 index 6c0c818bb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json deleted file mode 100644 index bca5a1c26..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json deleted file mode 100644 index 8915e8fcc..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json deleted file mode 100644 index 57b47b8c2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json deleted file mode 100644 index 49df2b52a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json deleted file mode 100644 index e82d56f35..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json deleted file mode 100644 index 942fb28ca..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json deleted file mode 100644 index 8cf35b908..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json deleted file mode 100644 index 222a63d8b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json deleted file mode 100644 index 4a6c9bb16..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json deleted file mode 100644 index 28a750486..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json deleted file mode 100644 index 4493794d2..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json deleted file mode 100644 index a19991ff6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json deleted file mode 100644 index 77ffef0ae..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json deleted file mode 100644 index 66f08e2a1..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json deleted file mode 100644 index c4c28d2b6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/purple_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/purple" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:purple_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json deleted file mode 100644 index 3c595e399..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json deleted file mode 100644 index 867a8073c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json deleted file mode 100644 index 624f9ca5a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json deleted file mode 100644 index 310ff4b23..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json deleted file mode 100644 index 3fa2e0982..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json deleted file mode 100644 index b19baad29..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json deleted file mode 100644 index 3e598ef9a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json deleted file mode 100644 index 3c8f027c6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json deleted file mode 100644 index e42e88032..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json deleted file mode 100644 index 73eeb353c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json deleted file mode 100644 index d3749a94f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json deleted file mode 100644 index 7d1da161f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json deleted file mode 100644 index ef76fe58f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json deleted file mode 100644 index d9be3b246..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json deleted file mode 100644 index 4699b22c8..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json deleted file mode 100644 index a66fc9903..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/red_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/red" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:red_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json deleted file mode 100644 index 74ac95c7c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json deleted file mode 100644 index 1e4cc1ba3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json deleted file mode 100644 index 8521f80b6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json deleted file mode 100644 index 4a88a4d36..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json deleted file mode 100644 index ac1d8325a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json deleted file mode 100644 index 06598ed37..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json deleted file mode 100644 index 4b041fdc0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json deleted file mode 100644 index 5bb0df589..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json deleted file mode 100644 index 27e26f93e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json deleted file mode 100644 index 7f7901742..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json deleted file mode 100644 index a170e35df..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json deleted file mode 100644 index 8d1b35613..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json deleted file mode 100644 index 46c76fb40..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json deleted file mode 100644 index 71402133e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json deleted file mode 100644 index ba4fe7bda..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json deleted file mode 100644 index 261f9645b..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/white_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/white" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:white_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json deleted file mode 100644 index 57e468397..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_cable.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:cables" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_cable" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json deleted file mode 100644 index 906cd1eb0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_constructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:constructors" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json deleted file mode 100644 index 6c1d944f5..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_controller.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:controllers" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_controller" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json deleted file mode 100644 index d2119e22a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_crafting_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:crafting_grids" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json deleted file mode 100644 index 297b1b7c3..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_destructor.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:destructors" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json deleted file mode 100644 index 22724bc42..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_detector.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:detectors" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json deleted file mode 100644 index 70a92d231..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_disk_interface.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:disk_interfaces" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json deleted file mode 100644 index 7bb3e4cca..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_exporter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:exporters" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json deleted file mode 100644 index 3f7443f85..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_external_storage.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:external_storages" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json deleted file mode 100644 index 990dc6415..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_grid.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:grids" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json deleted file mode 100644 index 93e502a29..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_importer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:importers" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json deleted file mode 100644 index 65d144ce6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_receiver.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_receivers" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json deleted file mode 100644 index 5ca74e14a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_network_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:network_transmitters" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json deleted file mode 100644 index bf30a7b7c..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_relay.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:relays" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json deleted file mode 100644 index e2c8d8553..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_security_manager.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:security_managers" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json deleted file mode 100644 index fef7a2054..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/recipe/coloring/yellow_wireless_transmitter.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "refinedstorage2:wireless_transmitters" - }, - { - "tag": "c:dyes/yellow" - } - ], - "result": { - "count": 1, - "id": "refinedstorage2:yellow_wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/cables.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/cables.json deleted file mode 100644 index 05b00f55f..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/cables.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:cable", - "refinedstorage2:light_gray_cable", - "refinedstorage2:cyan_cable", - "refinedstorage2:purple_cable", - "refinedstorage2:blue_cable", - "refinedstorage2:brown_cable", - "refinedstorage2:green_cable", - "refinedstorage2:red_cable", - "refinedstorage2:black_cable", - "refinedstorage2:white_cable", - "refinedstorage2:orange_cable", - "refinedstorage2:magenta_cable", - "refinedstorage2:light_blue_cable", - "refinedstorage2:yellow_cable", - "refinedstorage2:lime_cable", - "refinedstorage2:pink_cable" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/constructors.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/constructors.json deleted file mode 100644 index 8ad5ef17e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/constructors.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_constructor", - "refinedstorage2:orange_constructor", - "refinedstorage2:magenta_constructor", - "refinedstorage2:light_blue_constructor", - "refinedstorage2:yellow_constructor", - "refinedstorage2:lime_constructor", - "refinedstorage2:pink_constructor", - "refinedstorage2:constructor", - "refinedstorage2:light_gray_constructor", - "refinedstorage2:cyan_constructor", - "refinedstorage2:purple_constructor", - "refinedstorage2:blue_constructor", - "refinedstorage2:brown_constructor", - "refinedstorage2:green_constructor", - "refinedstorage2:red_constructor", - "refinedstorage2:black_constructor" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/controllers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/controllers.json deleted file mode 100644 index dd6498e10..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/controllers.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:controller", - "refinedstorage2:yellow_controller", - "refinedstorage2:lime_controller", - "refinedstorage2:pink_controller", - "refinedstorage2:gray_controller", - "refinedstorage2:light_gray_controller", - "refinedstorage2:cyan_controller", - "refinedstorage2:purple_controller", - "refinedstorage2:blue_controller", - "refinedstorage2:brown_controller", - "refinedstorage2:green_controller", - "refinedstorage2:red_controller", - "refinedstorage2:black_controller", - "refinedstorage2:white_controller", - "refinedstorage2:orange_controller", - "refinedstorage2:magenta_controller" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/crafting_grids.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/crafting_grids.json deleted file mode 100644 index ac4ebf0ac..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/crafting_grids.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_crafting_grid", - "refinedstorage2:orange_crafting_grid", - "refinedstorage2:magenta_crafting_grid", - "refinedstorage2:crafting_grid", - "refinedstorage2:yellow_crafting_grid", - "refinedstorage2:lime_crafting_grid", - "refinedstorage2:pink_crafting_grid", - "refinedstorage2:gray_crafting_grid", - "refinedstorage2:light_gray_crafting_grid", - "refinedstorage2:cyan_crafting_grid", - "refinedstorage2:purple_crafting_grid", - "refinedstorage2:blue_crafting_grid", - "refinedstorage2:brown_crafting_grid", - "refinedstorage2:green_crafting_grid", - "refinedstorage2:red_crafting_grid", - "refinedstorage2:black_crafting_grid" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/creative_controllers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/creative_controllers.json deleted file mode 100644 index 07d729e2d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/creative_controllers.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_creative_controller", - "refinedstorage2:orange_creative_controller", - "refinedstorage2:magenta_creative_controller", - "refinedstorage2:creative_controller", - "refinedstorage2:yellow_creative_controller", - "refinedstorage2:lime_creative_controller", - "refinedstorage2:pink_creative_controller", - "refinedstorage2:gray_creative_controller", - "refinedstorage2:light_gray_creative_controller", - "refinedstorage2:cyan_creative_controller", - "refinedstorage2:purple_creative_controller", - "refinedstorage2:blue_creative_controller", - "refinedstorage2:brown_creative_controller", - "refinedstorage2:green_creative_controller", - "refinedstorage2:red_creative_controller", - "refinedstorage2:black_creative_controller" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/destructors.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/destructors.json deleted file mode 100644 index 261e81668..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/destructors.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_destructor", - "refinedstorage2:orange_destructor", - "refinedstorage2:magenta_destructor", - "refinedstorage2:light_blue_destructor", - "refinedstorage2:yellow_destructor", - "refinedstorage2:lime_destructor", - "refinedstorage2:pink_destructor", - "refinedstorage2:destructor", - "refinedstorage2:light_gray_destructor", - "refinedstorage2:cyan_destructor", - "refinedstorage2:purple_destructor", - "refinedstorage2:blue_destructor", - "refinedstorage2:brown_destructor", - "refinedstorage2:green_destructor", - "refinedstorage2:red_destructor", - "refinedstorage2:black_destructor" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/detectors.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/detectors.json deleted file mode 100644 index 052f8d2c6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/detectors.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_detector", - "refinedstorage2:orange_detector", - "refinedstorage2:magenta_detector", - "refinedstorage2:detector", - "refinedstorage2:yellow_detector", - "refinedstorage2:lime_detector", - "refinedstorage2:pink_detector", - "refinedstorage2:gray_detector", - "refinedstorage2:light_gray_detector", - "refinedstorage2:cyan_detector", - "refinedstorage2:purple_detector", - "refinedstorage2:blue_detector", - "refinedstorage2:brown_detector", - "refinedstorage2:green_detector", - "refinedstorage2:red_detector", - "refinedstorage2:black_detector" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/disk_interfaces.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/disk_interfaces.json deleted file mode 100644 index 571b84d29..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/disk_interfaces.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_disk_interface", - "refinedstorage2:orange_disk_interface", - "refinedstorage2:magenta_disk_interface", - "refinedstorage2:disk_interface", - "refinedstorage2:yellow_disk_interface", - "refinedstorage2:lime_disk_interface", - "refinedstorage2:pink_disk_interface", - "refinedstorage2:gray_disk_interface", - "refinedstorage2:light_gray_disk_interface", - "refinedstorage2:cyan_disk_interface", - "refinedstorage2:purple_disk_interface", - "refinedstorage2:blue_disk_interface", - "refinedstorage2:brown_disk_interface", - "refinedstorage2:green_disk_interface", - "refinedstorage2:red_disk_interface", - "refinedstorage2:black_disk_interface" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/exporters.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/exporters.json deleted file mode 100644 index a9019782d..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/exporters.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_exporter", - "refinedstorage2:orange_exporter", - "refinedstorage2:magenta_exporter", - "refinedstorage2:light_blue_exporter", - "refinedstorage2:yellow_exporter", - "refinedstorage2:lime_exporter", - "refinedstorage2:pink_exporter", - "refinedstorage2:exporter", - "refinedstorage2:light_gray_exporter", - "refinedstorage2:cyan_exporter", - "refinedstorage2:purple_exporter", - "refinedstorage2:blue_exporter", - "refinedstorage2:brown_exporter", - "refinedstorage2:green_exporter", - "refinedstorage2:red_exporter", - "refinedstorage2:black_exporter" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/external_storages.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/external_storages.json deleted file mode 100644 index c7bca6ed0..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/external_storages.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_external_storage", - "refinedstorage2:orange_external_storage", - "refinedstorage2:magenta_external_storage", - "refinedstorage2:light_blue_external_storage", - "refinedstorage2:yellow_external_storage", - "refinedstorage2:lime_external_storage", - "refinedstorage2:pink_external_storage", - "refinedstorage2:external_storage", - "refinedstorage2:light_gray_external_storage", - "refinedstorage2:cyan_external_storage", - "refinedstorage2:purple_external_storage", - "refinedstorage2:blue_external_storage", - "refinedstorage2:brown_external_storage", - "refinedstorage2:green_external_storage", - "refinedstorage2:red_external_storage", - "refinedstorage2:black_external_storage" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/fluid_storage_disks.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/fluid_storage_disks.json deleted file mode 100644 index 44accf37a..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/fluid_storage_disks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "refinedstorage2:64b_fluid_storage_disk", - "refinedstorage2:256b_fluid_storage_disk", - "refinedstorage2:1024b_fluid_storage_disk", - "refinedstorage2:4096b_fluid_storage_disk" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/grids.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/grids.json deleted file mode 100644 index f3c7879bb..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/grids.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_grid", - "refinedstorage2:orange_grid", - "refinedstorage2:magenta_grid", - "refinedstorage2:grid", - "refinedstorage2:yellow_grid", - "refinedstorage2:lime_grid", - "refinedstorage2:pink_grid", - "refinedstorage2:gray_grid", - "refinedstorage2:light_gray_grid", - "refinedstorage2:cyan_grid", - "refinedstorage2:purple_grid", - "refinedstorage2:blue_grid", - "refinedstorage2:brown_grid", - "refinedstorage2:green_grid", - "refinedstorage2:red_grid", - "refinedstorage2:black_grid" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/importers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/importers.json deleted file mode 100644 index 5cc05bb38..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/importers.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_importer", - "refinedstorage2:orange_importer", - "refinedstorage2:magenta_importer", - "refinedstorage2:light_blue_importer", - "refinedstorage2:yellow_importer", - "refinedstorage2:lime_importer", - "refinedstorage2:pink_importer", - "refinedstorage2:importer", - "refinedstorage2:light_gray_importer", - "refinedstorage2:cyan_importer", - "refinedstorage2:purple_importer", - "refinedstorage2:blue_importer", - "refinedstorage2:brown_importer", - "refinedstorage2:green_importer", - "refinedstorage2:red_importer", - "refinedstorage2:black_importer" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_receivers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_receivers.json deleted file mode 100644 index 2e1d18612..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_receivers.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_network_receiver", - "refinedstorage2:orange_network_receiver", - "refinedstorage2:magenta_network_receiver", - "refinedstorage2:network_receiver", - "refinedstorage2:yellow_network_receiver", - "refinedstorage2:lime_network_receiver", - "refinedstorage2:pink_network_receiver", - "refinedstorage2:gray_network_receiver", - "refinedstorage2:light_gray_network_receiver", - "refinedstorage2:cyan_network_receiver", - "refinedstorage2:purple_network_receiver", - "refinedstorage2:blue_network_receiver", - "refinedstorage2:brown_network_receiver", - "refinedstorage2:green_network_receiver", - "refinedstorage2:red_network_receiver", - "refinedstorage2:black_network_receiver" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_transmitters.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_transmitters.json deleted file mode 100644 index 5e6f46c32..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/network_transmitters.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_network_transmitter", - "refinedstorage2:orange_network_transmitter", - "refinedstorage2:magenta_network_transmitter", - "refinedstorage2:network_transmitter", - "refinedstorage2:yellow_network_transmitter", - "refinedstorage2:lime_network_transmitter", - "refinedstorage2:pink_network_transmitter", - "refinedstorage2:gray_network_transmitter", - "refinedstorage2:light_gray_network_transmitter", - "refinedstorage2:cyan_network_transmitter", - "refinedstorage2:purple_network_transmitter", - "refinedstorage2:blue_network_transmitter", - "refinedstorage2:brown_network_transmitter", - "refinedstorage2:green_network_transmitter", - "refinedstorage2:red_network_transmitter", - "refinedstorage2:black_network_transmitter" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/relays.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/relays.json deleted file mode 100644 index d65c7afe7..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/relays.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_relay", - "refinedstorage2:orange_relay", - "refinedstorage2:magenta_relay", - "refinedstorage2:relay", - "refinedstorage2:yellow_relay", - "refinedstorage2:lime_relay", - "refinedstorage2:pink_relay", - "refinedstorage2:gray_relay", - "refinedstorage2:light_gray_relay", - "refinedstorage2:cyan_relay", - "refinedstorage2:purple_relay", - "refinedstorage2:blue_relay", - "refinedstorage2:brown_relay", - "refinedstorage2:green_relay", - "refinedstorage2:red_relay", - "refinedstorage2:black_relay" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/security_managers.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/security_managers.json deleted file mode 100644 index 1ad2bddc6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/security_managers.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_security_manager", - "refinedstorage2:orange_security_manager", - "refinedstorage2:magenta_security_manager", - "refinedstorage2:security_manager", - "refinedstorage2:yellow_security_manager", - "refinedstorage2:lime_security_manager", - "refinedstorage2:pink_security_manager", - "refinedstorage2:gray_security_manager", - "refinedstorage2:light_gray_security_manager", - "refinedstorage2:cyan_security_manager", - "refinedstorage2:purple_security_manager", - "refinedstorage2:blue_security_manager", - "refinedstorage2:brown_security_manager", - "refinedstorage2:green_security_manager", - "refinedstorage2:red_security_manager", - "refinedstorage2:black_security_manager" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/storage_disks.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/storage_disks.json deleted file mode 100644 index 4e045d2f6..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/storage_disks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "refinedstorage2:1k_storage_disk", - "refinedstorage2:4k_storage_disk", - "refinedstorage2:16k_storage_disk", - "refinedstorage2:64k_storage_disk" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/wireless_transmitters.json b/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/wireless_transmitters.json deleted file mode 100644 index 0d8e90a5e..000000000 --- a/refinedstorage2-platform-common/src/generated/resources/data/refinedstorage2/tags/item/wireless_transmitters.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage2:white_wireless_transmitter", - "refinedstorage2:orange_wireless_transmitter", - "refinedstorage2:magenta_wireless_transmitter", - "refinedstorage2:wireless_transmitter", - "refinedstorage2:yellow_wireless_transmitter", - "refinedstorage2:lime_wireless_transmitter", - "refinedstorage2:pink_wireless_transmitter", - "refinedstorage2:gray_wireless_transmitter", - "refinedstorage2:light_gray_wireless_transmitter", - "refinedstorage2:cyan_wireless_transmitter", - "refinedstorage2:purple_wireless_transmitter", - "refinedstorage2:blue_wireless_transmitter", - "refinedstorage2:brown_wireless_transmitter", - "refinedstorage2:green_wireless_transmitter", - "refinedstorage2:red_wireless_transmitter", - "refinedstorage2:black_wireless_transmitter" - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java deleted file mode 100644 index 126f06420..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractClientModInitializer.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorScreen; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.DestructorScreen; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.content.KeyMappings; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerScreen; -import com.refinedmods.refinedstorage2.platform.common.detector.DetectorScreen; -import com.refinedmods.refinedstorage2.platform.common.exporter.ExporterScreen; -import com.refinedmods.refinedstorage2.platform.common.grid.GridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.screen.CraftingGridScreen; -import com.refinedmods.refinedstorage2.platform.common.grid.screen.GridScreen; -import com.refinedmods.refinedstorage2.platform.common.grid.screen.hint.FluidGridInsertionHint; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceScreen; -import com.refinedmods.refinedstorage2.platform.common.importer.ImporterScreen; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterScreen; -import com.refinedmods.refinedstorage2.platform.common.networking.RelayScreen; -import com.refinedmods.refinedstorage2.platform.common.security.FallbackSecurityCardScreen; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardScreen; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerScreen; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveScreen; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceScreen; -import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageScreen; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridScreen; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockScreen; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockScreen; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorScreen; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceRendering; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResourceRendering; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeScreen; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterScreen; - -import net.minecraft.client.KeyMapping; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.MenuAccess; -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; -import net.minecraft.world.inventory.MenuType; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public abstract class AbstractClientModInitializer { - protected static void registerScreens(final ScreenRegistration registration) { - registration.register(Menus.INSTANCE.getDiskDrive(), DiskDriveScreen::new); - registration.register(Menus.INSTANCE.getGrid(), GridScreen::new); - registration.register(Menus.INSTANCE.getCraftingGrid(), CraftingGridScreen::new); - registration.register(Menus.INSTANCE.getWirelessGrid(), GridScreen::new); - registration.register(Menus.INSTANCE.getController(), ControllerScreen::new); - registration.register(Menus.INSTANCE.getItemStorage(), ItemStorageBlockScreen::new); - registration.register(Menus.INSTANCE.getFluidStorage(), FluidStorageBlockScreen::new); - registration.register(Menus.INSTANCE.getImporter(), ImporterScreen::new); - registration.register(Menus.INSTANCE.getExporter(), ExporterScreen::new); - registration.register(Menus.INSTANCE.getInterface(), InterfaceScreen::new); - registration.register(Menus.INSTANCE.getExternalStorage(), ExternalStorageScreen::new); - registration.register(Menus.INSTANCE.getDetector(), DetectorScreen::new); - registration.register(Menus.INSTANCE.getDestructor(), DestructorScreen::new); - registration.register(Menus.INSTANCE.getConstructor(), ConstructorScreen::new); - registration.register(Menus.INSTANCE.getRegulatorUpgrade(), RegulatorUpgradeScreen::new); - registration.register(Menus.INSTANCE.getWirelessTransmitter(), WirelessTransmitterScreen::new); - registration.register(Menus.INSTANCE.getStorageMonitor(), StorageMonitorScreen::new); - registration.register(Menus.INSTANCE.getNetworkTransmitter(), NetworkTransmitterScreen::new); - registration.register(Menus.INSTANCE.getPortableGridBlock(), PortableGridScreen::new); - registration.register(Menus.INSTANCE.getPortableGridItem(), PortableGridScreen::new); - registration.register(Menus.INSTANCE.getSecurityCard(), SecurityCardScreen::new); - registration.register(Menus.INSTANCE.getFallbackSecurityCard(), FallbackSecurityCardScreen::new); - registration.register(Menus.INSTANCE.getSecurityManager(), SecurityManagerScreen::new); - registration.register(Menus.INSTANCE.getRelay(), RelayScreen::new); - registration.register(Menus.INSTANCE.getDiskInterface(), DiskInterfaceScreen::new); - } - - protected static void registerAlternativeGridHints() { - PlatformApi.INSTANCE.addAlternativeGridInsertionHint(new FluidGridInsertionHint()); - } - - protected static void registerResourceRendering() { - PlatformApi.INSTANCE.registerResourceRendering(ItemResource.class, new ItemResourceRendering()); - PlatformApi.INSTANCE.registerResourceRendering(FluidResource.class, new FluidResourceRendering()); - } - - protected static void handleInputEvents() { - final Player player = Minecraft.getInstance().player; - if (player == null) { - return; - } - final KeyMapping openWirelessGrid = KeyMappings.INSTANCE.getOpenWirelessGrid(); - while (openWirelessGrid != null && openWirelessGrid.consumeClick()) { - PlatformApi.INSTANCE.useNetworkBoundItem( - player, - Items.INSTANCE.getWirelessGrid(), - Items.INSTANCE.getCreativeWirelessGrid() - ); - } - } - - protected static void registerDiskModels() { - final ResourceLocation diskModel = createIdentifier("block/disk/disk"); - for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { - PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( - Items.INSTANCE.getItemStorageDisk(variant), - diskModel - ); - } - - final ResourceLocation fluidDiskModel = createIdentifier("block/disk/fluid_disk"); - for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { - PlatformApi.INSTANCE.getStorageContainerItemHelper().registerDiskModel( - Items.INSTANCE.getFluidStorageDisk(variant), - fluidDiskModel - ); - } - } - - @FunctionalInterface - public interface ScreenRegistration { - > void register(MenuType type, - ScreenConstructor - factory); - } - - @FunctionalInterface - public interface ScreenConstructor> { - U create(T menu, Inventory inventory, Component title); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java deleted file mode 100644 index 0eff45581..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java +++ /dev/null @@ -1,886 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.impl.energy.EnergyNetworkComponentImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.GraphNetworkComponentImpl; -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.api.network.impl.security.SecurityNetworkComponentImpl; -import com.refinedmods.refinedstorage2.api.network.node.GraphNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.security.SecurityNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.PlatformApiProxy; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformSecurityNetworkComponent; -import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.configurationcard.ConfigurationCardItem; -import com.refinedmods.refinedstorage2.platform.common.configurationcard.ConfigurationCardState; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.BlockBreakDestructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ConstructorContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.DestructorBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.DestructorContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.FluidBreakDestructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ItemDropConstructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.ItemPickupDestructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.PlaceBlockConstructorStrategy; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.PlaceFireworksConstructorStrategy; -import com.refinedmods.refinedstorage2.platform.common.constructordestructor.PlaceFluidConstructorStrategy; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntityTypeFactory; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.ContentIds; -import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; -import com.refinedmods.refinedstorage2.platform.common.content.ExtendedMenuTypeFactory; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.content.LootFunctions; -import com.refinedmods.refinedstorage2.platform.common.content.MenuTypeFactory; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.content.RegistryCallback; -import com.refinedmods.refinedstorage2.platform.common.content.Sounds; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerData; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerType; -import com.refinedmods.refinedstorage2.platform.common.detector.DetectorBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.detector.DetectorContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.exporter.ExporterBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.exporter.ExporterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.GridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.grid.GridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.GridData; -import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.WirelessGridData; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceBlock; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.iface.InterfaceData; -import com.refinedmods.refinedstorage2.platform.common.importer.ImporterBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.importer.ImporterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.misc.ProcessorItem; -import com.refinedmods.refinedstorage2.platform.common.misc.WrenchItem; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkCardItem; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterData; -import com.refinedmods.refinedstorage2.platform.common.networking.RelayBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.networking.RelayContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.security.BuiltinPermission; -import com.refinedmods.refinedstorage2.platform.common.security.FallbackSecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.security.PlatformSecurityNetworkComponentImpl; -import com.refinedmods.refinedstorage2.platform.common.security.PlayerBoundSecurityCardData; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardBoundPlayer; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardData; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardPermissions; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridItemContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridLootItemFunction; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockBlockItem; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockBlockItem; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.StorageBlockData; -import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.StorageBlockLootItemFunction; -import com.refinedmods.refinedstorage2.platform.common.storage.storagedisk.FluidStorageDiskItem; -import com.refinedmods.refinedstorage2.platform.common.storage.storagedisk.ItemStorageDiskItem; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.FluidStorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.FluidStorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.ItemStorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.ItemStorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlock; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.SimpleBlock; -import com.refinedmods.refinedstorage2.platform.common.support.SimpleItem; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyLootItemFunction; -import com.refinedmods.refinedstorage2.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.InventorySlotReferenceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.network.component.PlatformStorageNetworkComponent; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage2.platform.common.upgrade.FortuneUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RangeUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeState; -import com.refinedmods.refinedstorage2.platform.common.upgrade.SimpleUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeWithEnchantedBookRecipeSerializer; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.BaseWirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.CreativeRangeUpgradeWirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.RangeUpgradeWirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterData; - -import java.util.Optional; -import java.util.UUID; -import java.util.function.BiFunction; -import java.util.function.Supplier; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import net.minecraft.core.BlockPos; -import net.minecraft.core.GlobalPos; -import net.minecraft.core.UUIDUtil; -import net.minecraft.core.component.DataComponentType; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.RecipeSerializer; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; - -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CABLE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CONSTRUCTION_CORE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CONSTRUCTOR; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CONTROLLER; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CRAFTING_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CREATIVE_CONTROLLER; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DESTRUCTION_CORE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DESTRUCTOR; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DETECTOR; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DISK_DRIVE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DISK_INTERFACE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.EXPORTER; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.EXTERNAL_STORAGE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.FALLBACK_SECURITY_CARD; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.FLUID_STORAGE_BLOCK; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.IMPORTER; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.INTERFACE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.ITEM_STORAGE_BLOCK; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.MACHINE_CASING; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.NETWORK_RECEIVER; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.NETWORK_TRANSMITTER; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PORTABLE_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PROCESSOR_BINDING; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_COPPER_BLOCK; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON_BLOCK; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.REGULATOR_UPGRADE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.RELAY; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.SECURITY_CARD; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.SECURITY_MANAGER; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.SILICON; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.STORAGE_BLOCK; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.STORAGE_HOUSING; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.STORAGE_MONITOR; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.WIRELESS_GRID; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.WIRELESS_TRANSMITTER; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.WRENCH; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.forFluidStorageBlock; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.forFluidStorageDisk; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.forFluidStoragePart; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.forItemStorageBlock; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.forItemStoragePart; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.forProcessor; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.forStorageDisk; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public abstract class AbstractModInitializer { - private static final String ITEM_REGISTRY_KEY = "item"; - private static final String FLUID_REGISTRY_KEY = "fluid"; - - protected final void initializePlatformApi() { - ((PlatformApiProxy) PlatformApi.INSTANCE).setDelegate(new PlatformApiImpl()); - registerStorageTypes(); - registerResourceTypes(); - registerAdditionalResourceFactories(); - registerDestructorStrategyFactories(); - registerConstructorStrategyFactories(); - registerStorageMonitorInsertionStrategies(); - registerStorageMonitorExtractionStrategies(); - registerNetworkComponents(); - registerWirelessTransmitterRangeModifiers(); - registerPermissions(); - registerInventorySlotReference(); - } - - private void registerStorageTypes() { - PlatformApi.INSTANCE.getStorageTypeRegistry().register( - createIdentifier(ITEM_REGISTRY_KEY), - StorageTypes.ITEM - ); - PlatformApi.INSTANCE.getStorageTypeRegistry().register( - createIdentifier(FLUID_REGISTRY_KEY), - StorageTypes.FLUID - ); - } - - private void registerResourceTypes() { - PlatformApi.INSTANCE.getResourceTypeRegistry().register( - createIdentifier(ITEM_REGISTRY_KEY), - ResourceTypes.ITEM - ); - PlatformApi.INSTANCE.getResourceTypeRegistry().register( - createIdentifier(FLUID_REGISTRY_KEY), - ResourceTypes.FLUID - ); - } - - private void registerAdditionalResourceFactories() { - PlatformApi.INSTANCE.addResourceFactory(new FluidResourceFactory()); - } - - private void registerDestructorStrategyFactories() { - PlatformApi.INSTANCE.addDestructorStrategyFactory(new BlockBreakDestructorStrategyFactory()); - PlatformApi.INSTANCE.addDestructorStrategyFactory(new FluidBreakDestructorStrategyFactory()); - PlatformApi.INSTANCE.addDestructorStrategyFactory(new ItemPickupDestructorStrategyFactory()); - } - - private void registerConstructorStrategyFactories() { - PlatformApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> - Optional.of(new PlaceBlockConstructorStrategy(level, pos, direction))); - PlatformApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> - Optional.of(new PlaceFireworksConstructorStrategy(level, pos, direction))); - PlatformApi.INSTANCE.addConstructorStrategyFactory((level, pos, direction, upgradeState, dropItems) -> - Optional.of(new PlaceFluidConstructorStrategy(level, pos, direction))); - PlatformApi.INSTANCE.addConstructorStrategyFactory(new ItemDropConstructorStrategyFactory()); - } - - private void registerStorageMonitorInsertionStrategies() { - PlatformApi.INSTANCE.addStorageMonitorInsertionStrategy(new ItemStorageMonitorInsertionStrategy()); - PlatformApi.INSTANCE.addStorageMonitorInsertionStrategy(new FluidStorageMonitorInsertionStrategy()); - } - - private void registerStorageMonitorExtractionStrategies() { - PlatformApi.INSTANCE.addStorageMonitorExtractionStrategy(new ItemStorageMonitorExtractionStrategy()); - PlatformApi.INSTANCE.addStorageMonitorExtractionStrategy(new FluidStorageMonitorExtractionStrategy()); - } - - private void registerNetworkComponents() { - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( - EnergyNetworkComponent.class, - network -> new EnergyNetworkComponentImpl() - ); - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( - GraphNetworkComponent.class, - GraphNetworkComponentImpl::new - ); - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( - StorageNetworkComponent.class, - network -> new PlatformStorageNetworkComponent() - ); - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( - PlatformSecurityNetworkComponent.class, - network -> new PlatformSecurityNetworkComponentImpl(PlatformApi.INSTANCE.createDefaultSecurityPolicy()) - ); - PlatformApi.INSTANCE.getNetworkComponentMapFactory().addFactory( - SecurityNetworkComponent.class, - network -> new SecurityNetworkComponentImpl(PlatformApi.INSTANCE.createDefaultSecurityPolicy()) - ); - } - - private void registerWirelessTransmitterRangeModifiers() { - PlatformApi.INSTANCE.addWirelessTransmitterRangeModifier(new BaseWirelessTransmitterRangeModifier()); - PlatformApi.INSTANCE.addWirelessTransmitterRangeModifier(new RangeUpgradeWirelessTransmitterRangeModifier()); - PlatformApi.INSTANCE.addWirelessTransmitterRangeModifier( - new CreativeRangeUpgradeWirelessTransmitterRangeModifier() - ); - } - - private void registerPermissions() { - for (final BuiltinPermission permission : BuiltinPermission.values()) { - PlatformApi.INSTANCE.getPermissionRegistry().register(permission.getId(), permission); - } - } - - protected final void registerBlocks( - final RegistryCallback callback, - final BiFunction diskDriveBlockEntityFactory, - final BiFunction portableGridBlockEntityFactory, - final BiFunction creativePortableGridBlockEntityFactory, - final BiFunction diskInterfaceBlockEntityFactory - ) { - Blocks.INSTANCE.setQuartzEnrichedIronBlock(callback.register(QUARTZ_ENRICHED_IRON_BLOCK, SimpleBlock::new)); - Blocks.INSTANCE.setQuartzEnrichedCopperBlock(callback.register(QUARTZ_ENRICHED_COPPER_BLOCK, SimpleBlock::new)); - Blocks.INSTANCE.setDiskDrive( - callback.register(DISK_DRIVE, () -> new DiskDriveBlock(diskDriveBlockEntityFactory)) - ); - Blocks.INSTANCE.setMachineCasing(callback.register(MACHINE_CASING, SimpleBlock::new)); - for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { - Blocks.INSTANCE.setItemStorageBlock(variant, callback.register( - forItemStorageBlock(variant), - () -> new ItemStorageBlock(variant) - )); - } - for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { - Blocks.INSTANCE.setFluidStorageBlock(variant, callback.register( - forFluidStorageBlock(variant), - () -> new FluidStorageBlock(variant) - )); - } - Blocks.INSTANCE.getController().registerBlocks(callback); - Blocks.INSTANCE.getCreativeController().registerBlocks(callback); - Blocks.INSTANCE.getCable().registerBlocks(callback); - Blocks.INSTANCE.getGrid().registerBlocks(callback); - Blocks.INSTANCE.getCraftingGrid().registerBlocks(callback); - Blocks.INSTANCE.getDetector().registerBlocks(callback); - Blocks.INSTANCE.getImporter().registerBlocks(callback); - Blocks.INSTANCE.getExporter().registerBlocks(callback); - Blocks.INSTANCE.getExternalStorage().registerBlocks(callback); - Blocks.INSTANCE.getConstructor().registerBlocks(callback); - Blocks.INSTANCE.getDestructor().registerBlocks(callback); - Blocks.INSTANCE.setInterface(callback.register(INTERFACE, InterfaceBlock::new)); - Blocks.INSTANCE.getWirelessTransmitter().registerBlocks(callback); - Blocks.INSTANCE.setStorageMonitor(callback.register(STORAGE_MONITOR, StorageMonitorBlock::new)); - Blocks.INSTANCE.getNetworkReceiver().registerBlocks(callback); - Blocks.INSTANCE.getNetworkTransmitter().registerBlocks(callback); - Blocks.INSTANCE.setPortableGrid(callback.register(PORTABLE_GRID, () -> new PortableGridBlock( - PortableGridType.NORMAL, - portableGridBlockEntityFactory - ))); - Blocks.INSTANCE.setCreativePortableGrid(callback.register(CREATIVE_PORTABLE_GRID, () -> new PortableGridBlock( - PortableGridType.CREATIVE, - creativePortableGridBlockEntityFactory - ))); - Blocks.INSTANCE.getSecurityManager().registerBlocks(callback); - Blocks.INSTANCE.getRelay().registerBlocks(callback); - Blocks.INSTANCE.setDiskInterface(diskInterfaceBlockEntityFactory).registerBlocks(callback); - } - - protected final void registerItems(final RegistryCallback callback) { - registerSimpleItems(callback); - Blocks.INSTANCE.getGrid().registerItems(callback); - Blocks.INSTANCE.getCraftingGrid().registerItems(callback); - Blocks.INSTANCE.getCable().registerItems(callback, Items.INSTANCE::addCable); - Blocks.INSTANCE.getController().registerItems(callback, Items.INSTANCE::addController); - Blocks.INSTANCE.getCreativeController().registerItems(callback, Items.INSTANCE::addCreativeController); - Blocks.INSTANCE.getDetector().registerItems(callback, Items.INSTANCE::addDetector); - Blocks.INSTANCE.getImporter().registerItems(callback, Items.INSTANCE::addImporter); - Blocks.INSTANCE.getExporter().registerItems(callback, Items.INSTANCE::addExporter); - Blocks.INSTANCE.getExternalStorage().registerItems(callback, Items.INSTANCE::addExternalStorage); - Blocks.INSTANCE.getConstructor().registerItems(callback, Items.INSTANCE::addConstructor); - Blocks.INSTANCE.getDestructor().registerItems(callback, Items.INSTANCE::addDestructor); - Blocks.INSTANCE.getWirelessTransmitter().registerItems(callback, Items.INSTANCE::addWirelessTransmitter); - Blocks.INSTANCE.getNetworkReceiver().registerItems(callback, Items.INSTANCE::addNetworkReceiver); - Blocks.INSTANCE.getNetworkTransmitter().registerItems(callback, Items.INSTANCE::addNetworkTransmitter); - Blocks.INSTANCE.getSecurityManager().registerItems(callback, Items.INSTANCE::addSecurityManager); - Blocks.INSTANCE.getRelay().registerItems(callback, Items.INSTANCE::addRelay); - Blocks.INSTANCE.getDiskInterface().registerItems(callback, Items.INSTANCE::addDiskInterface); - registerStorageItems(callback); - registerUpgrades(callback); - } - - private void registerSimpleItems(final RegistryCallback callback) { - Items.INSTANCE.setQuartzEnrichedIron(callback.register(QUARTZ_ENRICHED_IRON, SimpleItem::new)); - Items.INSTANCE.setQuartzEnrichedCopper(callback.register(QUARTZ_ENRICHED_COPPER, SimpleItem::new)); - callback.register( - QUARTZ_ENRICHED_IRON_BLOCK, - () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedIronBlock()) - ); - callback.register( - QUARTZ_ENRICHED_COPPER_BLOCK, - () -> new BaseBlockItem(Blocks.INSTANCE.getQuartzEnrichedCopperBlock()) - ); - Items.INSTANCE.setSilicon(callback.register(SILICON, SimpleItem::new)); - Items.INSTANCE.setProcessorBinding(callback.register(PROCESSOR_BINDING, SimpleItem::new)); - callback.register(DISK_DRIVE, () -> Blocks.INSTANCE.getDiskDrive().createBlockItem()); - Items.INSTANCE.setWrench(callback.register(WRENCH, WrenchItem::new)); - Items.INSTANCE.setStorageHousing(callback.register(STORAGE_HOUSING, SimpleItem::new)); - callback.register(MACHINE_CASING, () -> new BaseBlockItem(Blocks.INSTANCE.getMachineCasing())); - callback.register(STORAGE_MONITOR, () -> Blocks.INSTANCE.getStorageMonitor().createBlockItem()); - callback.register(INTERFACE, () -> Blocks.INSTANCE.getInterface().createBlockItem()); - Items.INSTANCE.setConstructionCore(callback.register(CONSTRUCTION_CORE, SimpleItem::new)); - Items.INSTANCE.setDestructionCore(callback.register(DESTRUCTION_CORE, SimpleItem::new)); - for (final ProcessorItem.Type type : ProcessorItem.Type.values()) { - registerProcessor(callback, type); - } - Items.INSTANCE.setConfigurationCard(callback.register( - ContentIds.CONFIGURATION_CARD, - ConfigurationCardItem::new - )); - Items.INSTANCE.setNetworkCard(callback.register(ContentIds.NETWORK_CARD, NetworkCardItem::new)); - } - - private void registerProcessor(final RegistryCallback callback, final ProcessorItem.Type type) { - Items.INSTANCE.setProcessor(type, callback.register(forProcessor(type), ProcessorItem::new)); - } - - private void registerStorageItems(final RegistryCallback callback) { - for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { - registerItemStorageItems(callback, variant); - } - for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { - registerFluidStorageItems(callback, variant); - } - } - - private void registerItemStorageItems(final RegistryCallback callback, - final ItemStorageType.Variant variant) { - if (variant != ItemStorageType.Variant.CREATIVE) { - Items.INSTANCE.setItemStoragePart(variant, callback.register( - forItemStoragePart(variant), - SimpleItem::new) - ); - } - Items.INSTANCE.setItemStorageDisk(variant, callback.register( - forStorageDisk(variant), - () -> new ItemStorageDiskItem(variant) - )); - callback.register( - forItemStorageBlock(variant), - () -> new ItemStorageBlockBlockItem(Blocks.INSTANCE.getItemStorageBlock(variant), variant) - ); - } - - private void registerFluidStorageItems(final RegistryCallback callback, - final FluidStorageType.Variant variant) { - if (variant != FluidStorageType.Variant.CREATIVE) { - Items.INSTANCE.setFluidStoragePart(variant, callback.register( - forFluidStoragePart(variant), - SimpleItem::new) - ); - } - Items.INSTANCE.setFluidStorageDisk(variant, callback.register( - forFluidStorageDisk(variant), - () -> new FluidStorageDiskItem(variant) - )); - callback.register( - forFluidStorageBlock(variant), - () -> new FluidStorageBlockBlockItem(Blocks.INSTANCE.getFluidStorageBlock(variant), variant) - ); - } - - private void registerUpgrades(final RegistryCallback callback) { - Items.INSTANCE.setUpgrade(callback.register( - ContentIds.UPGRADE, - SimpleItem::new - )); - final Supplier speedUpgrade = callback.register( - ContentIds.SPEED_UPGRADE, - SimpleUpgradeItem::speedUpgrade - ); - Items.INSTANCE.setSpeedUpgrade(speedUpgrade); - final Supplier stackUpgrade = callback.register( - ContentIds.STACK_UPGRADE, - SimpleUpgradeItem::stackUpgrade - ); - Items.INSTANCE.setStackUpgrade(stackUpgrade); - final Supplier fortune1Upgrade = callback.register( - ContentIds.FORTUNE_1_UPGRADE, - () -> new FortuneUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), 1) - ); - Items.INSTANCE.setFortune1Upgrade(fortune1Upgrade); - final Supplier fortune2Upgrade = callback.register( - ContentIds.FORTUNE_2_UPGRADE, - () -> new FortuneUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), 2) - ); - Items.INSTANCE.setFortune2Upgrade(fortune2Upgrade); - final Supplier fortune3Upgrade = callback.register( - ContentIds.FORTUNE_3_UPGRADE, - () -> new FortuneUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), 3) - ); - Items.INSTANCE.setFortune3Upgrade(fortune3Upgrade); - final Supplier silkTouchUpgrade = callback.register( - ContentIds.SILK_TOUCH_UPGRADE, - SimpleUpgradeItem::silkTouchUpgrade - ); - Items.INSTANCE.setSilkTouchUpgrade(silkTouchUpgrade); - Items.INSTANCE.setRangeUpgrade(callback.register( - ContentIds.RANGE_UPGRADE, - () -> new RangeUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), false) - )); - Items.INSTANCE.setCreativeRangeUpgrade(callback.register( - ContentIds.CREATIVE_RANGE_UPGRADE, - () -> new RangeUpgradeItem(PlatformApi.INSTANCE.getUpgradeRegistry(), true) - )); - } - - protected final void registerUpgradeMappings() { - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.IMPORTER) - .add(Items.INSTANCE.getSpeedUpgrade(), 4) - .add(Items.INSTANCE.getStackUpgrade()) - .add(Items.INSTANCE.getRegulatorUpgrade()); - - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.EXPORTER) - .add(Items.INSTANCE.getSpeedUpgrade(), 4) - .add(Items.INSTANCE.getStackUpgrade()) - .add(Items.INSTANCE.getRegulatorUpgrade()); - - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.DESTRUCTOR) - .add(Items.INSTANCE.getSpeedUpgrade(), 4) - .add(Items.INSTANCE.getFortune1Upgrade()) - .add(Items.INSTANCE.getFortune2Upgrade()) - .add(Items.INSTANCE.getFortune3Upgrade()) - .add(Items.INSTANCE.getSilkTouchUpgrade()); - - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.CONSTRUCTOR) - .add(Items.INSTANCE.getSpeedUpgrade(), 4) - .add(Items.INSTANCE.getStackUpgrade()); - - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.WIRELESS_TRANSMITTER) - .add(Items.INSTANCE.getRangeUpgrade(), 4) - .add(Items.INSTANCE.getCreativeRangeUpgrade()); - - PlatformApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.DISK_INTERFACE) - .add(Items.INSTANCE.getSpeedUpgrade(), 4) - .add(Items.INSTANCE.getStackUpgrade()); - } - - protected final void registerBlockEntities( - final RegistryCallback> callback, - final BlockEntityTypeFactory typeFactory, - final BlockEntityTypeFactory.BlockEntitySupplier diskDriveBlockEntitySupplier, - final BlockEntityTypeFactory.BlockEntitySupplier - portableGridBlockEntitySupplier, - final BlockEntityTypeFactory.BlockEntitySupplier - creativePortableGridBlockEntitySupplier, - final BlockEntityTypeFactory.BlockEntitySupplier - diskInterfaceBlockEntitySupplier - ) { - BlockEntities.INSTANCE.setCable(callback.register( - CABLE, - () -> typeFactory.create((pos, state) -> new BaseNetworkNodeContainerBlockEntity<>( - BlockEntities.INSTANCE.getCable(), - pos, - state, - new SimpleNetworkNode(Platform.INSTANCE.getConfig().getCable().getEnergyUsage()) - ), Blocks.INSTANCE.getCable().toArray()) - )); - BlockEntities.INSTANCE.setController(callback.register( - CONTROLLER, - () -> typeFactory.create( - (pos, state) -> new ControllerBlockEntity(ControllerType.NORMAL, pos, state), - Blocks.INSTANCE.getController().toArray() - ) - )); - BlockEntities.INSTANCE.setCreativeController(callback.register( - CREATIVE_CONTROLLER, - () -> typeFactory.create( - (pos, state) -> new ControllerBlockEntity(ControllerType.CREATIVE, pos, state), - Blocks.INSTANCE.getCreativeController().toArray() - ) - )); - BlockEntities.INSTANCE.setDiskDrive(callback.register( - DISK_DRIVE, - () -> typeFactory.create(diskDriveBlockEntitySupplier, Blocks.INSTANCE.getDiskDrive()) - )); - BlockEntities.INSTANCE.setGrid(callback.register( - GRID, - () -> typeFactory.create(GridBlockEntity::new, Blocks.INSTANCE.getGrid().toArray()) - )); - BlockEntities.INSTANCE.setCraftingGrid(callback.register( - CRAFTING_GRID, - () -> typeFactory.create(CraftingGridBlockEntity::new, Blocks.INSTANCE.getCraftingGrid().toArray()) - )); - for (final ItemStorageType.Variant variant : ItemStorageType.Variant.values()) { - BlockEntities.INSTANCE.setItemStorageBlock(variant, callback.register( - forItemStorageBlock(variant), - () -> typeFactory.create( - (pos, state) -> new ItemStorageBlockBlockEntity(pos, state, variant), - Blocks.INSTANCE.getItemStorageBlock(variant) - ) - )); - } - for (final FluidStorageType.Variant variant : FluidStorageType.Variant.values()) { - BlockEntities.INSTANCE.setFluidStorageBlock(variant, callback.register( - forFluidStorageBlock(variant), - () -> typeFactory.create( - (pos, state) -> new FluidStorageBlockBlockEntity(pos, state, variant), - Blocks.INSTANCE.getFluidStorageBlock(variant) - ) - )); - } - BlockEntities.INSTANCE.setImporter(callback.register( - IMPORTER, - () -> typeFactory.create(ImporterBlockEntity::new, Blocks.INSTANCE.getImporter().toArray()) - - )); - BlockEntities.INSTANCE.setExporter(callback.register( - EXPORTER, - () -> typeFactory.create(ExporterBlockEntity::new, Blocks.INSTANCE.getExporter().toArray()) - - )); - BlockEntities.INSTANCE.setInterface(callback.register( - INTERFACE, - () -> typeFactory.create(InterfaceBlockEntity::new, Blocks.INSTANCE.getInterface()) - )); - BlockEntities.INSTANCE.setExternalStorage(callback.register( - EXTERNAL_STORAGE, - () -> typeFactory.create(ExternalStorageBlockEntity::new, Blocks.INSTANCE.getExternalStorage().toArray()) - )); - BlockEntities.INSTANCE.setDetector(callback.register( - DETECTOR, - () -> typeFactory.create(DetectorBlockEntity::new, Blocks.INSTANCE.getDetector().toArray()) - )); - BlockEntities.INSTANCE.setConstructor(callback.register( - CONSTRUCTOR, - () -> typeFactory.create(ConstructorBlockEntity::new, Blocks.INSTANCE.getConstructor().toArray()) - )); - BlockEntities.INSTANCE.setDestructor(callback.register( - DESTRUCTOR, - () -> typeFactory.create(DestructorBlockEntity::new, Blocks.INSTANCE.getDestructor().toArray()) - )); - BlockEntities.INSTANCE.setWirelessTransmitter(callback.register( - WIRELESS_TRANSMITTER, - () -> typeFactory.create( - WirelessTransmitterBlockEntity::new, - Blocks.INSTANCE.getWirelessTransmitter().toArray() - ) - )); - BlockEntities.INSTANCE.setStorageMonitor(callback.register( - STORAGE_MONITOR, - () -> typeFactory.create(StorageMonitorBlockEntity::new, Blocks.INSTANCE.getStorageMonitor()) - )); - BlockEntities.INSTANCE.setNetworkReceiver(callback.register( - NETWORK_RECEIVER, - () -> typeFactory.create(NetworkReceiverBlockEntity::new, Blocks.INSTANCE.getNetworkReceiver().toArray()) - )); - BlockEntities.INSTANCE.setNetworkTransmitter(callback.register( - NETWORK_TRANSMITTER, - () -> typeFactory.create( - NetworkTransmitterBlockEntity::new, - Blocks.INSTANCE.getNetworkTransmitter().toArray() - ) - )); - BlockEntities.INSTANCE.setPortableGrid(callback.register( - PORTABLE_GRID, - () -> typeFactory.create(portableGridBlockEntitySupplier::create, Blocks.INSTANCE.getPortableGrid()) - )); - BlockEntities.INSTANCE.setCreativePortableGrid(callback.register( - CREATIVE_PORTABLE_GRID, - () -> typeFactory.create( - creativePortableGridBlockEntitySupplier::create, - Blocks.INSTANCE.getCreativePortableGrid() - ) - )); - BlockEntities.INSTANCE.setSecurityManager(callback.register( - SECURITY_MANAGER, - () -> typeFactory.create( - SecurityManagerBlockEntity::new, - Blocks.INSTANCE.getSecurityManager().toArray() - ) - )); - BlockEntities.INSTANCE.setRelay(callback.register( - RELAY, - () -> typeFactory.create(RelayBlockEntity::new, Blocks.INSTANCE.getRelay().toArray()) - )); - BlockEntities.INSTANCE.setDiskInterface(callback.register( - DISK_INTERFACE, - () -> typeFactory.create(diskInterfaceBlockEntitySupplier, Blocks.INSTANCE.getDiskInterface().toArray()) - )); - } - - protected final void registerMenus(final RegistryCallback> callback, - final MenuTypeFactory menuTypeFactory, - final ExtendedMenuTypeFactory extendedMenuTypeFactory) { - Menus.INSTANCE.setController(callback.register( - CONTROLLER, - () -> extendedMenuTypeFactory.create(ControllerContainerMenu::new, ControllerData.STREAM_CODEC) - )); - Menus.INSTANCE.setDiskDrive(callback.register( - DISK_DRIVE, - () -> extendedMenuTypeFactory.create(DiskDriveContainerMenu::new, ResourceContainerData.STREAM_CODEC) - )); - Menus.INSTANCE.setGrid(callback.register( - GRID, - () -> extendedMenuTypeFactory.create(GridContainerMenu::new, GridData.STREAM_CODEC) - )); - Menus.INSTANCE.setCraftingGrid(callback.register( - CRAFTING_GRID, - () -> extendedMenuTypeFactory.create(CraftingGridContainerMenu::new, GridData.STREAM_CODEC) - )); - Menus.INSTANCE.setWirelessGrid(callback.register( - WIRELESS_GRID, - () -> extendedMenuTypeFactory.create(WirelessGridContainerMenu::new, WirelessGridData.STREAM_CODEC) - )); - Menus.INSTANCE.setItemStorage(callback.register( - ITEM_STORAGE_BLOCK, - () -> extendedMenuTypeFactory.create(ItemStorageBlockContainerMenu::new, StorageBlockData.STREAM_CODEC) - )); - Menus.INSTANCE.setFluidStorage(callback.register( - FLUID_STORAGE_BLOCK, - () -> extendedMenuTypeFactory.create(FluidStorageBlockContainerMenu::new, StorageBlockData.STREAM_CODEC) - )); - Menus.INSTANCE.setImporter(callback.register( - IMPORTER, - () -> extendedMenuTypeFactory.create(ImporterContainerMenu::new, ResourceContainerData.STREAM_CODEC) - )); - Menus.INSTANCE.setExporter(callback.register( - EXPORTER, - () -> extendedMenuTypeFactory.create(ExporterContainerMenu::new, ResourceContainerData.STREAM_CODEC) - )); - Menus.INSTANCE.setInterface(callback.register( - INTERFACE, - () -> extendedMenuTypeFactory.create(InterfaceContainerMenu::new, InterfaceData.STREAM_CODEC) - )); - Menus.INSTANCE.setExternalStorage(callback.register( - EXTERNAL_STORAGE, - () -> extendedMenuTypeFactory.create(ExternalStorageContainerMenu::new, ResourceContainerData.STREAM_CODEC) - )); - Menus.INSTANCE.setDetector(callback.register( - DETECTOR, - () -> extendedMenuTypeFactory.create(DetectorContainerMenu::new, SingleAmountData.STREAM_CODEC) - )); - Menus.INSTANCE.setDestructor(callback.register( - DESTRUCTOR, - () -> extendedMenuTypeFactory.create(DestructorContainerMenu::new, ResourceContainerData.STREAM_CODEC) - )); - Menus.INSTANCE.setConstructor(callback.register( - CONSTRUCTOR, - () -> extendedMenuTypeFactory.create(ConstructorContainerMenu::new, ResourceContainerData.STREAM_CODEC) - )); - Menus.INSTANCE.setRegulatorUpgrade(callback.register( - REGULATOR_UPGRADE, - () -> extendedMenuTypeFactory.create(RegulatorUpgradeContainerMenu::new, SingleAmountData.STREAM_CODEC) - )); - Menus.INSTANCE.setWirelessTransmitter(callback.register( - WIRELESS_TRANSMITTER, - () -> extendedMenuTypeFactory.create(WirelessTransmitterContainerMenu::new, - WirelessTransmitterData.STREAM_CODEC) - )); - Menus.INSTANCE.setStorageMonitor(callback.register( - STORAGE_MONITOR, - () -> extendedMenuTypeFactory.create(StorageMonitorContainerMenu::new, ResourceContainerData.STREAM_CODEC) - )); - Menus.INSTANCE.setNetworkTransmitter(callback.register( - NETWORK_TRANSMITTER, - () -> extendedMenuTypeFactory.create(NetworkTransmitterContainerMenu::new, - NetworkTransmitterData.STREAM_CODEC) - )); - Menus.INSTANCE.setPortableGridBlock(callback.register( - createIdentifier("portable_grid_block"), - () -> extendedMenuTypeFactory.create(PortableGridBlockContainerMenu::new, PortableGridData.STREAM_CODEC) - )); - Menus.INSTANCE.setPortableGridItem(callback.register( - createIdentifier("portable_grid_item"), - () -> extendedMenuTypeFactory.create(PortableGridItemContainerMenu::new, PortableGridData.STREAM_CODEC) - )); - Menus.INSTANCE.setSecurityCard(callback.register( - SECURITY_CARD, - () -> extendedMenuTypeFactory.create(SecurityCardContainerMenu::new, - PlayerBoundSecurityCardData.STREAM_CODEC) - )); - Menus.INSTANCE.setFallbackSecurityCard(callback.register( - FALLBACK_SECURITY_CARD, - () -> extendedMenuTypeFactory.create(FallbackSecurityCardContainerMenu::new, SecurityCardData.STREAM_CODEC) - )); - Menus.INSTANCE.setSecurityManager(callback.register( - SECURITY_MANAGER, - () -> menuTypeFactory.create(SecurityManagerContainerMenu::new) - )); - Menus.INSTANCE.setRelay(callback.register( - RELAY, - () -> extendedMenuTypeFactory.create(RelayContainerMenu::new, ResourceContainerData.STREAM_CODEC) - )); - Menus.INSTANCE.setDiskInterface(callback.register( - DISK_INTERFACE, - () -> extendedMenuTypeFactory.create(DiskInterfaceContainerMenu::new, ResourceContainerData.STREAM_CODEC) - )); - } - - protected final void registerLootFunctions(final RegistryCallback> callback) { - LootFunctions.INSTANCE.setStorageBlock(callback.register( - STORAGE_BLOCK, - () -> new LootItemFunctionType<>(MapCodec.unit(new StorageBlockLootItemFunction())) - )); - LootFunctions.INSTANCE.setPortableGrid(callback.register( - PORTABLE_GRID, - () -> new LootItemFunctionType<>(MapCodec.unit(new PortableGridLootItemFunction())) - )); - LootFunctions.INSTANCE.setEnergy(callback.register( - createIdentifier("energy"), - () -> new LootItemFunctionType<>(MapCodec.unit(new EnergyLootItemFunction())) - )); - } - - protected final void registerSounds(final RegistryCallback callback) { - Sounds.INSTANCE.setWrench(callback.register( - WRENCH, - () -> SoundEvent.createVariableRangeEvent(WRENCH) - )); - } - - protected final void registerRecipeSerializers(final RegistryCallback> callback) { - callback.register( - createIdentifier("upgrade_with_enchanted_book"), - UpgradeWithEnchantedBookRecipeSerializer::new - ); - } - - protected final void registerDataComponents(final RegistryCallback> callback) { - DataComponents.INSTANCE.setEnergy( - callback.register(createIdentifier("energy"), () -> DataComponentType.builder() - .persistent(Codec.LONG) - .networkSynchronized(ByteBufCodecs.VAR_LONG) - .build())); - DataComponents.INSTANCE.setNetworkLocation( - callback.register(createIdentifier("network_location"), () -> DataComponentType.builder() - .persistent(GlobalPos.CODEC) - .networkSynchronized(GlobalPos.STREAM_CODEC) - .build())); - DataComponents.INSTANCE.setStorageReference( - callback.register(createIdentifier("storage_reference"), () -> DataComponentType.builder() - .persistent(UUIDUtil.CODEC) - .networkSynchronized(UUIDUtil.STREAM_CODEC) - .build())); - DataComponents.INSTANCE.setRegulatorUpgradeState( - callback.register(createIdentifier("regulator_upgrade_state"), - () -> DataComponentType.builder() - .persistent(RegulatorUpgradeState.CODEC) - .networkSynchronized(RegulatorUpgradeState.STREAM_CODEC) - .build())); - DataComponents.INSTANCE.setSecurityCardBoundPlayer( - callback.register(createIdentifier("security_card_bound_player"), - () -> DataComponentType.builder() - .persistent(SecurityCardBoundPlayer.CODEC) - .networkSynchronized(SecurityCardBoundPlayer.STREAM_CODEC) - .build())); - DataComponents.INSTANCE.setSecurityCardPermissions( - callback.register(createIdentifier("security_card_permissions"), - () -> DataComponentType.builder() - .persistent(SecurityCardPermissions.CODEC) - .networkSynchronized(SecurityCardPermissions.STREAM_CODEC) - .build())); - DataComponents.INSTANCE.setConfigurationCardState( - callback.register(createIdentifier("configuration_card_state"), - () -> DataComponentType.builder() - .persistent(ConfigurationCardState.CODEC) - .networkSynchronized(ConfigurationCardState.STREAM_CODEC) - .build())); - } - - protected final void registerInventorySlotReference() { - PlatformApi.INSTANCE.getSlotReferenceFactoryRegistry().register( - createIdentifier("inventory"), - InventorySlotReferenceFactory.INSTANCE - ); - } - - protected static boolean allowComponentsUpdateAnimation(final ItemStack oldStack, final ItemStack newStack) { - return oldStack.getItem() != newStack.getItem(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java deleted file mode 100644 index 84d70c482..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java +++ /dev/null @@ -1,576 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common; - -import com.refinedmods.refinedstorage2.api.core.component.ComponentMapFactory; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.NetworkBuilder; -import com.refinedmods.refinedstorage2.api.network.NetworkComponent; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.NetworkBuilderImpl; -import com.refinedmods.refinedstorage2.api.network.impl.NetworkFactory; -import com.refinedmods.refinedstorage2.api.network.node.NetworkNode; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHints; -import com.refinedmods.refinedstorage2.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.security.BuiltinPermissions; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItemHelper; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; -import com.refinedmods.refinedstorage2.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.energy.EnergyItemHelper; -import com.refinedmods.refinedstorage2.platform.api.support.network.ConnectionLogic; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.api.support.network.NetworkNodeContainerBlockEntity; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceProvider; -import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.api.upgrade.BuiltinUpgradeDestinations; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage2.platform.common.grid.NoopGridSynchronizer; -import com.refinedmods.refinedstorage2.platform.common.grid.screen.hint.GridInsertionHintsImpl; -import com.refinedmods.refinedstorage2.platform.common.grid.screen.hint.ItemGridInsertionHint; -import com.refinedmods.refinedstorage2.platform.common.grid.screen.hint.SingleItemGridInsertionHint; -import com.refinedmods.refinedstorage2.platform.common.grid.strategy.CompositeGridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.common.grid.strategy.CompositeGridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.grid.strategy.CompositeGridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.common.security.BuiltinPermission; -import com.refinedmods.refinedstorage2.platform.common.storage.ClientStorageRepository; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageContainerItemHelperImpl; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageRepositoryImpl; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.CompositeStorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.CompositeStorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyItemHelperImpl; -import com.refinedmods.refinedstorage2.platform.common.support.energy.ItemBlockEnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.support.energy.ItemEnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.support.network.ConnectionProviderImpl; -import com.refinedmods.refinedstorage2.platform.common.support.network.InWorldNetworkNodeContainerImpl; -import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.CompositeSlotReferenceProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.InventorySlotReference; -import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.NetworkBoundItemHelperImpl; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; -import com.refinedmods.refinedstorage2.platform.common.support.registry.PlatformRegistryImpl; -import com.refinedmods.refinedstorage2.platform.common.support.resource.CompositeRecipeModIngredientConverter; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.upgrade.BuiltinUpgradeDestinationsImpl; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeRegistryImpl; -import com.refinedmods.refinedstorage2.platform.common.util.ServerEventQueue; -import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.CompositeWirelessTransmitterRangeModifier; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.PriorityQueue; -import java.util.Queue; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.saveddata.SavedData; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; -import static java.util.Objects.requireNonNull; - -public class PlatformApiImpl implements PlatformApi { - private final StorageRepository clientStorageRepository = new ClientStorageRepository( - C2SPackets::sendStorageInfoRequest - ); - private final ComponentMapFactory networkComponentMapFactory = - new ComponentMapFactory<>(); - private final NetworkBuilder networkBuilder = - new NetworkBuilderImpl(new NetworkFactory(networkComponentMapFactory)); - private final PlatformRegistry storageTypeRegistry = new PlatformRegistryImpl<>(); - private final PlatformRegistry resourceTypeRegistry = new PlatformRegistryImpl<>(); - private final PlatformRegistry gridSynchronizerRegistry = new PlatformRegistryImpl<>(); - private final PlatformRegistry importerTransferStrategyRegistry = - new PlatformRegistryImpl<>(); - private final PlatformRegistry exporterTransferStrategyRegistry = - new PlatformRegistryImpl<>(); - private final UpgradeRegistry upgradeRegistry = new UpgradeRegistryImpl(); - private final BuiltinUpgradeDestinations builtinUpgradeDestinations = new BuiltinUpgradeDestinationsImpl(); - private final Queue externalStorageProviderFactories = new PriorityQueue<>( - Comparator.comparingInt(PlatformExternalStorageProviderFactory::getPriority) - ); - private final Queue destructorStrategyFactories = new PriorityQueue<>( - Comparator.comparingInt(DestructorStrategyFactory::getPriority) - ); - private final Queue constructorStrategyFactories = new PriorityQueue<>( - Comparator.comparingInt(ConstructorStrategyFactory::getPriority) - ); - private final CompositeStorageMonitorInsertionStrategy storageMonitorInsertionStrategy = - new CompositeStorageMonitorInsertionStrategy(); - private final CompositeStorageMonitorExtractionStrategy storageMonitorExtractionStrategy = - new CompositeStorageMonitorExtractionStrategy(); - private final CompositeRecipeModIngredientConverter ingredientConverter = - new CompositeRecipeModIngredientConverter(); - private final StorageContainerItemHelper storageContainerItemHelper = new StorageContainerItemHelperImpl(); - private final List gridInsertionStrategyFactories = new ArrayList<>(); - private final GridInsertionHintsImpl gridInsertionHints = new GridInsertionHintsImpl( - new ItemGridInsertionHint(), - new SingleItemGridInsertionHint() - ); - private final List gridExtractionStrategyFactories = new ArrayList<>(); - private final List gridScrollingStrategyFactories = new ArrayList<>(); - private final ResourceFactory itemResourceFactory = new ItemResourceFactory(); - private final ResourceFactory fluidResourceFactory = new FluidResourceFactory(); - private final Set resourceFactories = new HashSet<>(); - private final Map, ResourceRendering> resourceRenderingMap = new HashMap<>(); - private final CompositeWirelessTransmitterRangeModifier wirelessTransmitterRangeModifier = - new CompositeWirelessTransmitterRangeModifier(); - private final EnergyItemHelper energyItemHelper = new EnergyItemHelperImpl(); - private final NetworkBoundItemHelper networkBoundItemHelper = new NetworkBoundItemHelperImpl(); - private final PlatformRegistry slotReferenceFactoryRegistry = new PlatformRegistryImpl<>(); - private final CompositeSlotReferenceProvider slotReferenceProvider = new CompositeSlotReferenceProvider(); - private final PlatformRegistry permissionRegistry = new PlatformRegistryImpl<>(); - - public PlatformApiImpl() { - gridSynchronizerRegistry.register(createIdentifier("off"), NoopGridSynchronizer.INSTANCE); - } - - @Override - public PlatformRegistry getStorageTypeRegistry() { - return storageTypeRegistry; - } - - @Override - public StorageRepository getClientStorageRepository() { - return clientStorageRepository; - } - - @SuppressWarnings("DataFlowIssue") // NeoForge makes null datafixer safe - @Override - public StorageRepository getStorageRepository(final Level level) { - final ServerLevel serverLevel = requireNonNull(level.getServer().getLevel(Level.OVERWORLD)); - return serverLevel.getDataStorage().computeIfAbsent(new SavedData.Factory<>( - StorageRepositoryImpl::new, - StorageRepositoryImpl::new, - null - ), StorageRepositoryImpl.NAME); - } - - @Override - public StorageContainerItemHelper getStorageContainerItemHelper() { - return storageContainerItemHelper; - } - - @Override - public PlatformRegistry getResourceTypeRegistry() { - return resourceTypeRegistry; - } - - @Override - public PlatformRegistry getImporterTransferStrategyRegistry() { - return importerTransferStrategyRegistry; - } - - @Override - public PlatformRegistry getExporterTransferStrategyRegistry() { - return exporterTransferStrategyRegistry; - } - - @Override - public void addExternalStorageProviderFactory(final PlatformExternalStorageProviderFactory factory) { - externalStorageProviderFactories.add(factory); - } - - @Override - public Collection getExternalStorageProviderFactories() { - return externalStorageProviderFactories; - } - - @Override - public Collection getDestructorStrategyFactories() { - return destructorStrategyFactories; - } - - @Override - public void addDestructorStrategyFactory(final DestructorStrategyFactory factory) { - destructorStrategyFactories.add(factory); - } - - @Override - public Collection getConstructorStrategyFactories() { - return constructorStrategyFactories; - } - - @Override - public void addConstructorStrategyFactory(final ConstructorStrategyFactory factory) { - constructorStrategyFactories.add(factory); - } - - @Override - public void addStorageMonitorExtractionStrategy(final StorageMonitorExtractionStrategy strategy) { - storageMonitorExtractionStrategy.addStrategy(strategy); - } - - @Override - public StorageMonitorExtractionStrategy getStorageMonitorExtractionStrategy() { - return storageMonitorExtractionStrategy; - } - - @Override - public void addStorageMonitorInsertionStrategy(final StorageMonitorInsertionStrategy strategy) { - storageMonitorInsertionStrategy.addStrategy(strategy); - } - - @Override - public StorageMonitorInsertionStrategy getStorageMonitorInsertionStrategy() { - return storageMonitorInsertionStrategy; - } - - @Override - public ComponentMapFactory getNetworkComponentMapFactory() { - return networkComponentMapFactory; - } - - @Override - public PlatformRegistry getGridSynchronizerRegistry() { - return gridSynchronizerRegistry; - } - - @Override - public UpgradeRegistry getUpgradeRegistry() { - return upgradeRegistry; - } - - @Override - public BuiltinUpgradeDestinations getBuiltinUpgradeDestinations() { - return builtinUpgradeDestinations; - } - - @Override - public InWorldNetworkNodeContainer createInWorldNetworkNodeContainer( - final BlockEntity blockEntity, - final NetworkNode node, - final String name, - final int priority, - final ConnectionLogic connectionLogic, - @Nullable final Supplier keyProvider - ) { - return new InWorldNetworkNodeContainerImpl(blockEntity, node, name, priority, connectionLogic, keyProvider); - } - - @Override - public void onNetworkNodeContainerInitialized(final InWorldNetworkNodeContainer container, - @Nullable final Level level, - @Nullable final Runnable callback) { - if (level == null || level.isClientSide()) { - return; - } - final ConnectionProviderImpl connectionProvider = new ConnectionProviderImpl(level); - ServerEventQueue.queue(() -> { - // The container could've been removed by the time it has been placed, and by the time the event queue has - // run. In that case, don't initialize the network node because it no longer exists. - // This is a workaround for the "Carry On" mod. The mod places the block (which creates a block entity and - // requests this network node initialization) and then overrides the placed block entity with their own - // block entity. This triggers a new initialization, but then this one can no longer run! - if (container.isRemoved()) { - return; - } - networkBuilder.initialize(container, connectionProvider); - if (callback != null) { - callback.run(); - } - }); - } - - @Override - public void onNetworkNodeContainerRemoved(final InWorldNetworkNodeContainer container, - @Nullable final Level level) { - if (level == null || level.isClientSide()) { - return; - } - // "Carry On" mod places the block (which creates a block entity and requests network node initialization) - // and then overrides the placed block entity with their own information. - // However, when the placed block entity is replaced, the server event queue hasn't run yet and there is - // no network loaded yet, even though the network node initialization was requested. - // Stop continuing here to avoid further code failing due to a missing network. - if (container.getNode().getNetwork() == null) { - return; - } - final ConnectionProviderImpl connectionProvider = new ConnectionProviderImpl(level); - networkBuilder.remove(container, connectionProvider); - } - - @Override - public void onNetworkNodeContainerUpdated(final InWorldNetworkNodeContainer container, - @Nullable final Level level) { - if (level == null || level.isClientSide() || container.getNode().getNetwork() == null) { - return; - } - final ConnectionProviderImpl connectionProvider = new ConnectionProviderImpl(level); - networkBuilder.update(container, connectionProvider); - } - - @Override - public GridInsertionStrategy createGridInsertionStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - return new CompositeGridInsertionStrategy( - Platform.INSTANCE.getDefaultGridInsertionStrategyFactory().create( - containerMenu, - player, - grid - ), - gridInsertionStrategyFactories.stream().map(f -> f.create( - containerMenu, - player, - grid - )).toList() - ); - } - - @Override - public void addGridInsertionStrategyFactory(final GridInsertionStrategyFactory insertionStrategyFactory) { - gridInsertionStrategyFactories.add(insertionStrategyFactory); - } - - @Override - public void addAlternativeGridInsertionHint(final GridInsertionHint hint) { - gridInsertionHints.addAlternativeHint(hint); - } - - @Override - public GridInsertionHints getGridInsertionHints() { - return gridInsertionHints; - } - - @Override - public GridExtractionStrategy createGridExtractionStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - final List strategies = gridExtractionStrategyFactories - .stream() - .map(f -> f.create(containerMenu, player, grid)) - .toList(); - return new CompositeGridExtractionStrategy(strategies); - } - - @Override - public void addGridExtractionStrategyFactory(final GridExtractionStrategyFactory extractionStrategyFactory) { - gridExtractionStrategyFactories.add(extractionStrategyFactory); - } - - @Override - public GridScrollingStrategy createGridScrollingStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - final List strategies = gridScrollingStrategyFactories - .stream() - .map(f -> f.create(containerMenu, player, grid)) - .toList(); - return new CompositeGridScrollingStrategy(strategies); - } - - @Override - public void addGridScrollingStrategyFactory(final GridScrollingStrategyFactory scrollingStrategyFactory) { - gridScrollingStrategyFactories.add(scrollingStrategyFactory); - } - - @Override - public void addResourceFactory(final ResourceFactory factory) { - resourceFactories.add(factory); - } - - @Override - public ResourceFactory getItemResourceFactory() { - return itemResourceFactory; - } - - @Override - public StorageType getItemStorageType() { - return StorageTypes.ITEM; - } - - @Override - public ResourceFactory getFluidResourceFactory() { - return fluidResourceFactory; - } - - @Override - public StorageType getFluidStorageType() { - return StorageTypes.FLUID; - } - - @Override - public Set getAlternativeResourceFactories() { - return resourceFactories; - } - - @Override - public void registerResourceRendering(final Class resourceClass, - final ResourceRendering rendering) { - resourceRenderingMap.put(resourceClass, rendering); - } - - @Override - public ResourceRendering getResourceRendering(final ResourceKey resource) { - return resourceRenderingMap.get(resource.getClass()); - } - - @Override - public void addIngredientConverter(final RecipeModIngredientConverter converter) { - ingredientConverter.addConverter(converter); - } - - @Override - public RecipeModIngredientConverter getIngredientConverter() { - return ingredientConverter; - } - - @Override - public void addWirelessTransmitterRangeModifier(final WirelessTransmitterRangeModifier rangeModifier) { - wirelessTransmitterRangeModifier.addModifier(rangeModifier); - } - - @Override - public WirelessTransmitterRangeModifier getWirelessTransmitterRangeModifier() { - return wirelessTransmitterRangeModifier; - } - - @Override - public Optional getEnergyStorage(final ItemStack stack) { - return Platform.INSTANCE.getEnergyStorage(stack); - } - - @Override - public EnergyItemHelper getEnergyItemHelper() { - return energyItemHelper; - } - - @Override - public EnergyStorage asItemEnergyStorage(final EnergyStorage energyStorage, - final ItemStack stack) { - return new ItemEnergyStorage(stack, energyStorage); - } - - @Override - public EnergyStorage asBlockItemEnergyStorage(final EnergyStorage energyStorage, - final ItemStack stack, - final BlockEntityType blockEntityType) { - return new ItemBlockEnergyStorage(energyStorage, stack, blockEntityType); - } - - @Override - public NetworkBoundItemHelper getNetworkBoundItemHelper() { - return networkBoundItemHelper; - } - - @Override - public PlatformRegistry getSlotReferenceFactoryRegistry() { - return slotReferenceFactoryRegistry; - } - - @Override - public void addSlotReferenceProvider(final SlotReferenceProvider provider) { - slotReferenceProvider.addProvider(provider); - } - - @Override - public SlotReference createInventorySlotReference(final Player player, final InteractionHand hand) { - return InventorySlotReference.of(player, hand); - } - - @Override - public void useNetworkBoundItem(final Player player, final Item... items) { - final Set validItems = new HashSet<>(Arrays.asList(items)); - slotReferenceProvider.findForUse(player, items[0], validItems).ifPresent(C2SPackets::sendUseNetworkBoundItem); - } - - @Override - public BuiltinPermissions getBuiltinPermissions() { - return BuiltinPermission.VIEW; - } - - @Override - public PlatformRegistry getPermissionRegistry() { - return permissionRegistry; - } - - @Override - public SecurityPolicy createDefaultSecurityPolicy() { - return new SecurityPolicy(permissionRegistry.getAll() - .stream() - .filter(PlatformPermission::isAllowedByDefault) - .collect(Collectors.toSet())); - } - - @Override - public void sendNoPermissionToOpenMessage(final ServerPlayer player, final Component target) { - sendNoPermissionMessage(player, createTranslation("misc", "no_permission.open", target)); - } - - @Override - public void sendNoPermissionMessage(final ServerPlayer player, final Component message) { - S2CPackets.sendNoPermission(player, message); - } - - @Override - public boolean canPlaceNetworkNode(final ServerPlayer player, - final Level level, - final BlockPos pos, - final BlockState state) { - for (final Direction direction : Direction.values()) { - final BlockPos adjacentPos = pos.relative(direction); - final BlockEntity adjacentBlockEntity = level.getBlockEntity(adjacentPos); - if (!(adjacentBlockEntity instanceof NetworkNodeContainerBlockEntity adjacentContainerBlockEntity)) { - continue; - } - if (!adjacentContainerBlockEntity.canBuild(player)) { - PlatformApi.INSTANCE.sendNoPermissionMessage( - player, - createTranslation("misc", "no_permission.build.place", state.getBlock().getName()) - ); - return false; - } - } - return true; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/package-info.java deleted file mode 100644 index a3c44929c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/configurationcard/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.configurationcard; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/CompositeConstructorStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/CompositeConstructorStrategy.java deleted file mode 100644 index f44b04900..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/CompositeConstructorStrategy.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategy; - -import java.util.Collections; -import java.util.List; - -import net.minecraft.world.entity.player.Player; - -class CompositeConstructorStrategy implements ConstructorStrategy { - private final List strategies; - - CompositeConstructorStrategy(final List strategies) { - this.strategies = Collections.unmodifiableList(strategies); - } - - @Override - public boolean apply(final ResourceKey resource, - final Actor actor, - final Player actingPlayer, - final Network network) { - for (final ConstructorStrategy strategy : strategies) { - if (strategy.apply(resource, actor, actingPlayer, network)) { - return true; - } - } - return false; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/CompositeDestructorStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/CompositeDestructorStrategy.java deleted file mode 100644 index ed8f3b332..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/CompositeDestructorStrategy.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.filter.Filter; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategy; - -import java.util.Collections; -import java.util.List; -import java.util.function.Supplier; - -import net.minecraft.world.entity.player.Player; - -class CompositeDestructorStrategy implements DestructorStrategy { - private final List strategies; - - CompositeDestructorStrategy(final List strategies) { - this.strategies = Collections.unmodifiableList(strategies); - } - - @Override - public boolean apply(final Filter filter, - final Actor actor, - final Supplier networkSupplier, - final Player actingPlayer) { - for (final DestructorStrategy strategy : strategies) { - if (strategy.apply(filter, actor, networkSupplier, actingPlayer)) { - return true; - } - } - return false; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlock.java deleted file mode 100644 index 751fa6880..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlock.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ConstructorBlock extends AbstractConstructorDestructorBlock< - ConstructorBlock, ConstructorBlockEntity, BaseBlockItem - > implements BlockItemProvider { - private static final Component HELP = createTranslation("item", "constructor.help"); - - public ConstructorBlock(final DyeColor color, final MutableComponent name) { - super(color, name, new NetworkNodeBlockEntityTicker<>( - BlockEntities.INSTANCE::getConstructor, - ACTIVE - )); - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getConstructor(); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(final BlockPos blockPos, final BlockState blockState) { - return new ConstructorBlockEntity(blockPos, blockState); - } - - @Override - public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorContainerMenu.java deleted file mode 100644 index 8cc5b09da..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorContainerMenu.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSchedulingContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; - -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ConstructorContainerMenu extends AbstractSchedulingContainerMenu { - private static final MutableComponent FILTER_HELP = createTranslation("gui", "constructor.filter_help"); - - public ConstructorContainerMenu(final int syncId, - final Inventory playerInventory, - final ResourceContainerData resourceContainerData) { - super( - Menus.INSTANCE.getConstructor(), - syncId, - playerInventory.player, - resourceContainerData, - UpgradeDestinations.CONSTRUCTOR, - FILTER_HELP - ); - } - - ConstructorContainerMenu(final int syncId, - final Player player, - final ConstructorBlockEntity constructor, - final ResourceContainer resourceContainer, - final UpgradeContainer upgradeContainer) { - super( - Menus.INSTANCE.getConstructor(), - syncId, - player, - resourceContainer, - upgradeContainer, - constructor, - FILTER_HELP - ); - } - - @Override - protected void registerClientProperties() { - super.registerClientProperties(); - registerProperty(new ClientProperty<>(ConstructorDestructorPropertyTypes.DROP_ITEMS, false)); - } - - @Override - protected void registerServerProperties(final ConstructorBlockEntity blockEntity) { - super.registerServerProperties(blockEntity); - registerProperty(new ServerProperty<>( - ConstructorDestructorPropertyTypes.DROP_ITEMS, - blockEntity::isDropItems, - blockEntity::setDropItems - )); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java deleted file mode 100644 index 916ddb1bc..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorDestructorPropertyTypes.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -final class ConstructorDestructorPropertyTypes { - static final PropertyType PICKUP_ITEMS = PropertyTypes.createBooleanProperty( - createIdentifier("pickup_items") - ); - static final PropertyType DROP_ITEMS = PropertyTypes.createBooleanProperty( - createIdentifier("drop_items") - ); - - private ConstructorDestructorPropertyTypes() { - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java deleted file mode 100644 index 7efb78943..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorDropItemsSideButtonWidget.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractYesNoSideButtonWidget; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -class ConstructorDropItemsSideButtonWidget extends AbstractYesNoSideButtonWidget { - ConstructorDropItemsSideButtonWidget(final ClientProperty property) { - super(property, createTranslation("gui", "constructor.drop_items")); - } - - @Override - protected int getXTexture() { - return Boolean.TRUE.equals(property.getValue()) ? 80 : 64; - } - - @Override - protected int getYTexture() { - return 16; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorScreen.java deleted file mode 100644 index cb6825030..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorScreen.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.widget.SchedulingModeSideButtonWidget; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; - -public class ConstructorScreen extends AbstractFilterScreen { - public ConstructorScreen(final ConstructorContainerMenu menu, - final Inventory playerInventory, - final Component text) { - super(menu, playerInventory, text); - } - - @Override - protected void init() { - super.init(); - addSideButton(new FuzzyModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FUZZY_MODE), - () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK - )); - addSideButton(new SchedulingModeSideButtonWidget(getMenu().getProperty(PropertyTypes.SCHEDULING_MODE))); - addSideButton(new ConstructorDropItemsSideButtonWidget( - getMenu().getProperty(ConstructorDestructorPropertyTypes.DROP_ITEMS) - )); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlock.java deleted file mode 100644 index c9988df10..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlock.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class DestructorBlock extends AbstractConstructorDestructorBlock< - DestructorBlock, DestructorBlockEntity, BaseBlockItem - > implements BlockItemProvider { - private static final Component HELP = createTranslation("item", "destructor.help"); - - public DestructorBlock(final DyeColor color, final MutableComponent name) { - super(color, name, new NetworkNodeBlockEntityTicker<>( - BlockEntities.INSTANCE::getDestructor, - ACTIVE - )); - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getDestructor(); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(final BlockPos blockPos, final BlockState blockState) { - return new DestructorBlockEntity(blockPos, blockState); - } - - @Override - public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorContainerMenu.java deleted file mode 100644 index b3f5dabf3..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorContainerMenu.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSimpleFilterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; - -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class DestructorContainerMenu extends AbstractSimpleFilterContainerMenu { - private static final MutableComponent FILTER_HELP = createTranslation("gui", "destructor.filter_help"); - - public DestructorContainerMenu(final int syncId, - final Inventory playerInventory, - final ResourceContainerData resourceContainerData) { - super( - Menus.INSTANCE.getDestructor(), - syncId, - playerInventory.player, - resourceContainerData, - UpgradeDestinations.DESTRUCTOR, - FILTER_HELP - ); - } - - DestructorContainerMenu(final int syncId, - final Player player, - final DestructorBlockEntity destructor, - final ResourceContainer resourceContainer, - final UpgradeContainer upgradeContainer) { - super( - Menus.INSTANCE.getDestructor(), - syncId, - player, - resourceContainer, - upgradeContainer, - destructor, - FILTER_HELP - ); - } - - @Override - protected void registerClientProperties() { - registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - registerProperty(new ClientProperty<>(PropertyTypes.FILTER_MODE, FilterMode.BLOCK)); - registerProperty(new ClientProperty<>(ConstructorDestructorPropertyTypes.PICKUP_ITEMS, false)); - } - - @Override - protected void registerServerProperties(final DestructorBlockEntity blockEntity) { - registerProperty(new ServerProperty<>( - PropertyTypes.REDSTONE_MODE, - blockEntity::getRedstoneMode, - blockEntity::setRedstoneMode - )); - registerProperty(new ServerProperty<>( - PropertyTypes.FILTER_MODE, - blockEntity::getFilterMode, - blockEntity::setFilterMode - )); - registerProperty(new ServerProperty<>( - ConstructorDestructorPropertyTypes.PICKUP_ITEMS, - blockEntity::isPickupItems, - blockEntity::setPickupItems - )); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java deleted file mode 100644 index e46532f87..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorPickupItemsSideButtonWidget.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractYesNoSideButtonWidget; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -class DestructorPickupItemsSideButtonWidget extends AbstractYesNoSideButtonWidget { - DestructorPickupItemsSideButtonWidget(final ClientProperty property) { - super(property, createTranslation("gui", "destructor.pickup_items")); - } - - @Override - protected int getXTexture() { - return Boolean.TRUE.equals(property.getValue()) ? 64 : 80; - } - - @Override - protected int getYTexture() { - return 0; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorScreen.java deleted file mode 100644 index 898088838..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorScreen.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.common.storage.FilterModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class DestructorScreen extends AbstractFilterScreen { - public DestructorScreen(final DestructorContainerMenu menu, final Inventory playerInventory, final Component text) { - super(menu, playerInventory, text); - } - - @Override - protected void init() { - super.init(); - addSideButton(new FilterModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FILTER_MODE), - createTranslation("gui", "destructor.filter_mode.allow.help"), - createTranslation("gui", "destructor.filter_mode.block.help") - )); - addSideButton(new DestructorPickupItemsSideButtonWidget( - getMenu().getProperty(ConstructorDestructorPropertyTypes.PICKUP_ITEMS) - )); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java deleted file mode 100644 index 61a70b149..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/FluidBreakDestructorStrategyFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; - -import java.util.Optional; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class FluidBreakDestructorStrategyFactory implements DestructorStrategyFactory { - @Override - public Optional create(final ServerLevel level, - final BlockPos pos, - final Direction direction, - final UpgradeState upgradeState, - final boolean pickupItems) { - return Optional.of(new FluidBreakDestructorStrategy(level, pos)); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java deleted file mode 100644 index fb4644a0a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemDropConstructorStrategyFactory.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategy; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.common.content.Items; - -import java.util.Optional; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class ItemDropConstructorStrategyFactory implements ConstructorStrategyFactory { - @Override - public Optional create(final ServerLevel level, - final BlockPos pos, - final Direction direction, - final UpgradeState upgradeState, - final boolean dropItems) { - if (!dropItems) { - return Optional.empty(); - } - return Optional.of(new ItemDropConstructorStrategy( - level, - pos, - direction, - upgradeState.has(Items.INSTANCE.getStackUpgrade()) - )); - } - - @Override - public int getPriority() { - return -1; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java deleted file mode 100644 index 36b9bc027..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/ItemPickupDestructorStrategyFactory.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategy; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; - -import java.util.Optional; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class ItemPickupDestructorStrategyFactory implements DestructorStrategyFactory { - @Override - public Optional create(final ServerLevel level, - final BlockPos pos, - final Direction direction, - final UpgradeState upgradeState, - final boolean pickupItems) { - if (!pickupItems) { - return Optional.empty(); - } - return Optional.of(new ItemPickupDestructorStrategy(level, pos)); - } - - @Override - public int getPriority() { - return -1; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java deleted file mode 100644 index 16cd1b25c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/PlaceFluidConstructorStrategy.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategy; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.player.Player; - -public class PlaceFluidConstructorStrategy implements ConstructorStrategy { - protected final ServerLevel level; - protected final BlockPos pos; - protected final Direction direction; - - public PlaceFluidConstructorStrategy(final ServerLevel level, final BlockPos pos, final Direction direction) { - this.level = level; - this.pos = pos; - this.direction = direction; - } - - @Override - public boolean apply( - final ResourceKey resource, - final Actor actor, - final Player actingPlayer, - final Network network - ) { - if (!level.isLoaded(pos)) { - return false; - } - if (!(resource instanceof FluidResource fluidResource)) { - return false; - } - final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); - final long bucketAmount = Platform.INSTANCE.getBucketAmount(); - final long extractedAmount = storageChannel.extract( - fluidResource, - bucketAmount, - Action.SIMULATE, - actor - ); - if (bucketAmount != extractedAmount) { - return false; - } - final boolean success = Platform.INSTANCE.placeFluid(level, pos, direction, actingPlayer, fluidResource); - if (success) { - storageChannel.extract(fluidResource, bucketAmount, Action.EXECUTE, actor); - } - return success; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/package-info.java deleted file mode 100644 index 2ea0fb378..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/constructordestructor/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.constructordestructor; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/package-info.java deleted file mode 100644 index 56b567a3a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.content; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockItem.java deleted file mode 100644 index 984707d77..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockItem.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.support.energy.AbstractEnergyBlockItem; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; - -import java.util.Optional; - -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ControllerBlockItem extends AbstractEnergyBlockItem { - private final Block block; - - ControllerBlockItem(final Block block) { - super(block, new Item.Properties().stacksTo(1), PlatformApi.INSTANCE.getEnergyItemHelper()); - this.block = block; - } - - @Override - public Component getDescription() { - return block.getName(); - } - - @Override - public Component getName(final ItemStack stack) { - return block.getName(); - } - - @Override - public Optional getTooltipImage(final ItemStack stack) { - return Optional.of(new HelpTooltipComponent(createTranslation("item", "controller.help"))); - } - - public EnergyStorage createEnergyStorage(final ItemStack stack) { - final EnergyStorage energyStorage = new EnergyStorageImpl( - Platform.INSTANCE.getConfig().getController().getEnergyCapacity() - ); - return PlatformApi.INSTANCE.asBlockItemEnergyStorage( - energyStorage, - stack, - BlockEntities.INSTANCE.getController() - ); - } - - @Override - protected boolean placeBlock(final BlockPlaceContext ctx, final BlockState state) { - if (ctx.getPlayer() instanceof ServerPlayer serverPlayer - && !(PlatformApi.INSTANCE.canPlaceNetworkNode(serverPlayer, ctx.getLevel(), ctx.getClickedPos(), state))) { - return false; - } - return super.placeBlock(ctx, state); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerContainerMenu.java deleted file mode 100644 index 805b6c98a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerContainerMenu.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; - -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyInfo; - -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -public class ControllerContainerMenu extends AbstractBaseContainerMenu implements EnergyContainerMenu { - private final EnergyInfo energyInfo; - - public ControllerContainerMenu(final int syncId, - final Inventory playerInventory, - final ControllerData controllerData) { - super(Menus.INSTANCE.getController(), syncId); - addPlayerInventory(playerInventory, 8, 107); - this.energyInfo = EnergyInfo.forClient( - playerInventory.player, - controllerData.stored(), - controllerData.capacity() - ); - registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - } - - ControllerContainerMenu(final int syncId, - final Inventory playerInventory, - final ControllerBlockEntity controller, - final Player player) { - super(Menus.INSTANCE.getController(), syncId); - this.energyInfo = EnergyInfo.forServer( - player, - controller::getActualStored, - controller::getActualCapacity - ); - addPlayerInventory(playerInventory, 8, 107); - registerProperty(new ServerProperty<>( - PropertyTypes.REDSTONE_MODE, - controller::getRedstoneMode, - controller::setRedstoneMode - )); - } - - @Override - public void broadcastChanges() { - super.broadcastChanges(); - energyInfo.detectChanges(); - } - - @Override - public EnergyInfo getEnergyInfo() { - return energyInfo; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerScreen.java deleted file mode 100644 index 3bffb46c5..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerScreen.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; - -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.ProgressWidget; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; - -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ControllerScreen extends AbstractBaseScreen { - private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/controller.png"); - - @Nullable - private ProgressWidget progressWidget; - - public ControllerScreen(final ControllerContainerMenu menu, final Inventory playerInventory, final Component text) { - super(menu, playerInventory, text); - this.inventoryLabelY = 94; - this.imageWidth = 176; - this.imageHeight = 189; - } - - @Override - protected void init() { - super.init(); - addSideButton(new RedstoneModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.REDSTONE_MODE), - createTranslation("gui", "controller.redstone_mode_help") - )); - if (progressWidget == null) { - progressWidget = new ProgressWidget( - leftPos + 80, - topPos + 20, - 16, - 70, - getMenu().getEnergyInfo()::getPercentageFull, - getMenu().getEnergyInfo()::createTooltip - ); - } else { - progressWidget.setX(leftPos + 80); - progressWidget.setY(topPos + 20); - } - addRenderableWidget(progressWidget); - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerType.java deleted file mode 100644 index 42f02035e..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerType.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; - -public enum ControllerType { - NORMAL, - CREATIVE -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/CreativeControllerBlockItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/CreativeControllerBlockItem.java deleted file mode 100644 index c5f8fad45..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/CreativeControllerBlockItem.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.controller; - -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; - -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class CreativeControllerBlockItem extends NetworkNodeBlockItem { - private static final MutableComponent HELP = createTranslation("item", "creative_controller.help"); - - CreativeControllerBlockItem(final Block block) { - super(block, new Item.Properties().stacksTo(1), HELP); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/package-info.java deleted file mode 100644 index 2b5a97d76..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.controller; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorContainerMenu.java deleted file mode 100644 index 3f81d0291..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorContainerMenu.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.detector; - -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorMode; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; - -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class DetectorContainerMenu extends AbstractSingleAmountContainerMenu { - private static final Component FILTER_HELP = createTranslation("gui", "detector.filter_help"); - - @Nullable - private DetectorBlockEntity detector; - - public DetectorContainerMenu(final int syncId, - final Inventory playerInventory, - final SingleAmountData singleAmountData) { - super(Menus.INSTANCE.getDetector(), syncId, playerInventory, singleAmountData, FILTER_HELP); - registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); - registerProperty(new ClientProperty<>(DetectorPropertyTypes.MODE, DetectorMode.EQUAL)); - } - - DetectorContainerMenu(final int syncId, - final Player player, - final DetectorBlockEntity detector, - final ResourceContainer resourceContainer) { - super(Menus.INSTANCE.getDetector(), syncId, player, resourceContainer, FILTER_HELP, null); - this.detector = detector; - registerProperty(new ServerProperty<>( - PropertyTypes.FUZZY_MODE, - detector::isFuzzyMode, - detector::setFuzzyMode - )); - registerProperty(new ServerProperty<>( - DetectorPropertyTypes.MODE, - detector::getMode, - detector::setMode - )); - } - - @Override - public void changeAmountOnServer(final double newAmount) { - if (detector == null) { - return; - } - detector.setAmount(newAmount); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorPropertyTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorPropertyTypes.java deleted file mode 100644 index e38d66f83..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorPropertyTypes.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.detector; - -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -final class DetectorPropertyTypes { - static final PropertyType MODE = new PropertyType<>( - createIdentifier("detector_mode"), - DetectorModeSettings::getDetectorMode, - DetectorModeSettings::getDetectorMode - ); - - private DetectorPropertyTypes() { - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorScreen.java deleted file mode 100644 index 3b049ecac..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorScreen.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.detector; - -import com.refinedmods.refinedstorage2.platform.common.support.amount.AbstractSingleAmountScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; - -public class DetectorScreen extends AbstractSingleAmountScreen { - public DetectorScreen(final DetectorContainerMenu menu, final Inventory playerInventory, final Component text) { - super(menu, playerInventory, text, menu.getAmount(), 0); - } - - @Override - protected void init() { - super.init(); - addSideButton(new FuzzyModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FUZZY_MODE), - () -> FuzzyModeSideButtonWidget.Type.GENERIC - )); - addSideButton(new DetectorModeSideButtonWidget(getMenu().getProperty(DetectorPropertyTypes.MODE))); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/FuzzyDetectorAmountStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/FuzzyDetectorAmountStrategy.java deleted file mode 100644 index 1a76fa7c2..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/FuzzyDetectorAmountStrategy.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.detector; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.AbstractDetectorAmountStrategy; -import com.refinedmods.refinedstorage2.api.network.impl.node.detector.DetectorAmountStrategy; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.storage.channel.FuzzyStorageChannel; - -class FuzzyDetectorAmountStrategy extends AbstractDetectorAmountStrategy { - private final DetectorAmountStrategy fallback; - - FuzzyDetectorAmountStrategy(final DetectorAmountStrategy fallback) { - this.fallback = fallback; - } - - @Override - public long getAmount(final Network network, final ResourceKey configuredResource) { - final StorageChannel storageChannel = getStorageChannel(network); - if (!(storageChannel instanceof FuzzyStorageChannel fuzzyStorageChannel)) { - return fallback.getAmount(network, configuredResource); - } - return fuzzyStorageChannel.getFuzzy(configuredResource) - .stream() - .mapToLong(ResourceAmount::getAmount) - .sum(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/package-info.java deleted file mode 100644 index 661d9457a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.detector; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlock.java deleted file mode 100644 index 501b1c5cb..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlock.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.exporter; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalCableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.DirectionalCableBlockShapes; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import java.util.HashMap; -import java.util.Map; -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.shapes.VoxelShape; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ExporterBlock extends AbstractDirectionalCableBlock - implements ColorableBlock, EntityBlock, BlockItemProvider { - private static final Component HELP = createTranslation("item", "exporter.help"); - private static final Map SHAPE_CACHE = new HashMap<>(); - private static final AbstractBlockEntityTicker TICKER = - new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getExporter); - private final DyeColor color; - private final MutableComponent name; - - public ExporterBlock(final DyeColor color, final MutableComponent name) { - super(SHAPE_CACHE); - this.color = color; - this.name = name; - } - - @Override - public DyeColor getColor() { - return color; - } - - @Override - public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return new ExporterBlockEntity(pos, state); - } - - @Nullable - @Override - public BlockEntityTicker getTicker(final Level level, - final BlockState blockState, - final BlockEntityType type) { - return TICKER.get(level, type); - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getExporter(); - } - - @Override - protected VoxelShape getExtensionShape(final Direction direction) { - return switch (direction) { - case NORTH -> DirectionalCableBlockShapes.EXPORTER_NORTH; - case EAST -> DirectionalCableBlockShapes.EXPORTER_EAST; - case SOUTH -> DirectionalCableBlockShapes.EXPORTER_SOUTH; - case WEST -> DirectionalCableBlockShapes.EXPORTER_WEST; - case UP -> DirectionalCableBlockShapes.EXPORTER_UP; - case DOWN -> DirectionalCableBlockShapes.EXPORTER_DOWN; - }; - } - - @Override - public MutableComponent getName() { - return name; - } - - @Override - public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterContainerMenu.java deleted file mode 100644 index 533dadff9..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterContainerMenu.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.exporter; - -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSchedulingContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; - -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ExporterContainerMenu extends AbstractSchedulingContainerMenu { - private static final MutableComponent FILTER_HELP = createTranslation("gui", "exporter.filter_help"); - - public ExporterContainerMenu(final int syncId, - final Inventory playerInventory, - final ResourceContainerData resourceContainerData) { - super( - Menus.INSTANCE.getExporter(), - syncId, - playerInventory.player, - resourceContainerData, - UpgradeDestinations.EXPORTER, - FILTER_HELP - ); - } - - ExporterContainerMenu(final int syncId, - final Player player, - final ExporterBlockEntity exporter, - final ResourceContainer resourceContainer, - final UpgradeContainer upgradeContainer) { - super( - Menus.INSTANCE.getExporter(), - syncId, - player, - resourceContainer, - upgradeContainer, - exporter, - FILTER_HELP - ); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterScreen.java deleted file mode 100644 index d3edd6243..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterScreen.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.exporter; - -import com.refinedmods.refinedstorage2.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.widget.SchedulingModeSideButtonWidget; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; - -public class ExporterScreen extends AbstractFilterScreen { - public ExporterScreen(final ExporterContainerMenu menu, final Inventory playerInventory, final Component text) { - super(menu, playerInventory, text); - } - - @Override - protected void init() { - super.init(); - addSideButton(new FuzzyModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FUZZY_MODE), - () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK - )); - addSideButton(new SchedulingModeSideButtonWidget(getMenu().getProperty(PropertyTypes.SCHEDULING_MODE))); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/FuzzyExporterTransferStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/FuzzyExporterTransferStrategy.java deleted file mode 100644 index 9e5bf078c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/FuzzyExporterTransferStrategy.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.exporter; - -import com.refinedmods.refinedstorage2.api.network.impl.node.exporter.ExporterTransferStrategyImpl; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.storage.channel.FuzzyStorageChannel; - -import java.util.Collection; -import java.util.stream.Collectors; - -public class FuzzyExporterTransferStrategy extends ExporterTransferStrategyImpl { - public FuzzyExporterTransferStrategy(final InsertableStorage destination, final long transferQuota) { - super(destination, transferQuota); - } - - @Override - protected Collection expand(final ResourceKey resource, final StorageChannel storageChannel) { - if (storageChannel instanceof FuzzyStorageChannel fuzzyStorageChannel) { - return fuzzyStorageChannel - .getFuzzy(resource) - .stream() - .map(ResourceAmount::getResource) - .collect(Collectors.toSet()); - } - return super.expand(resource, storageChannel); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/package-info.java deleted file mode 100644 index 9765c7b93..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.exporter; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlock.java deleted file mode 100644 index 238f39cbb..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlock.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; - -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.block.EntityBlock; - -public abstract class AbstractGridBlock & BlockItemProvider, I extends BlockItem> - extends AbstractActiveColoredDirectionalBlock implements EntityBlock { - protected AbstractGridBlock(final MutableComponent name, final DyeColor color) { - super(BlockConstants.PROPERTIES, color, name); - } - - @Override - protected DirectionType getDirectionType() { - return BiDirectionType.INSTANCE; - } - - @Override - public boolean canAlwaysConnect() { - return true; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java deleted file mode 100644 index d1f01db0f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.impl.node.container.NetworkNodeContainerPriorities; -import com.refinedmods.refinedstorage2.api.network.impl.node.grid.GridNetworkNode; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformSecurityNetworkComponent; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity; - -import java.util.List; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamEncoder; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import static java.util.Objects.requireNonNull; - -public abstract class AbstractGridBlockEntity - extends AbstractRedstoneModeNetworkNodeContainerBlockEntity - implements Grid, NetworkNodeExtendedMenuProvider { - protected AbstractGridBlockEntity(final BlockEntityType type, - final BlockPos pos, - final BlockState state, - final long energyUsage) { - super(type, pos, state, new GridNetworkNode(energyUsage)); - } - - @Override - protected InWorldNetworkNodeContainer createMainContainer(final GridNetworkNode node) { - return PlatformApi.INSTANCE.createInWorldNetworkNodeContainer( - this, - node, - MAIN_CONTAINER_NAME, - NetworkNodeContainerPriorities.GRID, - this, - null - ); - } - - @Override - public GridData getMenuData() { - return GridData.of(this); - } - - @Override - public StreamEncoder getMenuCodec() { - return GridData.STREAM_CODEC; - } - - @Override - public List getResources(final Class actorType) { - return requireNonNull(mainNode.getNetwork()) - .getComponent(StorageNetworkComponent.class) - .getResources(actorType); - } - - @Override - public GridOperations createOperations(final ResourceType resourceType, final ServerPlayer player) { - final Network network = requireNonNull(mainNode.getNetwork()); - final StorageChannel storageChannel = network.getComponent(StorageNetworkComponent.class); - final PlatformSecurityNetworkComponent security = network.getComponent(PlatformSecurityNetworkComponent.class); - final GridOperations operations = resourceType.createGridOperations(storageChannel, new PlayerActor(player)); - return new SecuredGridOperations(player, security, operations); - } - - @Override - public boolean isGridActive() { - return mainNode.isActive(); - } - - @Override - public Storage getItemStorage() { - return requireNonNull(mainNode.getNetwork()).getComponent(StorageNetworkComponent.class); - } - - @Override - public void addWatcher(final GridWatcher watcher, final Class actorType) { - mainNode.addWatcher(watcher, actorType); - } - - @Override - public void removeWatcher(final GridWatcher watcher) { - mainNode.removeWatcher(watcher); - } - - @Override - protected boolean doesBlockStateChangeWarrantNetworkNodeUpdate(final BlockState oldBlockState, - final BlockState newBlockState) { - return AbstractDirectionalBlock.doesBlockStateChangeWarrantNetworkNodeUpdate(oldBlockState, newBlockState); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridSynchronizer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridSynchronizer.java deleted file mode 100644 index bcdc117d4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridSynchronizer.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.platform.api.grid.GridSynchronizer; -import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; - -import net.minecraft.resources.ResourceLocation; - -public abstract class AbstractGridSynchronizer implements GridSynchronizer { - @Override - public ResourceLocation getTextureIdentifier() { - return TextureIds.ICONS; - } - - @Override - public int getYTexture() { - return 96; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlock.java deleted file mode 100644 index 5221ffcb8..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlock.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class CraftingGridBlock extends AbstractGridBlock - implements BlockItemProvider { - private static final Component HELP = createTranslation("item", "crafting_grid.help"); - private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>( - BlockEntities.INSTANCE::getCraftingGrid, - ACTIVE - ); - - public CraftingGridBlock(final DyeColor color, final MutableComponent name) { - super(name, color); - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getCraftingGrid(); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return new CraftingGridBlockEntity(pos, state); - } - - @Nullable - @Override - public BlockEntityTicker getTicker(final Level level, - final BlockState blockState, - final BlockEntityType type) { - return TICKER.get(level, type); - } - - @Override - public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridMatrixCloseBehavior.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridMatrixCloseBehavior.java deleted file mode 100644 index f1d9649b0..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridMatrixCloseBehavior.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -public enum CraftingGridMatrixCloseBehavior { - NONE, - CLEAR_TO_NETWORK, - CLEAR_TO_INVENTORY -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridRefillContext.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridRefillContext.java deleted file mode 100644 index 0ac8d7728..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridRefillContext.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; - -import net.minecraft.world.entity.player.Player; - -interface CraftingGridRefillContext extends AutoCloseable { - boolean extract(ItemResource resource, Player player); - - @Override - void close(); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridBlock.java deleted file mode 100644 index 2547b5d94..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridBlock.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class GridBlock extends AbstractGridBlock - implements BlockItemProvider { - private static final Component HELP = createTranslation("item", "grid.help"); - private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>( - BlockEntities.INSTANCE::getGrid, - ACTIVE - ); - - public GridBlock(final DyeColor color, final MutableComponent name) { - super(name, color); - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getGrid(); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return new GridBlockEntity(pos, state); - } - - @Nullable - @Override - public BlockEntityTicker getTicker(final Level level, - final BlockState blockState, - final BlockEntityType type) { - return TICKER.get(level, type); - } - - @Override - public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridContainerMenu.java deleted file mode 100644 index 407a846e4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridContainerMenu.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; - -import net.minecraft.world.entity.player.Inventory; - -public class GridContainerMenu extends AbstractGridContainerMenu { - public GridContainerMenu(final int syncId, final Inventory playerInventory, final GridData gridData) { - super(Menus.INSTANCE.getGrid(), syncId, playerInventory, gridData); - onScreenReady(0); - registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - } - - GridContainerMenu(final int syncId, final Inventory playerInventory, final GridBlockEntity grid) { - super(Menus.INSTANCE.getGrid(), syncId, playerInventory, grid); - onScreenReady(0); - registerProperty(new ServerProperty<>( - PropertyTypes.REDSTONE_MODE, - grid::getRedstoneMode, - grid::setRedstoneMode - )); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridData.java deleted file mode 100644 index 886921249..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridData.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageCodecs; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; - -public record GridData(boolean active, List resources) { - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ByteBufCodecs.BOOL, GridData::active, - ByteBufCodecs.collection(ArrayList::new, StreamCodec.composite( - ResourceCodecs.AMOUNT_STREAM_CODEC, GridResource::resourceAmount, - StorageCodecs.TRACKED_RESOURCE_OPTIONAL_STREAM_CODEC, GridResource::trackedResource, - GridResource::new - )), GridData::resources, - GridData::new - ); - - public static GridData of(final Grid grid) { - return new GridData( - grid.isGridActive(), - grid.getResources(PlayerActor.class).stream().map(GridResource::of).toList() - ); - } - - public record GridResource(ResourceAmount resourceAmount, Optional trackedResource) { - static GridResource of(final TrackedResourceAmount trackedResourceAmount) { - return new GridResource( - trackedResourceAmount.resourceAmount(), - Optional.ofNullable(trackedResourceAmount.trackedResource()) - ); - } - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypes.java deleted file mode 100644 index 97cfd835d..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypes.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.grid.view.GridSortingType; -import com.refinedmods.refinedstorage2.api.grid.view.GridView; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.grid.view.PlatformGridResource; - -import java.util.Comparator; -import java.util.function.Function; - -public enum GridSortingTypes implements GridSortingType { - QUANTITY(view -> Comparator.comparingLong(GridResource::getAmount)), - NAME(view -> Comparator.comparing(GridResource::getName)), - ID(view -> (a, b) -> { - if (a instanceof PlatformGridResource aa && b instanceof PlatformGridResource bb) { - return Integer.compare(aa.getRegistryId(), bb.getRegistryId()); - } - return 0; - }), - LAST_MODIFIED(view -> (a, b) -> { - final long lastModifiedA = a.getTrackedResource(view).map(TrackedResource::getTime).orElse(0L); - final long lastModifiedB = b.getTrackedResource(view).map(TrackedResource::getTime).orElse(0L); - return Long.compare(lastModifiedA, lastModifiedB); - }); - - private final Function> comparator; - - GridSortingTypes(final Function> comparator) { - this.comparator = comparator; - } - - @Override - public Comparator apply(final GridView view) { - return comparator.apply(view); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/PortableGridData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/PortableGridData.java deleted file mode 100644 index f4e3f8131..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/PortableGridData.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; - -import java.util.Optional; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; - -public record PortableGridData(GridData gridData, long stored, long capacity, Optional slotReference) { - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - GridData.STREAM_CODEC, PortableGridData::gridData, - ByteBufCodecs.VAR_LONG, PortableGridData::stored, - ByteBufCodecs.VAR_LONG, PortableGridData::capacity, - ByteBufCodecs.optional(SlotReferenceFactory.STREAM_CODEC), PortableGridData::slotReference, - PortableGridData::new - ); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/SecuredGridOperations.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/SecuredGridOperations.java deleted file mode 100644 index b46dc4735..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/SecuredGridOperations.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformSecurityNetworkComponent; -import com.refinedmods.refinedstorage2.platform.common.security.BuiltinPermission; - -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.server.level.ServerPlayer; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class SecuredGridOperations implements GridOperations { - private static final MutableComponent CANNOT_EXTRACT_MESSAGE = createTranslation("misc", "no_permission.extract"); - private static final MutableComponent CANNOT_INSERT_MESSAGE = createTranslation("misc", "no_permission.insert"); - - private final ServerPlayer player; - private final PlatformSecurityNetworkComponent securityNetworkComponent; - private final GridOperations delegate; - - public SecuredGridOperations(final ServerPlayer player, - final PlatformSecurityNetworkComponent securityNetworkComponent, - final GridOperations delegate) { - this.player = player; - this.securityNetworkComponent = securityNetworkComponent; - this.delegate = delegate; - } - - @Override - public boolean extract(final ResourceKey resource, - final GridExtractMode extractMode, - final InsertableStorage destination) { - if (!securityNetworkComponent.isAllowed(BuiltinPermission.EXTRACT, player)) { - PlatformApi.INSTANCE.sendNoPermissionMessage(player, CANNOT_EXTRACT_MESSAGE); - return false; - } - return delegate.extract(resource, extractMode, destination); - } - - @Override - public boolean insert(final ResourceKey resource, final GridInsertMode insertMode, - final ExtractableStorage source) { - if (!securityNetworkComponent.isAllowed(BuiltinPermission.INSERT, player)) { - PlatformApi.INSTANCE.sendNoPermissionMessage(player, CANNOT_INSERT_MESSAGE); - return false; - } - return delegate.insert(resource, insertMode, source); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGrid.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGrid.java deleted file mode 100644 index 54df1fd18..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGrid.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.grid.operations.NoopGridOperations; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcherManager; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcherManagerImpl; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyNetworkComponent; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.NoopStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformSecurityNetworkComponent; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.Platform; - -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -import net.minecraft.server.level.ServerPlayer; - -class WirelessGrid implements Grid { - private final NetworkBoundItemSession session; - private final GridWatcherManager watchers = new GridWatcherManagerImpl(); - - WirelessGrid(final NetworkBoundItemSession session) { - this.session = session; - } - - private Optional getStorage() { - return session.resolveNetwork().map(network -> network.getComponent(StorageNetworkComponent.class)); - } - - private Optional getSecurity() { - return session.resolveNetwork().map(network -> network.getComponent(PlatformSecurityNetworkComponent.class)); - } - - @Override - public void addWatcher(final GridWatcher watcher, final Class actorType) { - session.drainEnergy(Platform.INSTANCE.getConfig().getWirelessGrid().getOpenEnergyUsage()); - session.resolveNetwork().ifPresent(network -> watchers.addWatcher( - watcher, - actorType, - network.getComponent(StorageNetworkComponent.class) - )); - } - - @Override - public void removeWatcher(final GridWatcher watcher) { - session.resolveNetwork().ifPresent(network -> watchers.removeWatcher( - watcher, - network.getComponent(StorageNetworkComponent.class) - )); - } - - @Override - public Storage getItemStorage() { - return getStorage().map(Storage.class::cast).orElseGet(NoopStorage::new); - } - - @Override - public boolean isGridActive() { - final boolean networkActive = session.resolveNetwork().map( - network -> network.getComponent(EnergyNetworkComponent.class).getStored() > 0 - ).orElse(false); - return networkActive && session.isActive(); - } - - @Override - public List getResources(final Class actorType) { - return getStorage().map(storage -> storage.getResources(actorType)).orElse(Collections.emptyList()); - } - - @Override - public GridOperations createOperations(final ResourceType resourceType, final ServerPlayer player) { - return getStorage() - .flatMap(storageChannel -> - getSecurity().map(security -> createGridOperations(resourceType, player, storageChannel, security))) - .map(gridOperations -> (GridOperations) new WirelessGridOperations(gridOperations, session, watchers)) - .orElseGet(NoopGridOperations::new); - } - - private GridOperations createGridOperations(final ResourceType resourceType, - final ServerPlayer player, - final StorageNetworkComponent storageChannel, - final PlatformSecurityNetworkComponent securityNetworkComponent) { - final PlayerActor playerActor = new PlayerActor(player); - final GridOperations operations = resourceType.createGridOperations(storageChannel, playerActor); - return new SecuredGridOperations(player, securityNetworkComponent, operations); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridData.java deleted file mode 100644 index 91b59f41b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridData.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; - -public record WirelessGridData(GridData gridData, SlotReference slotReference) { - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - GridData.STREAM_CODEC, WirelessGridData::gridData, - SlotReferenceFactory.STREAM_CODEC, WirelessGridData::slotReference, - WirelessGridData::new - ); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridItem.java deleted file mode 100644 index e7124ff40..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridItem.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.energy.EnergyStorageImpl; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.security.SecurityHelper; -import com.refinedmods.refinedstorage2.platform.api.support.energy.AbstractNetworkBoundEnergyItem; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.security.BuiltinPermission; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -public class WirelessGridItem extends AbstractNetworkBoundEnergyItem { - public WirelessGridItem() { - super( - new Item.Properties().stacksTo(1), - PlatformApi.INSTANCE.getEnergyItemHelper(), - PlatformApi.INSTANCE.getNetworkBoundItemHelper() - ); - } - - public EnergyStorage createEnergyStorage(final ItemStack stack) { - final EnergyStorage energyStorage = new EnergyStorageImpl( - Platform.INSTANCE.getConfig().getWirelessGrid().getEnergyCapacity() - ); - return PlatformApi.INSTANCE.asItemEnergyStorage(energyStorage, stack); - } - - @Override - public void use(final ServerPlayer player, - final SlotReference slotReference, - final NetworkBoundItemSession session) { - final boolean isAllowed = session.resolveNetwork() - .map(network -> SecurityHelper.isAllowed(player, BuiltinPermission.OPEN, network)) - .orElse(true); // if the network can't be resolved that will be apparent later in the UI. - if (!isAllowed) { - PlatformApi.INSTANCE.sendNoPermissionToOpenMessage(player, ContentNames.WIRELESS_GRID); - return; - } - final Grid grid = new WirelessGrid(session); - Platform.INSTANCE.getMenuOpener().openMenu(player, new WirelessGridExtendedMenuProvider(grid, slotReference)); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridOperations.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridOperations.java deleted file mode 100644 index 2f2ee0c44..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridOperations.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcherManager; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage2.platform.common.Platform; - -class WirelessGridOperations implements GridOperations { - private final GridOperations delegate; - private final NetworkBoundItemSession session; - private final GridWatcherManager watchers; - - WirelessGridOperations(final GridOperations delegate, - final NetworkBoundItemSession session, - final GridWatcherManager watchers) { - this.delegate = delegate; - this.session = session; - this.watchers = watchers; - } - - @Override - public boolean extract(final ResourceKey resource, - final GridExtractMode extractMode, - final InsertableStorage destination) { - final boolean success = delegate.extract(resource, extractMode, destination); - if (success) { - drain(Platform.INSTANCE.getConfig().getWirelessGrid().getExtractEnergyUsage()); - } - return success; - } - - @Override - public boolean insert(final ResourceKey resource, - final GridInsertMode insertMode, - final ExtractableStorage source) { - final boolean success = delegate.insert(resource, insertMode, source); - if (success) { - drain(Platform.INSTANCE.getConfig().getWirelessGrid().getInsertEnergyUsage()); - } - return success; - } - - private void drain(final long amount) { - final boolean wasActive = session.isActive(); - session.drainEnergy(amount); - final boolean isActive = session.isActive(); - if (wasActive != isActive) { - watchers.activeChanged(isActive); - } - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/package-info.java deleted file mode 100644 index 978b34830..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.grid; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/AutoSelectedSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/AutoSelectedSideButtonWidget.java deleted file mode 100644 index 22111201f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/AutoSelectedSideButtonWidget.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; - -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractSideButtonWidget; - -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.NO; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.YES; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -class AutoSelectedSideButtonWidget extends AbstractSideButtonWidget { - private static final MutableComponent TITLE = createTranslation("gui", "grid.auto_selected"); - private static final Component HELP = createTranslation("gui", "grid.auto_selected.help"); - - private final AbstractGridContainerMenu menu; - - AutoSelectedSideButtonWidget(final AbstractGridContainerMenu menu) { - super(createPressAction(menu)); - this.menu = menu; - } - - private static OnPress createPressAction(final AbstractGridContainerMenu menu) { - return btn -> menu.setAutoSelected(!menu.isAutoSelected()); - } - - @Override - protected int getXTexture() { - return menu.isAutoSelected() ? 16 : 0; - } - - @Override - protected int getYTexture() { - return 96; - } - - @Override - protected MutableComponent getTitle() { - return TITLE; - } - - @Override - protected MutableComponent getSubText() { - return menu.isAutoSelected() ? YES : NO; - } - - @Override - protected Component getHelpText() { - return HELP; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/GridScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/GridScreen.java deleted file mode 100644 index 40e2b2cbf..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/GridScreen.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen; - -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public class GridScreen extends AbstractGridScreen { - private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/grid.png"); - - public GridScreen(final T menu, final Inventory inventory, final Component title) { - super(menu, inventory, title, 99); - this.inventoryLabelY = 75; - this.imageWidth = 193; - this.imageHeight = 176; - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/FluidGridInsertionHint.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/FluidGridInsertionHint.java deleted file mode 100644 index b2868a52d..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/FluidGridInsertionHint.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen.hint; - -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceRendering; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; - -import java.util.Optional; - -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.world.item.ItemStack; - -public class FluidGridInsertionHint implements GridInsertionHint { - @Override - public Optional getHint(final ItemStack carried) { - return Platform.INSTANCE.getContainedFluid(carried).map(this::createComponent); - } - - private MouseWithIconClientTooltipComponent createComponent(final Platform.ContainedFluid result) { - return new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.RIGHT, - (graphics, x, y) -> Platform.INSTANCE.getFluidRenderer().render( - graphics.pose(), - x, - y, - result.fluid() - ), - result.amount() == Platform.INSTANCE.getBucketAmount() - ? null - : FluidResourceRendering.format(result.amount()) - ); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/ItemGridInsertionHint.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/ItemGridInsertionHint.java deleted file mode 100644 index 47173ff65..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/ItemGridInsertionHint.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen.hint; - -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; - -import java.util.Optional; - -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.world.item.ItemStack; - -public class ItemGridInsertionHint implements GridInsertionHint { - @Override - public Optional getHint(final ItemStack carried) { - return Optional.of(new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.LEFT, - (graphics, x, y) -> graphics.renderItem(carried, x, y), - carried.getCount() == 1 ? null : AmountFormatting.format(carried.getCount()) - )); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java deleted file mode 100644 index 7a4a514b5..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/SingleItemGridInsertionHint.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.screen.hint; - -import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHint; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; - -import java.util.Optional; - -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.world.item.ItemStack; - -public class SingleItemGridInsertionHint implements GridInsertionHint { - @Override - public Optional getHint(final ItemStack carried) { - return Optional.of(new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.RIGHT, - (graphics, x, y) -> graphics.renderItem(carried, x, y), - null - )); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/package-info.java deleted file mode 100644 index 65a19a5e0..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/hint/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.grid.screen.hint; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/package-info.java deleted file mode 100644 index ab8127760..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/screen/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.grid.screen; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridExtractionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridExtractionStrategy.java deleted file mode 100644 index 17fb83fb5..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridExtractionStrategy.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.strategy; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; - -public class ClientGridExtractionStrategy implements GridExtractionStrategy { - @Override - public boolean onExtract(final PlatformResourceKey resource, - final GridExtractMode extractMode, - final boolean cursor) { - C2SPackets.sendGridExtract(resource, extractMode, cursor); - return true; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridInsertionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridInsertionStrategy.java deleted file mode 100644 index 1dfe32887..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridInsertionStrategy.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.strategy; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; - -public class ClientGridInsertionStrategy implements GridInsertionStrategy { - @Override - public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { - C2SPackets.sendGridInsert(insertMode, tryAlternatives); - return true; - } - - @Override - public boolean onTransfer(final int slotIndex) { - throw new UnsupportedOperationException(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridScrollingStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridScrollingStrategy.java deleted file mode 100644 index ceebdbc5c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/ClientGridScrollingStrategy.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.strategy; - -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.packet.c2s.C2SPackets; - -public class ClientGridScrollingStrategy implements GridScrollingStrategy { - @Override - public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { - C2SPackets.sendGridScroll(resource, scrollMode, slotIndex); - return true; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridExtractionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridExtractionStrategy.java deleted file mode 100644 index 4a3a1ba12..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridExtractionStrategy.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.strategy; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; - -import java.util.Collections; -import java.util.List; - -public class CompositeGridExtractionStrategy implements GridExtractionStrategy { - private final List strategies; - - public CompositeGridExtractionStrategy(final List strategies) { - this.strategies = Collections.unmodifiableList(strategies); - } - - @Override - public boolean onExtract(final PlatformResourceKey resource, - final GridExtractMode extractMode, - final boolean cursor) { - for (final GridExtractionStrategy strategy : strategies) { - if (strategy.onExtract(resource, extractMode, cursor)) { - return true; - } - } - return false; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridScrollingStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridScrollingStrategy.java deleted file mode 100644 index 73bdfb5e4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/CompositeGridScrollingStrategy.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.strategy; - -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; - -import java.util.Collections; -import java.util.List; - -public class CompositeGridScrollingStrategy implements GridScrollingStrategy { - private final List strategies; - - public CompositeGridScrollingStrategy(final List strategies) { - this.strategies = Collections.unmodifiableList(strategies); - } - - @Override - public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { - for (final GridScrollingStrategy strategy : strategies) { - if (strategy.onScroll(resource, scrollMode, slotIndex)) { - return true; - } - } - return false; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/package-info.java deleted file mode 100644 index 0d503cef2..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/strategy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/CompositeGridResourceFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/CompositeGridResourceFactory.java deleted file mode 100644 index aee3b67d5..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/CompositeGridResourceFactory.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.view; - -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; - -import java.util.Optional; - -public class CompositeGridResourceFactory implements GridResourceFactory { - private final PlatformRegistry resourceTypeRegistry; - - public CompositeGridResourceFactory(final PlatformRegistry resourceTypeRegistry) { - this.resourceTypeRegistry = resourceTypeRegistry; - } - - @Override - public Optional apply(final ResourceAmount resourceAmount) { - return resourceTypeRegistry.getAll() - .stream() - .flatMap(type -> type.toGridResource(resourceAmount).stream()) - .findFirst(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/FluidGridResource.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/FluidGridResource.java deleted file mode 100644 index 63deb44b3..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/FluidGridResource.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.grid.view; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.grid.GridResourceAttributeKeys; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.grid.view.AbstractPlatformGridResource; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceRendering; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.MouseWithIconClientTooltipComponent; - -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import javax.annotation.Nullable; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.network.chat.Component; -import net.minecraft.world.inventory.tooltip.TooltipComponent; - -public class FluidGridResource extends AbstractPlatformGridResource { - private final FluidResource fluidResource; - private final int id; - - public FluidGridResource(final ResourceAmount resourceAmount, - final String name, - final String modId, - final String modName, - final Set tags, - final String tooltip) { - super(resourceAmount, name, Map.of( - GridResourceAttributeKeys.MOD_ID, Set.of(modId), - GridResourceAttributeKeys.MOD_NAME, Set.of(modName), - GridResourceAttributeKeys.TAGS, tags, - GridResourceAttributeKeys.TOOLTIP, Set.of(tooltip) - )); - this.fluidResource = (FluidResource) resourceAmount.getResource(); - this.id = BuiltInRegistries.FLUID.getId(fluidResource.fluid()); - } - - @Override - public int getRegistryId() { - return id; - } - - @Override - public List getExtractionHints() { - return Platform.INSTANCE.convertToBucket(fluidResource).map( - bucket -> (ClientTooltipComponent) new MouseWithIconClientTooltipComponent( - MouseWithIconClientTooltipComponent.Type.LEFT, - (graphics, x, y) -> graphics.renderItem(bucket, x, y), - null - ) - ).stream().toList(); - } - - @Nullable - @Override - public PlatformResourceKey getUnderlyingResource() { - return fluidResource; - } - - @Override - public void onExtract(final GridExtractMode extractMode, - final boolean cursor, - final GridExtractionStrategy extractionStrategy) { - extractionStrategy.onExtract(fluidResource, extractMode, cursor); - } - - @Override - public void onScroll(final GridScrollMode scrollMode, final GridScrollingStrategy scrollingStrategy) { - // no-op - } - - @Override - public void render(final GuiGraphics graphics, final int x, final int y) { - Platform.INSTANCE.getFluidRenderer().render(graphics.pose(), x, y, fluidResource); - } - - @Override - public String getDisplayedAmount() { - return FluidResourceRendering.formatWithUnits(getAmount()); - } - - @Override - public String getAmountInTooltip() { - return FluidResourceRendering.format(getAmount()); - } - - @Override - public List getTooltip() { - return Platform.INSTANCE.getFluidRenderer().getTooltip(fluidResource); - } - - @Override - public Optional getTooltipImage() { - return Optional.empty(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/package-info.java deleted file mode 100644 index 605637003..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/view/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.grid.view; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceScreen.java deleted file mode 100644 index f9519a55d..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/InterfaceScreen.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.iface; - -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public class InterfaceScreen extends AbstractBaseScreen { - private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/interface.png"); - - public InterfaceScreen(final InterfaceContainerMenu menu, - final Inventory playerInventory, - final Component text) { - super(menu, playerInventory, text); - this.inventoryLabelY = 88; - this.imageWidth = 176; - this.imageHeight = 182; - } - - @Override - protected void init() { - super.init(); - addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); - addSideButton(new FuzzyModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FUZZY_MODE), - () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK - )); - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/package-info.java deleted file mode 100644 index 3a2baefdf..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/iface/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.iface; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlock.java deleted file mode 100644 index d63240ccd..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterBlock.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.importer; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalCableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock; -import com.refinedmods.refinedstorage2.platform.common.support.DirectionalCableBlockShapes; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import java.util.HashMap; -import java.util.Map; -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.shapes.VoxelShape; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ImporterBlock extends AbstractDirectionalCableBlock implements - ColorableBlock, EntityBlock, BlockItemProvider { - private static final Component HELP = createTranslation("item", "importer.help"); - private static final Map SHAPE_CACHE = new HashMap<>(); - private static final AbstractBlockEntityTicker TICKER = - new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getImporter); - private final DyeColor color; - private final MutableComponent name; - - public ImporterBlock(final DyeColor color, final MutableComponent name) { - super(SHAPE_CACHE); - this.color = color; - this.name = name; - } - - @Override - public DyeColor getColor() { - return color; - } - - @Override - public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return new ImporterBlockEntity(pos, state); - } - - @Nullable - @Override - public BlockEntityTicker getTicker(final Level level, - final BlockState blockState, - final BlockEntityType type) { - return TICKER.get(level, type); - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getImporter(); - } - - @Override - protected VoxelShape getExtensionShape(final Direction direction) { - return switch (direction) { - case NORTH -> DirectionalCableBlockShapes.IMPORTER_NORTH; - case EAST -> DirectionalCableBlockShapes.IMPORTER_EAST; - case SOUTH -> DirectionalCableBlockShapes.IMPORTER_SOUTH; - case WEST -> DirectionalCableBlockShapes.IMPORTER_WEST; - case UP -> DirectionalCableBlockShapes.IMPORTER_UP; - case DOWN -> DirectionalCableBlockShapes.IMPORTER_DOWN; - }; - } - - @Override - public MutableComponent getName() { - return name; - } - - @Override - public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterContainerMenu.java deleted file mode 100644 index dee71270f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterContainerMenu.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.importer; - -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSimpleFilterContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; - -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ImporterContainerMenu extends AbstractSimpleFilterContainerMenu { - private static final MutableComponent FILTER_HELP = createTranslation("gui", "importer.filter_help"); - - public ImporterContainerMenu(final int syncId, - final Inventory playerInventory, - final ResourceContainerData resourceContainerData) { - super( - Menus.INSTANCE.getImporter(), - syncId, - playerInventory.player, - resourceContainerData, - UpgradeDestinations.IMPORTER, - FILTER_HELP - ); - } - - ImporterContainerMenu(final int syncId, - final Player player, - final ImporterBlockEntity importer, - final ResourceContainer resourceContainer, - final UpgradeContainer upgradeContainer) { - super( - Menus.INSTANCE.getImporter(), - syncId, - player, - resourceContainer, - upgradeContainer, - importer, - FILTER_HELP - ); - } - - @Override - protected void registerClientProperties() { - registerProperty(new ClientProperty<>(PropertyTypes.FILTER_MODE, FilterMode.BLOCK)); - registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); - registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - } - - @Override - protected void registerServerProperties(final ImporterBlockEntity blockEntity) { - registerProperty(new ServerProperty<>( - PropertyTypes.FILTER_MODE, - blockEntity::getFilterMode, - blockEntity::setFilterMode - )); - registerProperty(new ServerProperty<>( - PropertyTypes.FUZZY_MODE, - blockEntity::isFuzzyMode, - blockEntity::setFuzzyMode - )); - registerProperty(new ServerProperty<>( - PropertyTypes.REDSTONE_MODE, - blockEntity::getRedstoneMode, - blockEntity::setRedstoneMode - )); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterScreen.java deleted file mode 100644 index d7244864f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/ImporterScreen.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.importer; - -import com.refinedmods.refinedstorage2.platform.common.storage.FilterModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractFilterScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ImporterScreen extends AbstractFilterScreen { - public ImporterScreen(final ImporterContainerMenu menu, final Inventory playerInventory, final Component text) { - super(menu, playerInventory, text); - } - - @Override - protected void init() { - super.init(); - addSideButton(new FilterModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FILTER_MODE), - createTranslation("gui", "importer.filter_mode.allow.help"), - createTranslation("gui", "importer.filter_mode.block.help") - )); - addSideButton(new FuzzyModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FUZZY_MODE), - () -> FuzzyModeSideButtonWidget.Type.EXTRACTING_SOURCE - )); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/package-info.java deleted file mode 100644 index 451566b79..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/importer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.importer; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/WrenchItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/WrenchItem.java deleted file mode 100644 index e0f2a0c76..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/WrenchItem.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.misc; - -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; - -import java.util.Optional; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class WrenchItem extends Item { - private static final Component HELP = createTranslation("item", "wrench.help"); - - public WrenchItem() { - super(new Item.Properties().stacksTo(1)); - } - - @Override - public Optional getTooltipImage(final ItemStack stack) { - return Optional.of(new HelpTooltipComponent(HELP)); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/package-info.java deleted file mode 100644 index e0f528efe..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/misc/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.misc; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlock.java deleted file mode 100644 index 9268ab892..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlock.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractColoredBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BooleanProperty; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class NetworkReceiverBlock extends AbstractColoredBlock implements EntityBlock { - public static final BooleanProperty ACTIVE = BooleanProperty.create("active"); - - private static final AbstractBlockEntityTicker TICKER = - new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getNetworkReceiver, ACTIVE); - private static final Component HELP = createTranslation("item", "network_receiver.help"); - - public NetworkReceiverBlock(final DyeColor color, final MutableComponent name) { - super(BlockConstants.PROPERTIES, color, name); - } - - @Override - protected BlockState getDefaultState() { - return super.getDefaultState().setValue(ACTIVE, false); - } - - @Override - protected void createBlockStateDefinition(final StateDefinition.Builder builder) { - super.createBlockStateDefinition(builder); - builder.add(ACTIVE); - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getNetworkReceiver(); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return new NetworkReceiverBlockEntity(pos, state); - } - - @Nullable - @Override - public BlockEntityTicker getTicker(final Level level, - final BlockState blockState, - final BlockEntityType type) { - return TICKER.get(level, type); - } - - @Override - public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } - - @Override - public boolean canAlwaysConnect() { - return true; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlockEntity.java deleted file mode 100644 index 60beefc08..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkReceiverBlockEntity.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.support.network.BaseNetworkNodeContainerBlockEntity; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; - -public class NetworkReceiverBlockEntity extends BaseNetworkNodeContainerBlockEntity { - public NetworkReceiverBlockEntity(final BlockPos pos, final BlockState state) { - super( - BlockEntities.INSTANCE.getNetworkReceiver(), - pos, - state, - new SimpleNetworkNode(Platform.INSTANCE.getConfig().getNetworkReceiver().getEnergyUsage()) - ); - } - - @Override - protected InWorldNetworkNodeContainer createMainContainer(final SimpleNetworkNode node) { - return PlatformApi.INSTANCE.createInWorldNetworkNodeContainer( - this, - node, - MAIN_CONTAINER_NAME, - 0, - this, - () -> new NetworkReceiverKey(mainContainer.getPosition()) - ); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntityTicker.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntityTicker.java deleted file mode 100644 index dde4d9e96..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/NetworkTransmitterBlockEntityTicker.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.api.network.impl.node.SimpleNetworkNode; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.state.BlockState; - -public class NetworkTransmitterBlockEntityTicker - extends NetworkNodeBlockEntityTicker { - NetworkTransmitterBlockEntityTicker() { - super(BlockEntities.INSTANCE::getNetworkTransmitter); - } - - @Override - public void tick(final Level level, - final BlockPos pos, - final BlockState state, - final NetworkTransmitterBlockEntity blockEntity) { - super.tick(level, pos, state, blockEntity); - blockEntity.updateStateInLevel(state); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlock.java deleted file mode 100644 index 80debd7ba..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayBlock.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DefaultDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class RelayBlock extends AbstractActiveColoredDirectionalBlock - implements EntityBlock, BlockItemProvider { - private static final Component HELP = createTranslation("item", "relay.help"); - private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>( - BlockEntities.INSTANCE::getRelay, - ACTIVE - ); - - public RelayBlock(final DyeColor color, final MutableComponent name) { - super(BlockConstants.PROPERTIES, color, name); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(final BlockPos blockPos, final BlockState blockState) { - return new RelayBlockEntity(blockPos, blockState); - } - - @Nullable - @Override - public BlockEntityTicker getTicker(final Level level, - final BlockState blockState, - final BlockEntityType type) { - return TICKER.get(level, type); - } - - @Override - protected DirectionType getDirectionType() { - return DefaultDirectionType.FACE_PLAYER; - } - - @Override - public BaseBlockItem createBlockItem() { - return new BaseBlockItem(this, HELP); - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getRelay(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassEnergySideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassEnergySideButtonWidget.java deleted file mode 100644 index 731881458..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassEnergySideButtonWidget.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractYesNoSideButtonWidget; - -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -class RelayPassEnergySideButtonWidget extends AbstractYesNoSideButtonWidget { - private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_energy"); - private static final MutableComponent HELP = createTranslation("gui", "relay.pass_energy.help"); - - RelayPassEnergySideButtonWidget(final ClientProperty property) { - super(property, TITLE); - } - - @Override - protected int getXTexture() { - return Boolean.TRUE.equals(property.getValue()) ? 128 : 144; - } - - @Override - protected int getYTexture() { - return 0; - } - - @Nullable - @Override - protected Component getHelpText() { - return HELP; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassSecuritySideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassSecuritySideButtonWidget.java deleted file mode 100644 index 6e9271ac3..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassSecuritySideButtonWidget.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractYesNoSideButtonWidget; - -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -class RelayPassSecuritySideButtonWidget extends AbstractYesNoSideButtonWidget { - private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_security"); - private static final MutableComponent HELP = createTranslation("gui", "relay.pass_security.help"); - - RelayPassSecuritySideButtonWidget(final ClientProperty property) { - super(property, TITLE); - } - - @Override - protected int getXTexture() { - return Boolean.TRUE.equals(property.getValue()) ? 128 : 144; - } - - @Override - protected int getYTexture() { - return 32; - } - - @Nullable - @Override - protected Component getHelpText() { - return HELP; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassStorageSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassStorageSideButtonWidget.java deleted file mode 100644 index b6ec659fb..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassStorageSideButtonWidget.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractYesNoSideButtonWidget; - -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -class RelayPassStorageSideButtonWidget extends AbstractYesNoSideButtonWidget { - private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_storage"); - private static final MutableComponent HELP = createTranslation("gui", "relay.pass_storage.help"); - - RelayPassStorageSideButtonWidget(final ClientProperty property) { - super(property, TITLE); - } - - @Override - protected int getXTexture() { - return Boolean.TRUE.equals(property.getValue()) ? 128 : 144; - } - - @Override - protected int getYTexture() { - return 16; - } - - @Nullable - @Override - protected Component getHelpText() { - return HELP; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassThroughSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassThroughSideButtonWidget.java deleted file mode 100644 index 654761ace..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPassThroughSideButtonWidget.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractYesNoSideButtonWidget; - -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -class RelayPassThroughSideButtonWidget extends AbstractYesNoSideButtonWidget { - private static final MutableComponent TITLE = createTranslation("gui", "relay.pass_through"); - private static final MutableComponent HELP = createTranslation("gui", "relay.pass_through.help"); - - RelayPassThroughSideButtonWidget(final ClientProperty property) { - super(property, TITLE); - } - - @Override - protected int getXTexture() { - return Boolean.TRUE.equals(property.getValue()) ? 96 : 112; - } - - @Override - protected int getYTexture() { - return 0; - } - - @Nullable - @Override - protected Component getHelpText() { - return HELP; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPropertyTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPropertyTypes.java deleted file mode 100644 index bb63de761..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/RelayPropertyTypes.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -final class RelayPropertyTypes { - static final PropertyType PASS_THROUGH = PropertyTypes.createBooleanProperty( - createIdentifier("pass_through") - ); - static final PropertyType PASS_ENERGY = PropertyTypes.createBooleanProperty( - createIdentifier("pass_energy") - ); - static final PropertyType PASS_STORAGE = PropertyTypes.createBooleanProperty( - createIdentifier("pass_storage") - ); - static final PropertyType PASS_SECURITY = PropertyTypes.createBooleanProperty( - createIdentifier("pass_security") - ); - - private RelayPropertyTypes() { - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/package-info.java deleted file mode 100644 index 71023c966..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/networking/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.networking; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/package-info.java deleted file mode 100644 index 43c42dfdf..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java deleted file mode 100644 index bafbdfe33..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/AbstractSecurityCardExtendedMenuProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; - -import java.util.List; -import java.util.Set; - -abstract class AbstractSecurityCardExtendedMenuProvider implements ExtendedMenuProvider { - private final SecurityPolicy securityPolicy; - private final Set dirtyPermissions; - - AbstractSecurityCardExtendedMenuProvider(final SecurityPolicy securityPolicy, - final Set dirtyPermissions) { - this.securityPolicy = securityPolicy; - this.dirtyPermissions = dirtyPermissions; - } - - protected final List getDataPermissions() { - return PlatformApi.INSTANCE.getPermissionRegistry().getAll().stream().map(this::toDataPermission).toList(); - } - - private SecurityCardData.Permission toDataPermission(final PlatformPermission permission) { - return new SecurityCardData.Permission( - permission, - securityPolicy.isAllowed(permission), - dirtyPermissions.contains(permission) - ); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardItem.java deleted file mode 100644 index 2752565bf..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/FallbackSecurityCardItem.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.api.network.security.SecurityActor; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.Platform; - -import java.util.Optional; -import java.util.Set; - -import net.minecraft.network.chat.Component; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class FallbackSecurityCardItem extends AbstractSecurityCardItem { - private static final Component HELP = createTranslation("item", "fallback_security_card.help"); - - public FallbackSecurityCardItem() { - super(new Item.Properties().stacksTo(1)); - } - - @Override - AbstractSecurityCardExtendedMenuProvider createMenuProvider( - final MinecraftServer server, - final SlotReference slotReference, - final SecurityPolicy policy, - final Set dirtyPermissions, - final ItemStack stack - ) { - return new FallbackSecurityCardExtendedMenuProvider(slotReference, policy, dirtyPermissions); - } - - @Override - public Optional getTooltipImage(final ItemStack stack) { - return Optional.of(new HelpTooltipComponent(HELP)); - } - - @Override - public Optional getActor(final ItemStack stack) { - return Optional.empty(); - } - - @Override - public long getEnergyUsage() { - return Platform.INSTANCE.getConfig().getFallbackSecurityCard().getEnergyUsage(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlatformSecurityNetworkComponentImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlatformSecurityNetworkComponentImpl.java deleted file mode 100644 index b11f97eb4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlatformSecurityNetworkComponentImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.api.network.impl.security.SecurityNetworkComponentImpl; -import com.refinedmods.refinedstorage2.api.network.security.Permission; -import com.refinedmods.refinedstorage2.api.network.security.SecurityPolicy; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformSecurityNetworkComponent; - -import com.mojang.authlib.GameProfile; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; - -public class PlatformSecurityNetworkComponentImpl extends SecurityNetworkComponentImpl - implements PlatformSecurityNetworkComponent { - public PlatformSecurityNetworkComponentImpl(final SecurityPolicy defaultPolicy) { - super(defaultPolicy); - } - - @Override - public boolean isAllowed(final Permission permission, final ServerPlayer player) { - final MinecraftServer server = player.getServer(); - if (server == null) { - return false; - } - final GameProfile gameProfile = player.getGameProfile(); - if (server.getPlayerList().isOp(gameProfile)) { - return true; - } - final PlayerSecurityActor actor = new PlayerSecurityActor(gameProfile.getId()); - return super.isAllowed(permission, actor); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerSecurityActor.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerSecurityActor.java deleted file mode 100644 index 47ea8c321..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/PlayerSecurityActor.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.api.network.security.SecurityActor; - -import java.util.UUID; - -public record PlayerSecurityActor(UUID playerId) implements SecurityActor { -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardData.java deleted file mode 100644 index bddbc98f7..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityCardData.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; - -public record SecurityCardData(SlotReference slotReference, List permissions) { - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - SlotReferenceFactory.STREAM_CODEC, SecurityCardData::slotReference, - ByteBufCodecs.collection( - ArrayList::new, - StreamCodec.composite( - PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), Permission::permission, - ByteBufCodecs.BOOL, Permission::allowed, - ByteBufCodecs.BOOL, Permission::dirty, - Permission::new - ) - ), SecurityCardData::permissions, - SecurityCardData::new - ); - - record Permission(PlatformPermission permission, boolean allowed, boolean dirty) { - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlock.java deleted file mode 100644 index 270034672..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerBlock.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.HorizontalDirection; -import com.refinedmods.refinedstorage2.platform.common.support.direction.HorizontalDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class SecurityManagerBlock - extends AbstractActiveColoredDirectionalBlock - implements BlockItemProvider, EntityBlock { - private static final MutableComponent HELP = createTranslation("block", "security_manager.help"); - private static final AbstractBlockEntityTicker TICKER = - new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getSecurityManager, ACTIVE); - - public SecurityManagerBlock(final DyeColor color, final MutableComponent name) { - super(BlockConstants.PROPERTIES, color, name); - } - - @Override - protected DirectionType getDirectionType() { - return HorizontalDirectionType.INSTANCE; - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getSecurityManager(); - } - - @Override - public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return new SecurityManagerBlockEntity(pos, state); - } - - @Nullable - @Override - public BlockEntityTicker getTicker(final Level level, - final BlockState blockState, - final BlockEntityType type) { - return TICKER.get(level, type); - } - - @Override - public boolean canAlwaysConnect() { - return true; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerContainerMenu.java deleted file mode 100644 index 6dc7a36c4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerContainerMenu.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot; - -import javax.annotation.Nullable; - -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.Slot; - -import static com.refinedmods.refinedstorage2.platform.common.security.SecurityManagerBlockEntity.CARD_AMOUNT; - -public class SecurityManagerContainerMenu extends AbstractBaseContainerMenu { - @Nullable - private Slot fallbackSecurityCardSlot; - - public SecurityManagerContainerMenu(final int syncId, final Inventory playerInventory) { - super(Menus.INSTANCE.getSecurityManager(), syncId); - addSlots( - playerInventory, - new FilteredContainer(CARD_AMOUNT, SecurityManagerBlockEntity::isValidSecurityCard), - new FilteredContainer(1, SecurityManagerBlockEntity::isValidFallbackSecurityCard) - ); - registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - } - - SecurityManagerContainerMenu(final int syncId, - final Inventory playerInventory, - final SecurityManagerBlockEntity securityManager) { - super(Menus.INSTANCE.getSecurityManager(), syncId); - addSlots(playerInventory, securityManager.getSecurityCards(), securityManager.getFallbackSecurityCard()); - registerProperty(new ServerProperty<>( - PropertyTypes.REDSTONE_MODE, - securityManager::getRedstoneMode, - securityManager::setRedstoneMode - )); - } - - private void addSlots(final Inventory playerInventory, - final FilteredContainer securityCards, - final FilteredContainer fallbackSecurityCard) { - for (int i = 0; i < CARD_AMOUNT; ++i) { - final int column = i % 9; - final int x = 8 + (column * 18); - final int row = i / 9; - final int y = 20 + (row * 18); - addSlot(new ValidatedSlot(securityCards, i, x, y, SecurityManagerBlockEntity::isValidSecurityCard)); - } - fallbackSecurityCardSlot = new ValidatedSlot( - fallbackSecurityCard, - 0, - 174, - 20, - SecurityManagerBlockEntity::isValidFallbackSecurityCard - ); - addSlot(fallbackSecurityCardSlot); - addPlayerInventory(playerInventory, 8, 72); - transferManager.addBiTransfer(playerInventory, securityCards); - transferManager.addBiTransfer(playerInventory, fallbackSecurityCard); - } - - @Nullable - Slot getFallbackSecurityCardSlot() { - return fallbackSecurityCardSlot; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerScreen.java deleted file mode 100644 index 7a819c1e7..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/SecurityManagerScreen.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; - -import java.util.List; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class SecurityManagerScreen extends AbstractBaseScreen { - private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/security_manager.png"); - - public SecurityManagerScreen(final SecurityManagerContainerMenu menu, - final Inventory playerInventory, - final Component text) { - super(menu, playerInventory, text); - this.inventoryLabelY = 59; - this.imageWidth = 197; - this.imageHeight = 154; - } - - @Override - protected void init() { - super.init(); - addSideButton(new RedstoneModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.REDSTONE_MODE), - createTranslation("gui", "security_manager.redstone_mode_help") - )); - } - - @Override - protected void renderTooltip(final GuiGraphics graphics, final int x, final int y) { - if (hoveredSlot != null && hoveredSlot == menu.getFallbackSecurityCardSlot() && !hoveredSlot.hasItem()) { - Platform.INSTANCE.renderTooltip(graphics, List.of( - ClientTooltipComponent.create( - createTranslation("gui", "security_manager.fallback_security_card_slot_hint").getVisualOrderText() - ), - HelpClientTooltipComponent.create( - createTranslation("gui", "security_manager.no_fallback_security_card_consequence") - ) - ), x, y); - return; - } - super.renderTooltip(graphics, x, y); - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/package-info.java deleted file mode 100644 index 77692e9ab..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/security/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.security; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/Disk.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/Disk.java deleted file mode 100644 index 8cbd25f3b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/Disk.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.storage.StorageState; - -import javax.annotation.Nullable; - -import net.minecraft.world.item.Item; - -public record Disk(@Nullable Item item, StorageState state) { -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/LimitedPlatformStorage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/LimitedPlatformStorage.java deleted file mode 100644 index 72f5fc8e5..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/LimitedPlatformStorage.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; - -class LimitedPlatformStorage extends PlatformStorage implements LimitedStorage { - private final LimitedStorageImpl limitedStorage; - - LimitedPlatformStorage(final LimitedStorageImpl delegate, - final StorageType type, - final TrackedStorageRepository trackingRepository, - final Runnable listener) { - super(delegate, type, trackingRepository, listener); - this.limitedStorage = delegate; - } - - @Override - public long getCapacity() { - return limitedStorage.getCapacity(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorage.java deleted file mode 100644 index e0496c73e..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/PlatformStorage.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.AbstractProxyStorage; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; - -import java.util.Optional; - -class PlatformStorage extends AbstractProxyStorage implements SerializableStorage, TrackedStorage { - private final StorageType type; - private final TrackedStorageRepository trackingRepository; - private final Runnable listener; - - PlatformStorage(final Storage delegate, - final StorageType type, - final TrackedStorageRepository trackingRepository, - final Runnable listener) { - super(delegate); - this.type = type; - this.trackingRepository = trackingRepository; - this.listener = listener; - } - - void load(final StorageCodecs.StorageResource storageResource) { - final ResourceKey resource = storageResource.resource(); - if (!type.isAllowed(resource)) { - return; - } - super.insert(resource, storageResource.amount(), Action.EXECUTE, EmptyActor.INSTANCE); - storageResource.changed().ifPresent( - changed -> trackingRepository.update(resource, new PlayerActor(changed.changedBy()), changed.changedAt()) - ); - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - if (!type.isAllowed(resource)) { - return 0; - } - final long extracted = super.extract(resource, amount, action, actor); - if (extracted > 0 && action == Action.EXECUTE) { - listener.run(); - } - return extracted; - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - if (!type.isAllowed(resource)) { - return 0; - } - final long inserted = super.insert(resource, amount, action, actor); - if (inserted > 0 && action == Action.EXECUTE) { - listener.run(); - } - return inserted; - } - - @Override - public StorageType getType() { - return type; - } - - @Override - public Optional findTrackedResourceByActorType(final ResourceKey resource, - final Class actorType) { - return trackingRepository.findTrackedResourceByActorType(resource, actorType); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageAccessor.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageAccessor.java deleted file mode 100644 index f45b0818b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageAccessor.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -public interface StorageAccessor { - long getStored(); - - long getCapacity(); - - double getProgress(); - - boolean hasCapacity(); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageConfigurationContainer.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageConfigurationContainer.java deleted file mode 100644 index bd3743966..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageConfigurationContainer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; - -public interface StorageConfigurationContainer { - int getPriority(); - - void setPriority(int priority); - - FilterMode getFilterMode(); - - void setFilterMode(FilterMode filterMode); - - boolean isFuzzyMode(); - - void setFuzzyMode(boolean fuzzyMode); - - AccessMode getAccessMode(); - - void setAccessMode(AccessMode accessMode); - - boolean isVoidExcess(); - - void setVoidExcess(boolean voidExcess); - - RedstoneMode getRedstoneMode(); - - void setRedstoneMode(RedstoneMode redstoneMode); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StoragePropertyTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StoragePropertyTypes.java deleted file mode 100644 index 9a0cdfc9a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StoragePropertyTypes.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.storage.AccessMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public final class StoragePropertyTypes { - public static final PropertyType PRIORITY = PropertyTypes.createIntegerProperty( - createIdentifier("priority") - ); - - public static final PropertyType ACCESS_MODE = new PropertyType<>( - createIdentifier("access_mode"), - AccessModeSettings::getAccessMode, - AccessModeSettings::getAccessMode - ); - - public static final PropertyType VOID_EXCESS = PropertyTypes.createBooleanProperty( - createIdentifier("void_excess") - ); - - private StoragePropertyTypes() { - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTypes.java deleted file mode 100644 index 74cf21480..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/StorageTypes.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.InMemoryTrackedStorageRepository; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorageRepository; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageType; - -public final class StorageTypes { - public static final StorageType ITEM = new ItemStorageType(); - public static final StorageType FLUID = new FluidStorageType(); - - private StorageTypes() { - } - - static PlatformStorage createHomogeneousStorage(final StorageType type, - final StorageCodecs.StorageData data, - final Runnable listener) { - final TrackedStorageRepository trackingRepository = new InMemoryTrackedStorageRepository(); - final TrackedStorageImpl tracked = new TrackedStorageImpl( - new InMemoryStorageImpl(), - trackingRepository, - System::currentTimeMillis - ); - final PlatformStorage storage = data.capacity().map(capacity -> { - final LimitedStorageImpl limited = new LimitedStorageImpl(tracked, capacity); - return (PlatformStorage) new LimitedPlatformStorage(limited, type, trackingRepository, listener); - }).orElseGet(() -> new PlatformStorage(tracked, type, trackingRepository, listener)); - data.resources().forEach(storage::load); - return storage; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/VoidExcessSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/VoidExcessSideButtonWidget.java deleted file mode 100644 index 7bbbadd5e..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/VoidExcessSideButtonWidget.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.widget.AbstractYesNoSideButtonWidget; - -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class VoidExcessSideButtonWidget extends AbstractYesNoSideButtonWidget { - private static final Component HELP = createTranslation("gui", "void_excess.help"); - private static final Component ALLOWLIST_WARNING = createTranslation( - "gui", - "void_excess.allowlist_warning" - ); - - public VoidExcessSideButtonWidget(final ClientProperty property) { - super(property, createTranslation("gui", "void_excess")); - } - - public void setWarningVisible(final boolean visible) { - if (visible) { - setWarning(ALLOWLIST_WARNING); - } else { - setWarning(null); - } - } - - @Override - protected int getXTexture() { - return Boolean.TRUE.equals(property.getValue()) ? 16 : 0; - } - - @Override - protected int getYTexture() { - return 240 - 15; - } - - @Override - @Nullable - protected Component getHelpText() { - return HELP; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlock.java deleted file mode 100644 index 2a52594ac..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveBlock.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive; - -import com.refinedmods.refinedstorage2.api.network.impl.node.storage.StorageNetworkNode; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskContainerBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; - -import java.util.function.BiFunction; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class DiskDriveBlock extends AbstractDirectionalBlock implements EntityBlock { - private static final Component HELP = createTranslation("item", "disk_drive.help"); - private static final DiskContainerBlockEntityTicker TICKER = - new DiskContainerBlockEntityTicker<>(BlockEntities.INSTANCE::getDiskDrive); - - private final BiFunction blockEntityFactory; - - public DiskDriveBlock(final BiFunction blockEntityFactory) { - super(BlockConstants.PROPERTIES); - this.blockEntityFactory = blockEntityFactory; - } - - @Override - protected DirectionType getDirectionType() { - return BiDirectionType.INSTANCE; - } - - @Override - public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return blockEntityFactory.apply(pos, state); - } - - @Override - public BlockEntityTicker getTicker(final Level level, - final BlockState state, - final BlockEntityType type) { - return TICKER.get(level, type); - } - - public BlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveScreen.java deleted file mode 100644 index db7199f8d..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/DiskDriveScreen.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive; - -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractProgressStorageScreen; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class DiskDriveScreen extends AbstractProgressStorageScreen { - private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/disk_drive.png"); - private static final MutableComponent DISKS_TEXT = createTranslation("gui", "disk_drive.disks"); - - public DiskDriveScreen(final DiskDriveContainerMenu menu, final Inventory playerInventory, final Component text) { - super(menu, playerInventory, text, 99); - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } - - @Override - protected void renderLabels(final GuiGraphics graphics, final int mouseX, final int mouseY) { - super.renderLabels(graphics, mouseX, mouseY); - graphics.drawString(font, DISKS_TEXT, 60, 42, 4210752, false); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java deleted file mode 100644 index 0f6e45bf6..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/EmptyStorageDiskInfoAccessor.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive; - -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; - -import java.util.Optional; - -import net.minecraft.world.item.ItemStack; - -class EmptyStorageDiskInfoAccessor implements StorageDiskInfoAccessor { - @Override - public Optional getInfo(final ItemStack stack) { - return Optional.empty(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java deleted file mode 100644 index 41d729240..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/StorageDiskInfoAccessor.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive; - -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; - -import java.util.Optional; - -import net.minecraft.world.item.ItemStack; - -interface StorageDiskInfoAccessor { - Optional getInfo(ItemStack stack); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java deleted file mode 100644 index 2f29aaba9..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/StorageDiskInfoAccessorImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive; - -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; - -import java.util.Optional; - -import net.minecraft.world.item.ItemStack; - -class StorageDiskInfoAccessorImpl implements StorageDiskInfoAccessor { - private final StorageRepository storageRepository; - - StorageDiskInfoAccessorImpl(final StorageRepository storageRepository) { - this.storageRepository = storageRepository; - } - - @Override - public Optional getInfo(final ItemStack stack) { - if (stack.getItem() instanceof StorageContainerItem storageContainerItem) { - return storageContainerItem.getInfo(storageRepository, stack); - } - return Optional.empty(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/package-info.java deleted file mode 100644 index 96fe08d70..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskdrive/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.storage.diskdrive; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlock.java deleted file mode 100644 index c1035995b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceBlock.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface; - -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferNetworkNode; -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskContainerBlockEntityTicker; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider; -import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockItem; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirectionType; -import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType; - -import java.util.function.BiFunction; -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class DiskInterfaceBlock - extends AbstractActiveColoredDirectionalBlock - implements EntityBlock, BlockItemProvider { - private static final Component HELP = createTranslation("item", "disk_interface.help"); - private static final DiskContainerBlockEntityTicker - TICKER = new DiskContainerBlockEntityTicker<>(BlockEntities.INSTANCE::getDiskInterface, ACTIVE); - - private final BiFunction blockEntityFactory; - - public DiskInterfaceBlock(final DyeColor color, - final MutableComponent name, - final BiFunction - blockEntityFactory) { - super(BlockConstants.PROPERTIES, color, name); - this.blockEntityFactory = blockEntityFactory; - } - - @Override - protected DirectionType getDirectionType() { - return BiDirectionType.INSTANCE; - } - - @Nullable - @Override - public BlockEntityTicker getTicker(final Level level, - final BlockState blockState, - final BlockEntityType type) { - return TICKER.get(level, type); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(final BlockPos blockPos, final BlockState blockState) { - return blockEntityFactory.apply(blockPos, blockState); - } - - @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getDiskInterface(); - } - - @Override - public BaseBlockItem createBlockItem() { - return new NetworkNodeBlockItem(this, HELP); - } - - @Override - public boolean canAlwaysConnect() { - return true; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java deleted file mode 100644 index 99237eda6..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceContainerMenu.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface; - -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode; -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeContainer; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeSlot; - -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.Slot; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class DiskInterfaceContainerMenu extends AbstractResourceContainerMenu { - private static final int DISK_SLOT_X1 = 44; - private static final int DISK_SLOT_X2 = 116; - private static final int DISK_SLOT_Y = 57; - - private static final int FILTER_SLOT_X = 8; - private static final int FILTER_SLOT_Y = 20; - - DiskInterfaceContainerMenu(final int syncId, - final Player player, - final AbstractDiskInterfaceBlockEntity blockEntity, - final DiskInventory diskInventory, - final ResourceContainer filterContainer, - final UpgradeContainer upgradeContainer) { - super(Menus.INSTANCE.getDiskInterface(), syncId, player); - addSlots(player, diskInventory, filterContainer, upgradeContainer); - registerProperty(new ServerProperty<>( - PropertyTypes.REDSTONE_MODE, - blockEntity::getRedstoneMode, - blockEntity::setRedstoneMode - )); - registerProperty(new ServerProperty<>( - PropertyTypes.FUZZY_MODE, - blockEntity::isFuzzyMode, - blockEntity::setFuzzyMode - )); - registerProperty(new ServerProperty<>( - PropertyTypes.FILTER_MODE, - blockEntity::getFilterMode, - blockEntity::setFilterMode - )); - registerProperty(new ServerProperty<>( - DiskInterfacePropertyTypes.TRANSFER_MODE, - blockEntity::getTransferMode, - blockEntity::setTransferMode - )); - } - - public DiskInterfaceContainerMenu(final int syncId, - final Inventory playerInventory, - final ResourceContainerData resourceContainerData) { - super(Menus.INSTANCE.getDiskInterface(), syncId); - addSlots( - playerInventory.player, - new FilteredContainer( - AbstractDiskInterfaceBlockEntity.AMOUNT_OF_DISKS, - StorageContainerItem.stackValidator() - ), - ResourceContainerImpl.createForFilter(resourceContainerData), - new UpgradeContainer(UpgradeDestinations.DISK_INTERFACE, PlatformApi.INSTANCE.getUpgradeRegistry()) - ); - registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); - registerProperty(new ClientProperty<>(PropertyTypes.FILTER_MODE, FilterMode.BLOCK)); - registerProperty(new ClientProperty<>( - DiskInterfacePropertyTypes.TRANSFER_MODE, - StorageTransferMode.INSERT_INTO_NETWORK - )); - } - - private void addSlots(final Player player, - final FilteredContainer diskInventory, - final ResourceContainer filterContainer, - final UpgradeContainer upgradeContainer) { - for (int i = 0; i < diskInventory.getContainerSize(); ++i) { - addSlot(createDiskSlot(diskInventory, i)); - } - for (int i = 0; i < filterContainer.size(); ++i) { - addSlot(createFilterSlot(filterContainer, i)); - } - for (int i = 0; i < upgradeContainer.getContainerSize(); ++i) { - addSlot(new UpgradeSlot(upgradeContainer, i, 187, 6 + (i * 18))); - } - addPlayerInventory(player.getInventory(), 8, 129); - - transferManager.addBiTransfer(player.getInventory(), upgradeContainer); - transferManager.addBiTransfer(player.getInventory(), diskInventory); - transferManager.addFilterTransfer(player.getInventory()); - } - - private Slot createFilterSlot(final ResourceContainer filterContainer, final int i) { - final int x = FILTER_SLOT_X + (18 * i); - return new ResourceSlot( - filterContainer, - i, - createTranslation("gui", "disk_interface.filter_help"), - x, - FILTER_SLOT_Y, - ResourceSlotType.FILTER - ); - } - - private Slot createDiskSlot(final FilteredContainer diskInventory, final int i) { - final int x = i < 3 ? DISK_SLOT_X1 : DISK_SLOT_X2; - final int y = DISK_SLOT_Y + ((i % 3) * 18); - return ValidatedSlot.forStorageContainer(diskInventory, i, x, y); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java deleted file mode 100644 index 471c88709..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfacePropertyTypes.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface; - -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -class DiskInterfacePropertyTypes { - public static final PropertyType TRANSFER_MODE = new PropertyType<>( - createIdentifier("transfer_mode"), - TransferModeSettings::getTransferMode, - TransferModeSettings::getTransferMode - ); - - private DiskInterfacePropertyTypes() { - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceScreen.java deleted file mode 100644 index 9c1e0d7ad..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/DiskInterfaceScreen.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface; - -import com.refinedmods.refinedstorage2.api.network.impl.node.storagetransfer.StorageTransferMode; -import com.refinedmods.refinedstorage2.platform.common.storage.FilterModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class DiskInterfaceScreen extends AbstractBaseScreen { - private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/disk_interface.png"); - - private static final MutableComponent IN_TEXT = createTranslation("gui", "disk_interface.in"); - private static final MutableComponent OUT_TEXT = createTranslation("gui", "disk_interface.out"); - - public DiskInterfaceScreen(final DiskInterfaceContainerMenu menu, - final Inventory playerInventory, - final Component text) { - super(menu, playerInventory, text); - this.inventoryLabelY = 117; - this.imageWidth = 211; - this.imageHeight = 211; - } - - @Override - protected void init() { - super.init(); - addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); - addSideButton(new TransferModeSideButtonWidget( - getMenu().getProperty(DiskInterfacePropertyTypes.TRANSFER_MODE) - )); - addSideButton(new FilterModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FILTER_MODE), - createTranslation("gui", "disk_interface.filter_mode.allow.help"), - createTranslation("gui", "disk_interface.filter_mode.block.help") - )); - addSideButton(new FuzzyModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FUZZY_MODE), - () -> getMenu().getProperty(DiskInterfacePropertyTypes.TRANSFER_MODE).getValue() - == StorageTransferMode.EXTRACT_FROM_NETWORK - ? FuzzyModeSideButtonWidget.Type.EXTRACTING_STORAGE_NETWORK - : FuzzyModeSideButtonWidget.Type.EXTRACTING_SOURCE - )); - } - - @Override - protected void renderLabels(final GuiGraphics graphics, final int x, final int y) { - super.renderLabels(graphics, x, y); - graphics.drawString(font, IN_TEXT, 43, 45, 4210752, false); - graphics.drawString(font, OUT_TEXT, 115, 45, 4210752, false); - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/package-info.java deleted file mode 100644 index 32a4bfd5a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/diskinterface/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.storage.diskinterface; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java deleted file mode 100644 index 3caa108c0..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageContainerMenu.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.externalstorage; - -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractStorageContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainer; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; - -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.Slot; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ExternalStorageContainerMenu extends AbstractStorageContainerMenu { - private static final int FILTER_SLOT_X = 8; - private static final int FILTER_SLOT_Y = 20; - - public ExternalStorageContainerMenu(final int syncId, - final Inventory playerInventory, - final ResourceContainerData resourceContainerData) { - super(Menus.INSTANCE.getExternalStorage(), syncId); - addSlots(playerInventory.player, ResourceContainerImpl.createForFilter(resourceContainerData)); - } - - ExternalStorageContainerMenu(final int syncId, - final Player player, - final ResourceContainer resourceContainer, - final StorageConfigurationContainer configContainer) { - super(Menus.INSTANCE.getExternalStorage(), syncId, player, configContainer); - addSlots(player, resourceContainer); - } - - private void addSlots(final Player player, - final ResourceContainer resourceContainer) { - for (int i = 0; i < resourceContainer.size(); ++i) { - addSlot(createFilterSlot(resourceContainer, i)); - } - addPlayerInventory(player.getInventory(), 8, 55); - transferManager.addFilterTransfer(player.getInventory()); - } - - private Slot createFilterSlot(final ResourceContainer resourceContainer, final int i) { - final int x = FILTER_SLOT_X + (18 * i); - return new ResourceSlot( - resourceContainer, - i, - createTranslation("gui", "storage.filter_help"), - x, - FILTER_SLOT_Y, - ResourceSlotType.FILTER - ); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageScreen.java deleted file mode 100644 index a438c7b46..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/ExternalStorageScreen.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.externalstorage; - -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractStorageScreen; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractFilterScreen; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -public class ExternalStorageScreen extends AbstractStorageScreen { - public ExternalStorageScreen(final ExternalStorageContainerMenu menu, - final Inventory inventory, - final Component title) { - super(menu, inventory, title); - this.inventoryLabelY = 42; - this.imageWidth = 210; - this.imageHeight = 137; - } - - @Override - protected ResourceLocation getTexture() { - return AbstractFilterScreen.TEXTURE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/package-info.java deleted file mode 100644 index dbd3fe16a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/package-info.java deleted file mode 100644 index d5c5c0aa4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java deleted file mode 100644 index 0674b691a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/AbstractPortableGridContainerMenu.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItem; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage2.platform.common.support.FilteredContainer; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ValidatedSlot; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyInfo; - -import javax.annotation.Nullable; - -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.inventory.Slot; - -public abstract class AbstractPortableGridContainerMenu extends AbstractGridContainerMenu - implements EnergyContainerMenu { - private final FilteredContainer diskInventory; - private final EnergyInfo energyInfo; - - @Nullable - private Slot diskSlot; - - AbstractPortableGridContainerMenu( - final MenuType menuType, - final int syncId, - final Inventory playerInventory, - final PortableGridData portableGridData - ) { - super(menuType, syncId, playerInventory, portableGridData.gridData()); - this.diskInventory = new FilteredContainer(1, StorageContainerItem.stackValidator()); - this.energyInfo = EnergyInfo.forClient( - playerInventory.player, - portableGridData.stored(), - portableGridData.capacity() - ); - } - - AbstractPortableGridContainerMenu( - final MenuType menuType, - final int syncId, - final Inventory playerInventory, - final DiskInventory diskInventory, - final Grid grid, - final EnergyStorage energyStorage - ) { - super(menuType, syncId, playerInventory, grid); - this.diskInventory = diskInventory; - this.energyInfo = EnergyInfo.forServer( - playerInventory.player, - energyStorage::getStored, - energyStorage::getCapacity - ); - } - - @Override - public void broadcastChanges() { - super.broadcastChanges(); - energyInfo.detectChanges(); - } - - @Override - protected boolean canTransferSlot(final Slot slot) { - return slot != diskSlot; - } - - @Override - public void onScreenReady(final int playerInventoryY) { - super.onScreenReady(playerInventoryY); - diskSlot = ValidatedSlot.forStorageContainer(diskInventory, 0, -19, 8); - addSlot(diskSlot); - transferManager.addBiTransfer(playerInventory, diskInventory); - } - - @Override - public EnergyInfo getEnergyInfo() { - return energyInfo; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGrid.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGrid.java deleted file mode 100644 index a32eb89e6..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGrid.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.grid.operations.NoopGridOperations; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcher; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcherManager; -import com.refinedmods.refinedstorage2.api.grid.watcher.GridWatcherManagerImpl; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.NoopStorage; -import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.storage.PlayerActor; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; - -import java.util.Collections; -import java.util.List; -import javax.annotation.Nullable; - -import net.minecraft.server.level.ServerPlayer; - -class PortableGrid implements Grid { - private final EnergyStorage energyStorage; - private final DiskInventory diskInventory; - private final GridWatcherManager watchers = new GridWatcherManagerImpl(); - private final StateTrackedStorage.Listener diskListener; - @Nullable - private PortableGridStorage storage; - - PortableGrid(final EnergyStorage energyStorage, - final DiskInventory diskInventory, - final StateTrackedStorage.Listener diskListener) { - this.energyStorage = energyStorage; - this.diskInventory = diskInventory; - this.diskListener = diskListener; - } - - void updateStorage() { - if (storage != null) { - watchers.detachAll(storage.getStorageChannel()); - } - - this.storage = diskInventory.resolve(0) - .map(diskStorage -> new StateTrackedStorage(diskStorage, diskListener)) - .map(PortableGridStorage::new) - .orElse(null); - - watchers.attachAll(getStorageChannel()); - } - - void activeChanged(final boolean active) { - watchers.activeChanged(active); - } - - StorageState getStorageState() { - if (storage == null) { - return StorageState.NONE; - } - if (!isGridActive()) { - return StorageState.INACTIVE; - } - return storage.getState(); - } - - @Override - public void addWatcher(final GridWatcher watcher, final Class actorType) { - energyStorage.extract(Platform.INSTANCE.getConfig().getPortableGrid().getOpenEnergyUsage(), Action.EXECUTE); - watchers.addWatcher(watcher, actorType, getStorageChannel()); - } - - @Override - public void removeWatcher(final GridWatcher watcher) { - watchers.removeWatcher(watcher, getStorageChannel()); - } - - @Nullable - private StorageChannel getStorageChannel() { - return storage != null ? storage.getStorageChannel() : null; - } - - @Override - public Storage getItemStorage() { - if (storage == null) { - return new NoopStorage(); - } - return storage.getStorageChannel(); - } - - @Override - public boolean isGridActive() { - return energyStorage.getStored() > 0 && storage != null; - } - - @Override - public List getResources(final Class actorType) { - if (storage == null) { - return Collections.emptyList(); - } - final StorageChannel storageChannel = storage.getStorageChannel(); - return storageChannel.getAll().stream().map(resource -> new TrackedResourceAmount( - resource, - storageChannel.findTrackedResourceByActorType(resource.getResource(), actorType).orElse(null) - )).toList(); - } - - @Override - public GridOperations createOperations(final ResourceType resourceType, final ServerPlayer player) { - if (storage == null) { - return new NoopGridOperations(); - } - final StorageChannel storageChannel = this.storage.getStorageChannel(); - final GridOperations operations = resourceType.createGridOperations(storageChannel, new PlayerActor(player)); - return new PortableGridOperations(operations, energyStorage); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java deleted file mode 100644 index a8ded69f4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockContainerMenu.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; - -import net.minecraft.world.entity.player.Inventory; - -public class PortableGridBlockContainerMenu extends AbstractPortableGridContainerMenu { - public PortableGridBlockContainerMenu(final int syncId, - final Inventory playerInventory, - final PortableGridData portableGridData) { - super(Menus.INSTANCE.getPortableGridBlock(), syncId, playerInventory, portableGridData); - registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - this.onScreenReady(0); - } - - PortableGridBlockContainerMenu(final int syncId, - final Inventory playerInventory, - final AbstractPortableGridBlockEntity portableGrid) { - super( - Menus.INSTANCE.getPortableGridBlock(), - syncId, - playerInventory, - portableGrid.getDiskInventory(), - portableGrid.getGrid(), - portableGrid.getEnergyStorage() - ); - registerProperty(new ServerProperty<>( - PropertyTypes.REDSTONE_MODE, - portableGrid::getRedstoneMode, - portableGrid::setRedstoneMode - )); - this.onScreenReady(0); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java deleted file mode 100644 index 434e3605f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridBlockItemRenderInfo.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; - -public record PortableGridBlockItemRenderInfo(boolean active, Disk disk) { -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java deleted file mode 100644 index 254bfd8e7..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemContainerMenu.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; - -import net.minecraft.world.entity.player.Inventory; - -public class PortableGridItemContainerMenu extends AbstractPortableGridContainerMenu { - public PortableGridItemContainerMenu(final int syncId, - final Inventory playerInventory, - final PortableGridData portableGridData) { - super(Menus.INSTANCE.getPortableGridItem(), syncId, playerInventory, portableGridData); - this.disabledSlot = portableGridData.slotReference().orElse(null); - this.onScreenReady(0); - } - - PortableGridItemContainerMenu(final int syncId, - final Inventory playerInventory, - final DiskInventory diskInventory, - final Grid grid, - final EnergyStorage energyStorage, - final SlotReference slotReference) { - super( - Menus.INSTANCE.getPortableGridItem(), - syncId, - playerInventory, - diskInventory, - grid, - energyStorage - ); - this.disabledSlot = slotReference; - this.onScreenReady(0); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java deleted file mode 100644 index d7f034ce4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridItemExtendedMenuProvider.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.grid.GridData; -import com.refinedmods.refinedstorage2.platform.common.grid.PortableGridData; -import com.refinedmods.refinedstorage2.platform.common.storage.DiskInventory; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; - -import java.util.Optional; -import javax.annotation.Nullable; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.chat.Component; -import net.minecraft.network.codec.StreamEncoder; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; - -class PortableGridItemExtendedMenuProvider implements ExtendedMenuProvider { - private final Grid grid; - private final EnergyStorage energyStorage; - private final DiskInventory diskInventory; - private final SlotReference slotReference; - - PortableGridItemExtendedMenuProvider(final Grid grid, - final EnergyStorage energyStorage, - final DiskInventory diskInventory, - final SlotReference slotReference) { - this.grid = grid; - this.energyStorage = energyStorage; - this.diskInventory = diskInventory; - this.slotReference = slotReference; - } - - @Override - public PortableGridData getMenuData() { - return new PortableGridData( - GridData.of(grid), - energyStorage.getStored(), - energyStorage.getCapacity(), - Optional.of(slotReference) - ); - } - - @Override - public StreamEncoder getMenuCodec() { - return PortableGridData.STREAM_CODEC; - } - - @Override - public Component getDisplayName() { - return ContentNames.PORTABLE_GRID; - } - - @Nullable - @Override - public AbstractContainerMenu createMenu(final int syncId, final Inventory inventory, final Player player) { - return new PortableGridItemContainerMenu(syncId, inventory, diskInventory, grid, energyStorage, slotReference); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridOperations.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridOperations.java deleted file mode 100644 index 8184c3f22..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridOperations.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.platform.common.Platform; - -class PortableGridOperations implements GridOperations { - private final GridOperations delegate; - private final EnergyStorage energyStorage; - - PortableGridOperations(final GridOperations delegate, final EnergyStorage energyStorage) { - this.delegate = delegate; - this.energyStorage = energyStorage; - } - - @Override - public boolean extract(final ResourceKey resource, - final GridExtractMode extractMode, - final InsertableStorage destination) { - if (delegate.extract(resource, extractMode, destination)) { - energyStorage.extract( - Platform.INSTANCE.getConfig().getPortableGrid().getExtractEnergyUsage(), - Action.EXECUTE - ); - return true; - } - return false; - } - - @Override - public boolean insert(final ResourceKey resource, - final GridInsertMode insertMode, - final ExtractableStorage source) { - if (delegate.insert(resource, insertMode, source)) { - energyStorage.extract( - Platform.INSTANCE.getConfig().getPortableGrid().getInsertEnergyUsage(), - Action.EXECUTE - ); - return true; - } - return false; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridStorage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridStorage.java deleted file mode 100644 index aef54033c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridStorage.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.storage.StateTrackedStorage; -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannelImpl; - -class PortableGridStorage { - private final StorageChannel storageChannel; - private final StateTrackedStorage diskStorage; - - PortableGridStorage(final StateTrackedStorage diskStorage) { - this.storageChannel = new StorageChannelImpl(); - this.diskStorage = diskStorage; - this.storageChannel.addSource(diskStorage); - } - - StorageState getState() { - return diskStorage.getState(); - } - - StorageChannel getStorageChannel() { - return storageChannel; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridType.java deleted file mode 100644 index 89bf1fecd..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/PortableGridType.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -public enum PortableGridType { - NORMAL, - CREATIVE -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/package-info.java deleted file mode 100644 index 531db12cd..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/portablegrid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java deleted file mode 100644 index b09397b91..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockContainerMenu.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; - -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractStorageContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageAccessor; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainer; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; - -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.inventory.Slot; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public abstract class AbstractStorageBlockContainerMenu extends AbstractStorageContainerMenu - implements StorageAccessor { - private static final int FILTER_SLOT_X = 8; - private static final int FILTER_SLOT_Y = 20; - - private long stored; - private long capacity; - - protected AbstractStorageBlockContainerMenu(final MenuType type, - final int syncId, - final Player player, - final StorageBlockData storageBlockData, - final ResourceFactory resourceFactory) { - super(type, syncId); - this.stored = storageBlockData.stored(); - this.capacity = storageBlockData.capacity(); - addSlots( - player, - ResourceContainerImpl.createForFilter(resourceFactory, storageBlockData.resourceContainerData()) - ); - } - - protected AbstractStorageBlockContainerMenu(final MenuType type, - final int syncId, - final Player player, - final ResourceContainer resourceContainer, - final StorageConfigurationContainer configContainer) { - super(type, syncId, player, configContainer); - addSlots(player, resourceContainer); - } - - private void addSlots(final Player player, final ResourceContainer resourceContainer) { - for (int i = 0; i < resourceContainer.size(); ++i) { - addSlot(createFilterSlot(resourceContainer, i)); - } - addPlayerInventory(player.getInventory(), 8, 141); - - transferManager.addFilterTransfer(player.getInventory()); - } - - private Slot createFilterSlot(final ResourceContainer resourceContainer, final int i) { - final int x = FILTER_SLOT_X + (18 * i); - return new ResourceSlot( - resourceContainer, - i, - createTranslation("gui", "storage.filter_help"), - x, - FILTER_SLOT_Y, - ResourceSlotType.FILTER - ); - } - - @Override - public double getProgress() { - if (capacity == 0) { - return 0; - } - return (double) getStored() / (double) getCapacity(); - } - - @Override - public long getCapacity() { - return capacity; - } - - @Override - public long getStored() { - return stored; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockScreen.java deleted file mode 100644 index de5599501..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/AbstractStorageBlockScreen.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; - -import com.refinedmods.refinedstorage2.platform.common.storage.AbstractProgressStorageScreen; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -abstract class AbstractStorageBlockScreen extends AbstractProgressStorageScreen { - private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/storage.png"); - - protected AbstractStorageBlockScreen(final AbstractStorageBlockContainerMenu menu, - final Inventory inventory, - final Component title) { - super(menu, inventory, title, 80); - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlock.java deleted file mode 100644 index 3ffaa23f7..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlock.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -public class FluidStorageBlock extends AbstractStorageBlock { - private final FluidStorageType.Variant variant; - - public FluidStorageBlock(final FluidStorageType.Variant variant) { - super( - BlockConstants.PROPERTIES, - new NetworkNodeBlockEntityTicker<>(() -> BlockEntities.INSTANCE.getFluidStorageBlock(variant)) - ); - this.variant = variant; - } - - @Override - public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return new FluidStorageBlockBlockEntity(pos, state, variant); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java deleted file mode 100644 index 3eb701054..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/FluidStorageBlockContainerMenu.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainer; - -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -public class FluidStorageBlockContainerMenu extends AbstractStorageBlockContainerMenu { - public FluidStorageBlockContainerMenu(final int syncId, - final Inventory playerInventory, - final StorageBlockData storageBlockData) { - super( - Menus.INSTANCE.getFluidStorage(), - syncId, - playerInventory.player, - storageBlockData, - PlatformApi.INSTANCE.getFluidResourceFactory() - ); - } - - FluidStorageBlockContainerMenu(final int syncId, - final Player player, - final ResourceContainer resourceContainer, - final StorageConfigurationContainer configContainer) { - super(Menus.INSTANCE.getFluidStorage(), syncId, player, resourceContainer, configContainer); - } - - @Override - public boolean hasCapacity() { - return getCapacity() > 0; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlock.java deleted file mode 100644 index 4e8be0837..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlock.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; -import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; - -public class ItemStorageBlock extends AbstractStorageBlock { - private final ItemStorageType.Variant variant; - - public ItemStorageBlock(final ItemStorageType.Variant variant) { - super( - BlockConstants.PROPERTIES, - new NetworkNodeBlockEntityTicker<>(() -> BlockEntities.INSTANCE.getItemStorageBlock(variant)) - ); - this.variant = variant; - } - - @Override - public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return new ItemStorageBlockBlockEntity(pos, state, variant); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java deleted file mode 100644 index 33993082e..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/ItemStorageBlockContainerMenu.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageConfigurationContainer; - -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -public class ItemStorageBlockContainerMenu extends AbstractStorageBlockContainerMenu { - public ItemStorageBlockContainerMenu(final int syncId, - final Inventory playerInventory, - final StorageBlockData storageBlockData) { - super( - Menus.INSTANCE.getItemStorage(), - syncId, - playerInventory.player, - storageBlockData, - PlatformApi.INSTANCE.getItemResourceFactory() - ); - } - - ItemStorageBlockContainerMenu(final int syncId, - final Player player, - final ResourceContainer resourceContainer, - final StorageConfigurationContainer configContainer) { - super(Menus.INSTANCE.getItemStorage(), syncId, player, resourceContainer, configContainer); - } - - @Override - public boolean hasCapacity() { - return getCapacity() > 0; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/package-info.java deleted file mode 100644 index be2984c49..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storageblock/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.storage.storageblock; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/FluidStorageDiskItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/FluidStorageDiskItem.java deleted file mode 100644 index 2663d7ee0..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/FluidStorageDiskItem.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storagedisk; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.AbstractStorageContainerItem; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceRendering; - -import java.util.Optional; -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class FluidStorageDiskItem extends AbstractStorageContainerItem { - private static final Component CREATIVE_HELP = createTranslation("item", "creative_fluid_storage_disk.help"); - - private final FluidStorageType.Variant variant; - private final Component helpText; - - public FluidStorageDiskItem(final FluidStorageType.Variant variant) { - super( - new Item.Properties().stacksTo(1).fireResistant(), - PlatformApi.INSTANCE.getStorageContainerItemHelper() - ); - this.variant = variant; - this.helpText = getHelpText(variant); - } - - private static Component getHelpText(final FluidStorageType.Variant variant) { - if (variant.getCapacityInBuckets() == null) { - return CREATIVE_HELP; - } - return createTranslation( - "item", - "fluid_storage_disk.help", - AmountFormatting.format(variant.getCapacityInBuckets()) - ); - } - - @Override - protected boolean hasCapacity() { - return variant.hasCapacity(); - } - - @Override - protected String formatAmount(final long amount) { - return FluidResourceRendering.format(amount); - } - - @Override - protected SerializableStorage createStorage(final StorageRepository storageRepository) { - return StorageTypes.FLUID.create(variant.getCapacity(), storageRepository::markAsChanged); - } - - @Override - protected ItemStack createPrimaryDisassemblyByproduct(final int count) { - return new ItemStack(Items.INSTANCE.getStorageHousing(), count); - } - - @Override - @Nullable - protected ItemStack createSecondaryDisassemblyByproduct(final int count) { - if (variant == FluidStorageType.Variant.CREATIVE) { - return null; - } - return new ItemStack(Items.INSTANCE.getFluidStoragePart(variant), count); - } - - @Override - public Optional getTooltipImage(final ItemStack stack) { - return Optional.of(new HelpTooltipComponent(helpText)); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/ItemStorageDiskItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/ItemStorageDiskItem.java deleted file mode 100644 index 2b6fde9e7..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/ItemStorageDiskItem.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage.storagedisk; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.AbstractStorageContainerItem; -import com.refinedmods.refinedstorage2.platform.api.storage.SerializableStorage; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository; -import com.refinedmods.refinedstorage2.platform.api.support.AmountFormatting; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes; - -import java.util.Optional; -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class ItemStorageDiskItem extends AbstractStorageContainerItem { - private static final Component CREATIVE_HELP = createTranslation("item", "creative_storage_disk.help"); - - private final ItemStorageType.Variant variant; - private final Component helpText; - - public ItemStorageDiskItem(final ItemStorageType.Variant variant) { - super( - new Item.Properties().stacksTo(1).fireResistant(), - PlatformApi.INSTANCE.getStorageContainerItemHelper() - ); - this.variant = variant; - this.helpText = variant.getCapacity() == null - ? CREATIVE_HELP - : createTranslation("item", "storage_disk.help", AmountFormatting.format(variant.getCapacity())); - } - - @Override - protected boolean hasCapacity() { - return variant.hasCapacity(); - } - - @Override - protected String formatAmount(final long amount) { - return AmountFormatting.format(amount); - } - - @Override - protected SerializableStorage createStorage(final StorageRepository storageRepository) { - return StorageTypes.ITEM.create(variant.getCapacity(), storageRepository::markAsChanged); - } - - @Override - protected ItemStack createPrimaryDisassemblyByproduct(final int count) { - return new ItemStack(Items.INSTANCE.getStorageHousing(), count); - } - - @Override - @Nullable - protected ItemStack createSecondaryDisassemblyByproduct(final int count) { - if (variant == ItemStorageType.Variant.CREATIVE) { - return null; - } - return new ItemStack(Items.INSTANCE.getItemStoragePart(variant), count); - } - - @Override - public Optional getTooltipImage(final ItemStack stack) { - return Optional.of(new HelpTooltipComponent(helpText)); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/package-info.java deleted file mode 100644 index 7b412880e..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storage/storagedisk/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.storage.storagedisk; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java deleted file mode 100644 index 521a8a8b3..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/CompositeStorageMonitorExtractionStrategy.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.world.entity.player.Player; - -public class CompositeStorageMonitorExtractionStrategy implements StorageMonitorExtractionStrategy { - private final List strategies = new ArrayList<>(); - - public void addStrategy(final StorageMonitorExtractionStrategy strategy) { - strategies.add(strategy); - } - - @Override - public boolean extract(final ResourceKey resource, - final boolean fullStack, - final Player player, - final Actor actor, - final Network network) { - for (final StorageMonitorExtractionStrategy strategy : strategies) { - if (strategy.extract(resource, fullStack, player, actor, network)) { - return true; - } - } - return false; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java deleted file mode 100644 index 8236527d8..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/CompositeStorageMonitorInsertionStrategy.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import net.minecraft.world.item.ItemStack; - -public class CompositeStorageMonitorInsertionStrategy implements StorageMonitorInsertionStrategy { - private final List strategies = new ArrayList<>(); - - public void addStrategy(final StorageMonitorInsertionStrategy strategy) { - strategies.add(strategy); - } - - @Override - public Optional insert( - final ResourceKey configuredResource, - final ItemStack stack, - final Actor actor, - final Network network - ) { - return strategies.stream() - .flatMap(strategy -> strategy.insert(configuredResource, stack, actor, network).stream()) - .findFirst(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java deleted file mode 100644 index 4d941915c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/FluidStorageMonitorExtractionStrategy.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.TransferHelper; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.storage.BucketPlayerInventoryInsertableStorage; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; - -import net.minecraft.world.entity.player.Player; - -public class FluidStorageMonitorExtractionStrategy implements StorageMonitorExtractionStrategy { - @Override - public boolean extract(final ResourceKey resource, - final boolean fullStack, - final Player player, - final Actor actor, - final Network network) { - if (!(resource instanceof FluidResource fluidResource)) { - return false; - } - final BucketPlayerInventoryInsertableStorage target = new BucketPlayerInventoryInsertableStorage( - player.getInventory(), - network.getComponent(StorageNetworkComponent.class), - true - ); - final StorageChannel source = network.getComponent(StorageNetworkComponent.class); - return TransferHelper.transfer( - fluidResource, - Platform.INSTANCE.getBucketAmount(), - actor, - source, - target, - source - ) > 0; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java deleted file mode 100644 index 3929d4a31..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/FluidStorageMonitorInsertionStrategy.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; - -import java.util.Optional; -import javax.annotation.Nullable; - -import net.minecraft.world.item.ItemStack; - -public class FluidStorageMonitorInsertionStrategy implements StorageMonitorInsertionStrategy { - @Override - public Optional insert( - final ResourceKey configuredResource, - final ItemStack stack, - final Actor actor, - final Network network - ) { - if (!(configuredResource instanceof FluidResource configuredFluidResource)) { - return Optional.empty(); - } - final StorageChannel fluidStorageChannel = network.getComponent(StorageNetworkComponent.class); - return Platform.INSTANCE.getContainedFluid(stack) - .map(extracted -> tryInsert(actor, configuredFluidResource, extracted, fluidStorageChannel)) - .map(extracted -> doInsert(actor, extracted, fluidStorageChannel)); - } - - @Nullable - private Platform.ContainedFluid tryInsert(final Actor actor, - final FluidResource configuredResource, - final Platform.ContainedFluid result, - final StorageChannel storageChannel) { - if (!result.fluid().equals(configuredResource)) { - return null; - } - final long insertedSimulated = storageChannel.insert( - result.fluid(), - result.amount(), - Action.SIMULATE, - actor - ); - final boolean insertedSuccessfully = insertedSimulated == result.amount(); - return insertedSuccessfully ? result : null; - } - - private ItemStack doInsert(final Actor actor, - final Platform.ContainedFluid extracted, - final StorageChannel storageChannel) { - storageChannel.insert( - extracted.fluid(), - extracted.amount(), - Action.EXECUTE, - actor - ); - return extracted.remainderContainer(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java deleted file mode 100644 index 6bca4e51f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorExtractionStrategy.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; - -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class ItemStorageMonitorExtractionStrategy implements StorageMonitorExtractionStrategy { - @Override - @SuppressWarnings("deprecation") - public boolean extract(final ResourceKey resource, - final boolean fullStack, - final Player player, - final Actor actor, - final Network network) { - if (!(resource instanceof ItemResource itemResource)) { - return false; - } - final long extracted = network.getComponent(StorageNetworkComponent.class).extract( - itemResource, - fullStack ? itemResource.item().getDefaultMaxStackSize() : 1, - Action.EXECUTE, - actor - ); - if (extracted > 0) { - final ItemStack stack = itemResource.toItemStack(extracted); - if (!player.getInventory().add(stack)) { - player.drop(stack, false); - } - return true; - } - return false; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java deleted file mode 100644 index 63b251f10..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/ItemStorageMonitorInsertionStrategy.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.Network; -import com.refinedmods.refinedstorage2.api.network.storage.StorageNetworkComponent; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; - -import java.util.Optional; - -import net.minecraft.world.item.ItemStack; - -public class ItemStorageMonitorInsertionStrategy implements StorageMonitorInsertionStrategy { - @Override - public Optional insert(final ResourceKey configuredResource, - final ItemStack stack, - final Actor actor, - final Network network) { - if (!(configuredResource instanceof ItemResource configuredItemResource)) { - return Optional.empty(); - } - final ItemResource resource = ItemResource.ofItemStack(stack); - if (!configuredItemResource.equals(resource)) { - return Optional.empty(); - } - final long inserted = network.getComponent(StorageNetworkComponent.class).insert( - resource, - stack.getCount(), - Action.EXECUTE, - actor - ); - final long remainder = stack.getCount() - inserted; - if (remainder > 0) { - return Optional.of(resource.toItemStack(remainder)); - } - return Optional.of(ItemStack.EMPTY); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorContainerMenu.java deleted file mode 100644 index 58f1defc2..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorContainerMenu.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlotType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ServerProperty; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class StorageMonitorContainerMenu extends AbstractResourceContainerMenu { - private static final Component FILTER_HELP = createTranslation("gui", "storage_monitor.filter_help"); - - public StorageMonitorContainerMenu(final int syncId, - final Inventory playerInventory, - final ResourceContainerData resourceContainerData) { - super(Menus.INSTANCE.getStorageMonitor(), syncId); - registerProperty(new ClientProperty<>(PropertyTypes.FUZZY_MODE, false)); - registerProperty(new ClientProperty<>(PropertyTypes.REDSTONE_MODE, RedstoneMode.IGNORE)); - addSlots(playerInventory, ResourceContainerImpl.createForFilter(resourceContainerData)); - } - - StorageMonitorContainerMenu(final int syncId, - final Player player, - final StorageMonitorBlockEntity storageMonitor, - final ResourceContainer resourceContainer) { - super(Menus.INSTANCE.getStorageMonitor(), syncId, player); - registerProperty(new ServerProperty<>( - PropertyTypes.FUZZY_MODE, - storageMonitor::isFuzzyMode, - storageMonitor::setFuzzyMode - )); - registerProperty(new ServerProperty<>( - PropertyTypes.REDSTONE_MODE, - storageMonitor::getRedstoneMode, - storageMonitor::setRedstoneMode - )); - addSlots(player.getInventory(), resourceContainer); - } - - private void addSlots(final Inventory playerInventory, final ResourceContainer resourceContainer) { - addSlot(new ResourceSlot(resourceContainer, 0, FILTER_HELP, 80, 20, ResourceSlotType.FILTER)); - addPlayerInventory(playerInventory, 8, 55); - transferManager.addFilterTransfer(playerInventory); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorScreen.java deleted file mode 100644 index bc81c6f5e..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/StorageMonitorScreen.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.FuzzyModeSideButtonWidget; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public class StorageMonitorScreen extends AbstractBaseScreen { - private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/storage_monitor.png"); - - public StorageMonitorScreen(final StorageMonitorContainerMenu menu, - final Inventory playerInventory, - final Component text) { - super(menu, playerInventory, text); - this.inventoryLabelY = 43; - this.imageWidth = 211; - this.imageHeight = 137; - } - - @Override - protected void init() { - super.init(); - addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); - addSideButton(new FuzzyModeSideButtonWidget( - getMenu().getProperty(PropertyTypes.FUZZY_MODE), - () -> FuzzyModeSideButtonWidget.Type.GENERIC - )); - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/package-info.java deleted file mode 100644 index 84be21a57..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/storagemonitor/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.storagemonitor; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractFilterScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractFilterScreen.java deleted file mode 100644 index f188c0f38..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractFilterScreen.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; - -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public abstract class AbstractFilterScreen extends AbstractBaseScreen { - public static final ResourceLocation TEXTURE = createIdentifier("textures/gui/generic_filter.png"); - - protected AbstractFilterScreen(final T menu, - final Inventory playerInventory, - final Component text) { - super(menu, playerInventory, text); - this.inventoryLabelY = 42; - this.imageWidth = hasUpgrades() ? 210 : 176; - this.imageHeight = 137; - } - - protected boolean hasUpgrades() { - return true; - } - - @Override - protected void init() { - super.init(); - addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockEntityWithDrops.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockEntityWithDrops.java deleted file mode 100644 index 21367032b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockEntityWithDrops.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import net.minecraft.core.NonNullList; -import net.minecraft.world.item.ItemStack; - -@FunctionalInterface -public interface BlockEntityWithDrops { - NonNullList getDrops(); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockItemProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockItemProvider.java deleted file mode 100644 index 3078955b4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/BlockItemProvider.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import net.minecraft.world.item.BlockItem; - -@FunctionalInterface -public interface BlockItemProvider { - T createBlockItem(); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/CableShapeCacheKey.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/CableShapeCacheKey.java deleted file mode 100644 index 10408a62c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/CableShapeCacheKey.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import net.minecraft.world.level.block.state.BlockState; - -import static com.refinedmods.refinedstorage2.platform.common.support.CableBlockSupport.DOWN; -import static com.refinedmods.refinedstorage2.platform.common.support.CableBlockSupport.EAST; -import static com.refinedmods.refinedstorage2.platform.common.support.CableBlockSupport.NORTH; -import static com.refinedmods.refinedstorage2.platform.common.support.CableBlockSupport.SOUTH; -import static com.refinedmods.refinedstorage2.platform.common.support.CableBlockSupport.UP; -import static com.refinedmods.refinedstorage2.platform.common.support.CableBlockSupport.WEST; - -public record CableShapeCacheKey(boolean north, boolean east, boolean south, boolean west, boolean up, boolean down) { - public static CableShapeCacheKey of(final BlockState state) { - return new CableShapeCacheKey( - state.getValue(NORTH), - state.getValue(EAST), - state.getValue(SOUTH), - state.getValue(WEST), - state.getValue(UP), - state.getValue(DOWN) - ); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ClientToServerCommunications.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ClientToServerCommunications.java deleted file mode 100644 index 52a867812..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ClientToServerCommunications.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyType; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; - -import java.util.List; -import java.util.UUID; - -public interface ClientToServerCommunications { - void sendGridExtract(PlatformResourceKey resource, GridExtractMode mode, boolean cursor); - - void sendGridScroll(PlatformResourceKey resource, GridScrollMode mode, int slotIndex); - - void sendGridInsert(GridInsertMode mode, boolean tryAlternatives); - - void sendCraftingGridClear(boolean toPlayerInventory); - - void sendCraftingGridRecipeTransfer(List> recipe); - - void sendPropertyChange(PropertyType type, T value); - - void sendStorageInfoRequest(UUID storageId); - - void sendResourceSlotChange(int slotIndex, boolean tryAlternatives); - - void sendResourceFilterSlotChange(PlatformResourceKey resource, int slotIndex); - - void sendResourceSlotAmountChange(int slotIndex, long amount); - - void sendSingleAmountChange(double amount); - - void sendUseNetworkBoundItem(SlotReference slotReference); - - void sendSecurityCardPermission(PlatformPermission permission, boolean allowed); - - void sendSecurityCardResetPermission(PlatformPermission permission); - - void sendSecurityCardBoundPlayer(UUID playerId); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ColorableBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ColorableBlock.java deleted file mode 100644 index 7bc68f39e..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/ColorableBlock.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockColorMap; - -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.block.Block; - -public interface ColorableBlock, I extends BlockItem> { - BlockColorMap getBlockColorMap(); - - DyeColor getColor(); - - default boolean canAlwaysConnect() { - return getBlockColorMap().isDefaultColor(getColor()); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/PlayerAwareBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/PlayerAwareBlockEntity.java deleted file mode 100644 index 930c4f448..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/PlayerAwareBlockEntity.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import java.util.UUID; - -public interface PlayerAwareBlockEntity { - void setPlacedBy(UUID playerId); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleBlock.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleBlock.java deleted file mode 100644 index 2418a3dbb..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleBlock.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import com.refinedmods.refinedstorage2.platform.common.content.BlockConstants; - -import net.minecraft.world.level.block.Block; - -public final class SimpleBlock extends Block { - public SimpleBlock() { - super(BlockConstants.PROPERTIES); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleItem.java deleted file mode 100644 index 59cb1d3ff..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/SimpleItem.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import net.minecraft.world.item.Item; - -public final class SimpleItem extends Item { - public SimpleItem() { - super(new Item.Properties()); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/TextureIds.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/TextureIds.java deleted file mode 100644 index e0fc1e118..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/TextureIds.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support; - -import net.minecraft.resources.ResourceLocation; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public final class TextureIds { - public static final ResourceLocation ICONS = createIdentifier("textures/icons.png"); - - private TextureIds() { - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/package-info.java deleted file mode 100644 index 4dcade88b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/amount/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.amount; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/MenuOpener.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/MenuOpener.java deleted file mode 100644 index 2582f6571..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/MenuOpener.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.MenuProvider; - -public interface MenuOpener { - void openMenu(ServerPlayer player, MenuProvider menuProvider); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java deleted file mode 100644 index 38d6bf9f8..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeExtendedMenuProvider.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -public interface NetworkNodeExtendedMenuProvider extends ExtendedMenuProvider, NetworkNodeMenuProvider { -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeMenuProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeMenuProvider.java deleted file mode 100644 index e0f1fa2b1..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/NetworkNodeMenuProvider.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -import com.refinedmods.refinedstorage2.platform.api.security.SecurityHelper; -import com.refinedmods.refinedstorage2.platform.api.support.network.InWorldNetworkNodeContainer; -import com.refinedmods.refinedstorage2.platform.common.security.BuiltinPermission; - -import java.util.Set; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.MenuProvider; - -public interface NetworkNodeMenuProvider extends MenuProvider { - Set getContainers(); - - default boolean canOpen(final ServerPlayer player) { - return SecurityHelper.isAllowed(player, BuiltinPermission.OPEN, getContainers()); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/Property.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/Property.java deleted file mode 100644 index d4c0962d6..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/Property.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -import net.minecraft.world.inventory.DataSlot; - -public interface Property { - PropertyType getType(); - - T getValue(); - - DataSlot getDataSlot(); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/PropertyTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/PropertyTypes.java deleted file mode 100644 index f7f227a72..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/PropertyTypes.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -import com.refinedmods.refinedstorage2.api.resource.filter.FilterMode; -import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneMode; -import com.refinedmods.refinedstorage2.platform.common.support.RedstoneModeSettings; -import com.refinedmods.refinedstorage2.platform.common.support.SchedulingModeType; - -import net.minecraft.resources.ResourceLocation; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public final class PropertyTypes { - public static final PropertyType REDSTONE_MODE = new PropertyType<>( - createIdentifier("redstone_mode"), - RedstoneModeSettings::getRedstoneMode, - RedstoneModeSettings::getRedstoneMode - ); - - public static final PropertyType FILTER_MODE = new PropertyType<>( - createIdentifier("filter_mode"), - FilterModeSettings::getFilterMode, - FilterModeSettings::getFilterMode - ); - - public static final PropertyType SCHEDULING_MODE = new PropertyType<>( - createIdentifier("scheduling_mode"), - SchedulingModeType::getId, - SchedulingModeType::getById - ); - - public static final PropertyType FUZZY_MODE = createBooleanProperty(createIdentifier("fuzzy_mode")); - - private PropertyTypes() { - } - - public static PropertyType createBooleanProperty(final ResourceLocation id) { - return new PropertyType<>( - id, - value -> Boolean.TRUE.equals(value) ? 1 : 0, - value -> value == 1 - ); - } - - public static PropertyType createIntegerProperty(final ResourceLocation id) { - return new PropertyType<>( - id, - value -> value, - value -> value - ); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlotType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlotType.java deleted file mode 100644 index d3a4af963..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/ResourceSlotType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -public enum ResourceSlotType { - FILTER, - FILTER_WITH_AMOUNT, - CONTAINER -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/SingleAmountData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/SingleAmountData.java deleted file mode 100644 index 1d2a9389f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/SingleAmountData.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; - -import java.util.Optional; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; - -public record SingleAmountData(Optional slotReference, - double amount, - ResourceContainerData resourceContainerData) { - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ByteBufCodecs.optional(SlotReferenceFactory.STREAM_CODEC), SingleAmountData::slotReference, - ByteBufCodecs.DOUBLE, SingleAmountData::amount, - ResourceContainerData.STREAM_CODEC, SingleAmountData::resourceContainerData, - SingleAmountData::new - ); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/TransferDestination.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/TransferDestination.java deleted file mode 100644 index 5159ab21d..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/TransferDestination.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -import javax.annotation.Nullable; - -import net.minecraft.world.item.ItemStack; - -@FunctionalInterface -public interface TransferDestination { - @Nullable - ItemStack transfer(ItemStack stack); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/package-info.java deleted file mode 100644 index 041f84e48..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/containermenu/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.containermenu; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/package-info.java deleted file mode 100644 index a10e7502b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/direction/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.direction; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/BlockEntityEnergyStorage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/BlockEntityEnergyStorage.java deleted file mode 100644 index b9f79ffff..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/BlockEntityEnergyStorage.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.energy; - -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.energy.AbstractListeningEnergyStorage; - -import net.minecraft.world.level.block.entity.BlockEntity; - -public class BlockEntityEnergyStorage extends AbstractListeningEnergyStorage { - private final BlockEntity blockEntity; - - public BlockEntityEnergyStorage(final EnergyStorage delegate, final BlockEntity blockEntity) { - super(delegate); - this.blockEntity = blockEntity; - } - - @Override - protected void onStoredChanged(final long stored) { - blockEntity.setChanged(); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/CreativeEnergyStorage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/CreativeEnergyStorage.java deleted file mode 100644 index 50563ce2b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/CreativeEnergyStorage.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.energy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; - -public class CreativeEnergyStorage implements EnergyStorage { - public static final EnergyStorage INSTANCE = new CreativeEnergyStorage(); - - private CreativeEnergyStorage() { - } - - @Override - public long getStored() { - return Long.MAX_VALUE; - } - - @Override - public long getCapacity() { - return Long.MAX_VALUE; - } - - @Override - public long receive(final long amount, final Action action) { - return 0; - } - - @Override - public long extract(final long amount, final Action action) { - return amount; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyContainerMenu.java deleted file mode 100644 index 16569962a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/EnergyContainerMenu.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.energy; - -@FunctionalInterface -public interface EnergyContainerMenu { - EnergyInfo getEnergyInfo(); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemEnergyStorage.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemEnergyStorage.java deleted file mode 100644 index d095707b3..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/ItemEnergyStorage.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.energy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.api.network.impl.energy.AbstractListeningEnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.content.DataComponents; - -import net.minecraft.world.item.ItemStack; - -public class ItemEnergyStorage extends AbstractListeningEnergyStorage { - private final ItemStack stack; - - public ItemEnergyStorage(final ItemStack stack, final EnergyStorage delegate) { - super(delegate); - this.stack = stack; - final Long stored = stack.get(DataComponents.INSTANCE.getEnergy()); - if (stored != null && stored > 0) { - delegate.receive(stored, Action.EXECUTE); - } - } - - @Override - protected void onStoredChanged(final long stored) { - stack.set(DataComponents.INSTANCE.getEnergy(), stored); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/package-info.java deleted file mode 100644 index 5b378d7b4..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.energy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java deleted file mode 100644 index de140b737..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/AbstractSchedulingNetworkNodeContainerBlockEntity.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network; - -import com.refinedmods.refinedstorage2.api.network.impl.node.AbstractNetworkNode; -import com.refinedmods.refinedstorage2.api.network.node.task.TaskExecutor; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode; -import com.refinedmods.refinedstorage2.platform.common.support.SchedulingMode; -import com.refinedmods.refinedstorage2.platform.common.support.SchedulingModeType; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.NetworkNodeExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerData; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations; - -import java.util.List; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamEncoder; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -public abstract class AbstractSchedulingNetworkNodeContainerBlockEntity - extends AbstractUpgradeableNetworkNodeContainerBlockEntity - implements NetworkNodeExtendedMenuProvider { - protected final FilterWithFuzzyMode filter; - private final SchedulingMode schedulingMode; - - protected AbstractSchedulingNetworkNodeContainerBlockEntity( - final BlockEntityType type, - final BlockPos pos, - final BlockState state, - final T node, - final UpgradeDestinations destination - ) { - super(type, pos, state, node, destination); - this.schedulingMode = new SchedulingMode<>(this::setChanged, this::setTaskExecutor); - this.filter = FilterWithFuzzyMode.createAndListenForFilters( - ResourceContainerImpl.createForFilter(), - this::setChanged, - this::setFilters - ); - } - - @Override - public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { - super.writeConfiguration(tag, provider); - schedulingMode.writeToTag(tag); - filter.save(tag, provider); - } - - @Override - public void readConfiguration(final CompoundTag tag, final HolderLookup.Provider provider) { - super.readConfiguration(tag, provider); - schedulingMode.load(tag); - filter.load(tag, provider); - } - - public void setSchedulingModeType(final SchedulingModeType type) { - schedulingMode.setType(type); - } - - public SchedulingModeType getSchedulingModeType() { - return schedulingMode.getType(); - } - - public boolean isFuzzyMode() { - return filter.isFuzzyMode(); - } - - public void setFuzzyMode(final boolean fuzzyMode) { - filter.setFuzzyMode(fuzzyMode); - if (level instanceof ServerLevel serverLevel) { - initialize(serverLevel); - } - } - - @Override - public ResourceContainerData getMenuData() { - return ResourceContainerData.of(filter.getFilterContainer()); - } - - @Override - public StreamEncoder getMenuCodec() { - return ResourceContainerData.STREAM_CODEC; - } - - protected abstract void setTaskExecutor(TaskExecutor taskExecutor); - - protected abstract void setFilters(List filters); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceProvider.java deleted file mode 100644 index 0bbb50266..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/InventorySlotReferenceProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network.bounditem; - -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceProvider; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -public class InventorySlotReferenceProvider implements SlotReferenceProvider { - @Override - public List find(final Player player, final Set validItems) { - final List result = new ArrayList<>(); - for (int i = 0; i < player.getInventory().getContainerSize(); ++i) { - final ItemStack slot = player.getInventory().getItem(i); - if (!validItems.contains(slot.getItem())) { - continue; - } - result.add(new InventorySlotReference(i)); - } - return result; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/package-info.java deleted file mode 100644 index 3b9e35000..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/bounditem/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.network.bounditem; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/component/PlatformStorageNetworkComponent.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/component/PlatformStorageNetworkComponent.java deleted file mode 100644 index 879384f6d..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/component/PlatformStorageNetworkComponent.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.network.component; - -import com.refinedmods.refinedstorage2.api.network.impl.storage.StorageNetworkComponentImpl; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.platform.api.storage.channel.FuzzyStorageChannel; -import com.refinedmods.refinedstorage2.platform.api.support.resource.list.FuzzyResourceList; -import com.refinedmods.refinedstorage2.platform.common.support.resource.list.FuzzyResourceListImpl; - -import java.util.Collection; - -public class PlatformStorageNetworkComponent extends StorageNetworkComponentImpl implements FuzzyStorageChannel { - private final FuzzyResourceList fuzzyResourceList; - - public PlatformStorageNetworkComponent() { - this(new FuzzyResourceListImpl(new ResourceListImpl())); - } - - private PlatformStorageNetworkComponent(final FuzzyResourceList fuzzyResourceList) { - super(fuzzyResourceList); - this.fuzzyResourceList = fuzzyResourceList; - } - - @Override - public Collection getFuzzy(final ResourceKey resource) { - return fuzzyResourceList.getFuzzy(resource); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/component/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/component/package-info.java deleted file mode 100644 index 4f36cc79b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/component/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.network.component; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/package-info.java deleted file mode 100644 index 57bc26862..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/network/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.network; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/package-info.java deleted file mode 100644 index 8a1a70a3c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketContext.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketContext.java deleted file mode 100644 index 0bccaf3b6..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketContext.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet; - -import net.minecraft.world.entity.player.Player; - -@FunctionalInterface -public interface PacketContext { - Player getPlayer(); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketHandler.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketHandler.java deleted file mode 100644 index e0d9c7b7c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/PacketHandler.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet; - -@FunctionalInterface -public interface PacketHandler { - void handle(T packet, PacketContext ctx); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java deleted file mode 100644 index 18263739d..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/CraftingGridRecipeTransferPacket.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public record CraftingGridRecipeTransferPacket(List> recipe) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>( - createIdentifier("crafting_grid_recipe_transfer") - ); - public static final StreamCodec STREAM_CODEC = - StreamCodec.composite( - ByteBufCodecs.collection(ArrayList::new, - ByteBufCodecs.collection(ArrayList::new, ResourceCodecs.ITEM_STREAM_CODEC)), - CraftingGridRecipeTransferPacket::recipe, - CraftingGridRecipeTransferPacket::new - ); - - public static void handle(final CraftingGridRecipeTransferPacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof CraftingGridContainerMenu craftingGridContainerMenu) { - craftingGridContainerMenu.transferRecipe(packet.recipe()); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridExtractPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridExtractPacket.java deleted file mode 100644 index 120dcc4d2..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridExtractPacket.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.PacketUtil.enumStreamCodec; - -public record GridExtractPacket( - PlatformResourceKey resource, - GridExtractMode mode, - boolean cursor -) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_extract")); - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ResourceCodecs.STREAM_CODEC, GridExtractPacket::resource, - enumStreamCodec(GridExtractMode.values()), GridExtractPacket::mode, - ByteBufCodecs.BOOL, GridExtractPacket::cursor, - GridExtractPacket::new - ); - - public static void handle(final GridExtractPacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof GridExtractionStrategy strategy) { - strategy.onExtract(packet.resource, packet.mode, packet.cursor); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridInsertPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridInsertPacket.java deleted file mode 100644 index 2516e63fe..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridInsertPacket.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.PacketUtil.enumStreamCodec; - -public record GridInsertPacket(GridInsertMode mode, boolean tryAlternatives) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_insert")); - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - enumStreamCodec(GridInsertMode.values()), GridInsertPacket::mode, - ByteBufCodecs.BOOL, GridInsertPacket::tryAlternatives, - GridInsertPacket::new - ); - - public static void handle(final GridInsertPacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof GridInsertionStrategy strategy) { - strategy.onInsert(packet.mode, packet.tryAlternatives); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridScrollPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridScrollPacket.java deleted file mode 100644 index 818b72d4a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/GridScrollPacket.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.PacketUtil.enumStreamCodec; - -public record GridScrollPacket( - PlatformResourceKey resource, - GridScrollMode mode, - int slotIndex -) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_scroll")); - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ResourceCodecs.STREAM_CODEC, GridScrollPacket::resource, - enumStreamCodec(GridScrollMode.values()), GridScrollPacket::mode, - ByteBufCodecs.INT, GridScrollPacket::slotIndex, - GridScrollPacket::new - ); - - public static void handle(final GridScrollPacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof GridScrollingStrategy strategy) { - strategy.onScroll(packet.resource, packet.mode, packet.slotIndex); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java deleted file mode 100644 index 284dc05c1..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/ResourceFilterSlotChangePacket.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static java.util.Objects.requireNonNull; - -public record ResourceFilterSlotChangePacket(int slotIndex, PlatformResourceKey resource) - implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>( - createIdentifier("resource_filter_slot_change") - ); - public static final StreamCodec STREAM_CODEC = StreamCodec - .composite( - ByteBufCodecs.INT, ResourceFilterSlotChangePacket::slotIndex, - ResourceCodecs.STREAM_CODEC, ResourceFilterSlotChangePacket::resource, - ResourceFilterSlotChangePacket::new - ); - - public static void handle(final ResourceFilterSlotChangePacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof AbstractResourceContainerMenu containerMenu) { - containerMenu.handleResourceFilterSlotUpdate(packet.slotIndex, requireNonNull(packet.resource)); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java deleted file mode 100644 index 62933cb23..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardPermissionPacket.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.common.security.AbstractSecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public record SecurityCardPermissionPacket(PlatformPermission permission, boolean allowed) - implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>( - createIdentifier("security_card_permission") - ); - public static final StreamCodec STREAM_CODEC = StreamCodec - .composite( - PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), SecurityCardPermissionPacket::permission, - ByteBufCodecs.BOOL, SecurityCardPermissionPacket::allowed, - SecurityCardPermissionPacket::new - ); - - public static void handle(final SecurityCardPermissionPacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { - securityCardContainerMenu.setPermission(packet.permission, packet.allowed); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java deleted file mode 100644 index d903e0a4f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/SecurityCardResetPermissionPacket.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.security.PlatformPermission; -import com.refinedmods.refinedstorage2.platform.common.security.AbstractSecurityCardContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public record SecurityCardResetPermissionPacket(PlatformPermission permission) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>( - createIdentifier("security_card_reset_permission") - ); - public static final StreamCodec STREAM_CODEC = - StreamCodec.composite( - PlatformApi.INSTANCE.getPermissionRegistry().streamCodec(), SecurityCardResetPermissionPacket::permission, - SecurityCardResetPermissionPacket::new - ); - - public static void handle(final SecurityCardResetPermissionPacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof AbstractSecurityCardContainerMenu securityCardContainerMenu) { - securityCardContainerMenu.resetPermissionServer(packet.permission); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/StorageInfoRequestPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/StorageInfoRequestPacket.java deleted file mode 100644 index 932d4c185..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/StorageInfoRequestPacket.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.storage.StorageInfo; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage2.platform.common.support.packet.s2c.S2CPackets; - -import java.util.UUID; - -import net.minecraft.core.UUIDUtil; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public record StorageInfoRequestPacket(UUID storageId) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>( - createIdentifier("storage_info_request") - ); - public static final StreamCodec STREAM_CODEC = StreamCodec - .composite( - UUIDUtil.STREAM_CODEC, StorageInfoRequestPacket::storageId, - StorageInfoRequestPacket::new - ); - - public static void handle(final StorageInfoRequestPacket packet, final PacketContext ctx) { - final Player player = ctx.getPlayer(); - final StorageInfo info = PlatformApi.INSTANCE - .getStorageRepository(player.getCommandSenderWorld()) - .getInfo(packet.storageId()); - S2CPackets.sendStorageInfoResponse((ServerPlayer) player, packet.storageId, info); - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java deleted file mode 100644 index 09fffeb06..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/UseNetworkBoundItemPacket.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.platform.api.PlatformApi; -import com.refinedmods.refinedstorage2.platform.api.support.energy.AbstractNetworkBoundEnergyItem; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public record UseNetworkBoundItemPacket(SlotReference slotReference) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>( - createIdentifier("use_network_bound_item") - ); - public static final StreamCodec STREAM_CODEC = StreamCodec - .composite( - SlotReferenceFactory.STREAM_CODEC, UseNetworkBoundItemPacket::slotReference, - UseNetworkBoundItemPacket::new - ); - - public static void handle(final UseNetworkBoundItemPacket packet, final PacketContext ctx) { - final Player player = ctx.getPlayer(); - packet.slotReference.resolve(player).ifPresent(stack -> { - if (!(stack.getItem() instanceof AbstractNetworkBoundEnergyItem networkBoundItem)) { - return; - } - final NetworkBoundItemSession sess = PlatformApi.INSTANCE.getNetworkBoundItemHelper().openSession( - stack, - (ServerPlayer) player, - packet.slotReference - ); - networkBoundItem.use((ServerPlayer) player, packet.slotReference, sess); - }); - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/package-info.java deleted file mode 100644 index 569d41490..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/c2s/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.packet.c2s; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/package-info.java deleted file mode 100644 index 71ad17d0f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.packet; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridClearPacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridClearPacket.java deleted file mode 100644 index eb4c3c2fb..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridClearPacket.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; - -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.world.inventory.AbstractContainerMenu; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public class GridClearPacket implements CustomPacketPayload { - public static final GridClearPacket INSTANCE = new GridClearPacket(); - public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_clear")); - public static final StreamCodec STREAM_CODEC = StreamCodec.unit(INSTANCE); - - private GridClearPacket() { - } - - public static void handle(final PacketContext ctx) { - final AbstractContainerMenu menu = ctx.getPlayer().containerMenu; - if (menu instanceof AbstractGridContainerMenu grid) { - grid.onClear(); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridUpdatePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridUpdatePacket.java deleted file mode 100644 index 13cf3c546..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/GridUpdatePacket.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; - -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.storage.StorageCodecs; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; - -import java.util.Optional; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public record GridUpdatePacket( - PlatformResourceKey resource, - long amount, - Optional trackedResource -) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>(createIdentifier("grid_update")); - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ResourceCodecs.STREAM_CODEC, GridUpdatePacket::resource, - ByteBufCodecs.VAR_LONG, GridUpdatePacket::amount, - StorageCodecs.TRACKED_RESOURCE_OPTIONAL_STREAM_CODEC, GridUpdatePacket::trackedResource, - GridUpdatePacket::new - ); - - public static void handle(final GridUpdatePacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof AbstractGridContainerMenu containerMenu) { - containerMenu.onResourceUpdate(packet.resource, packet.amount, packet.trackedResource.orElse(null)); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java deleted file mode 100644 index c18c6c66b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/ResourceSlotUpdatePacket.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.packet.PacketContext; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceCodecs; - -import java.util.Optional; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; - -public record ResourceSlotUpdatePacket( - int slotIndex, - Optional resourceAmount -) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>( - createIdentifier("resource_slot_update") - ); - public static final StreamCodec STREAM_CODEC = - StreamCodec.composite( - ByteBufCodecs.INT, ResourceSlotUpdatePacket::slotIndex, - ByteBufCodecs.optional(ResourceCodecs.AMOUNT_STREAM_CODEC), ResourceSlotUpdatePacket::resourceAmount, - ResourceSlotUpdatePacket::new - ); - - public static void handle(final ResourceSlotUpdatePacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof AbstractResourceContainerMenu containerMenu) { - containerMenu.handleResourceSlotUpdate(packet.slotIndex, packet.resourceAmount.orElse(null)); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/package-info.java deleted file mode 100644 index e6b686a98..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/packet/s2c/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.packet.s2c; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/package-info.java deleted file mode 100644 index 24e76b4ea..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/registry/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.registry; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/package-info.java deleted file mode 100644 index 37dd8d3ee..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/render/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.render; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResource.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResource.java deleted file mode 100644 index 0cfa90343..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResource.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.FuzzyModeNormalizer; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; - -import net.minecraft.core.component.DataComponentPatch; -import net.minecraft.world.level.material.Fluid; -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public record FluidResource(Fluid fluid, DataComponentPatch components) - implements PlatformResourceKey, FuzzyModeNormalizer { - public FluidResource(final Fluid fluid) { - this(fluid, DataComponentPatch.EMPTY); - } - - public FluidResource(final Fluid fluid, final DataComponentPatch components) { - this.fluid = CoreValidations.validateNotNull(fluid, "Fluid must not be null"); - this.components = CoreValidations.validateNotNull(components, "Components must not be null"); - } - - @Override - public ResourceKey normalize() { - return new FluidResource(fluid); - } - - @Override - public long getInterfaceExportLimit() { - return ResourceTypes.FLUID.getInterfaceExportLimit(); - } - - @Override - public ResourceType getResourceType() { - return ResourceTypes.FLUID; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceFactory.java deleted file mode 100644 index a6e829864..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceFactory.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.Platform; - -import java.util.Optional; - -import net.minecraft.world.item.ItemStack; - -public class FluidResourceFactory implements ResourceFactory { - @Override - public Optional create(final ItemStack stack) { - return Platform.INSTANCE.getContainedFluid(stack).map(result -> new ResourceAmount( - result.fluid(), - Platform.INSTANCE.getBucketAmount() - )); - } - - @Override - public boolean isValid(final ResourceKey resource) { - return resource instanceof FluidResource; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceType.java deleted file mode 100644 index ddd195912..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/FluidResourceType.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperationsImpl; -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.support.resource.AbstractResourceType; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.grid.view.FluidGridResource; -import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; - -import java.util.Optional; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -class FluidResourceType extends AbstractResourceType { - FluidResourceType() { - super( - "FLUID", - createTranslation("misc", "resource_type.fluid"), - TextureIds.ICONS, - 16, - 128 - ); - } - - @Override - public Optional toGridResource(final ResourceAmount resourceAmount) { - return Platform.INSTANCE.getFluidGridResourceFactory().apply(resourceAmount); - } - - @Override - public boolean isGridResourceBelonging(final GridResource gridResource) { - return gridResource instanceof FluidGridResource; - } - - @Override - public long normalizeAmount(final double amount) { - return (long) (amount * Platform.INSTANCE.getBucketAmount()); - } - - @Override - public double getDisplayAmount(final long amount) { - return amount / (double) Platform.INSTANCE.getBucketAmount(); - } - - @Override - public long getInterfaceExportLimit() { - return Platform.INSTANCE.getBucketAmount() * 16; - } - - @Override - public GridOperations createGridOperations(final StorageChannel storageChannel, final Actor actor) { - return new GridOperationsImpl( - storageChannel, - actor, - fluidResource -> Long.MAX_VALUE, - Platform.INSTANCE.getBucketAmount() - ); - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public MapCodec getMapCodec() { - return (MapCodec) ResourceCodecs.FLUID_MAP_CODEC; - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public Codec getCodec() { - return (Codec) ResourceCodecs.FLUID_CODEC; - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public StreamCodec getStreamCodec() { - return (StreamCodec) ResourceCodecs.FLUID_STREAM_CODEC; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceFactory.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceFactory.java deleted file mode 100644 index 56143b94a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceFactory.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory; - -import java.util.Optional; - -import net.minecraft.world.item.ItemStack; - -public class ItemResourceFactory implements ResourceFactory { - @Override - public Optional create(final ItemStack stack) { - if (stack.isEmpty()) { - return Optional.empty(); - } - return Optional.of(new ResourceAmount(ItemResource.ofItemStack(stack), stack.getCount())); - } - - @Override - public boolean isValid(final ResourceKey resource) { - return resource instanceof ItemResource; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceType.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceType.java deleted file mode 100644 index 8a7cc2c2a..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ItemResourceType.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperationsImpl; -import com.refinedmods.refinedstorage2.api.grid.view.GridResource; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannel; -import com.refinedmods.refinedstorage2.platform.api.support.resource.AbstractResourceType; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.grid.view.ItemGridResource; -import com.refinedmods.refinedstorage2.platform.common.support.TextureIds; - -import java.util.Optional; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -class ItemResourceType extends AbstractResourceType { - ItemResourceType() { - super( - "ITEM", - createTranslation("misc", "resource_type.item"), - TextureIds.ICONS, - 0, - 128 - ); - } - - @Override - public Optional toGridResource(final ResourceAmount resourceAmount) { - return Platform.INSTANCE.getItemGridResourceFactory().apply(resourceAmount); - } - - @Override - public boolean isGridResourceBelonging(final GridResource gridResource) { - return gridResource instanceof ItemGridResource; - } - - @Override - public long normalizeAmount(final double amount) { - return (long) amount; - } - - @Override - public double getDisplayAmount(final long amount) { - return amount; - } - - @Override - public long getInterfaceExportLimit() { - return 64; - } - - @Override - public GridOperations createGridOperations(final StorageChannel storageChannel, final Actor actor) { - return new GridOperationsImpl( - storageChannel, - actor, - resource -> resource instanceof ItemResource itemResource - ? itemResource.item().getDefaultMaxStackSize() - : 0, - 1 - ); - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public MapCodec getMapCodec() { - return (MapCodec) ResourceCodecs.ITEM_MAP_CODEC; - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public Codec getCodec() { - return (Codec) ResourceCodecs.ITEM_CODEC; - } - - @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public StreamCodec getStreamCodec() { - return (StreamCodec) ResourceCodecs.ITEM_STREAM_CODEC; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceTypes.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceTypes.java deleted file mode 100644 index 2b572aa99..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/ResourceTypes.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceType; - -public final class ResourceTypes { - public static final ResourceType ITEM = new ItemResourceType(); - public static final ResourceType FLUID = new FluidResourceType(); - - private ResourceTypes() { - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/package-info.java deleted file mode 100644 index 1491d8830..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/list/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.resource.list; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/package-info.java deleted file mode 100644 index c030f3f9f..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/resource/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.resource; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSizeListener.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSizeListener.java deleted file mode 100644 index 275a8bcbf..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/ScreenSizeListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.stretching; - -@FunctionalInterface -public interface ScreenSizeListener { - void onScreenReady(int playerInventoryY); -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/package-info.java deleted file mode 100644 index c18a46a5b..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/stretching/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.stretching; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/package-info.java deleted file mode 100644 index 3389a4614..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/tooltip/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.tooltip; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractYesNoSideButtonWidget.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractYesNoSideButtonWidget.java deleted file mode 100644 index b04f3faea..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/AbstractYesNoSideButtonWidget.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.support.widget; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ClientProperty; - -import net.minecraft.network.chat.MutableComponent; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.NO; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.YES; - -public abstract class AbstractYesNoSideButtonWidget extends AbstractSideButtonWidget { - protected final ClientProperty property; - private final MutableComponent title; - - protected AbstractYesNoSideButtonWidget(final ClientProperty property, final MutableComponent title) { - super(createPressAction(property)); - this.property = property; - this.title = title; - } - - private static OnPress createPressAction(final ClientProperty property) { - return btn -> property.setValue(!property.getValue()); - } - - @Override - protected MutableComponent getTitle() { - return title; - } - - @Override - protected MutableComponent getSubText() { - return Boolean.TRUE.equals(property.getValue()) ? YES : NO; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/package-info.java deleted file mode 100644 index 9d1bfa6d8..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/widget/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.support.widget; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java deleted file mode 100644 index f2dc6bfd5..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/BuiltinUpgradeDestinationsImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; - -import com.refinedmods.refinedstorage2.platform.api.upgrade.BuiltinUpgradeDestinations; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeDestination; - -public class BuiltinUpgradeDestinationsImpl implements BuiltinUpgradeDestinations { - @Override - public UpgradeDestination getImporter() { - return UpgradeDestinations.IMPORTER; - } - - @Override - public UpgradeDestination getExporter() { - return UpgradeDestinations.EXPORTER; - } - - @Override - public UpgradeDestination getDestructor() { - return UpgradeDestinations.DESTRUCTOR; - } - - @Override - public UpgradeDestination getConstructor() { - return UpgradeDestinations.CONSTRUCTOR; - } - - @Override - public UpgradeDestination getWirelessTransmitter() { - return UpgradeDestinations.WIRELESS_TRANSMITTER; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RangeUpgradeItem.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RangeUpgradeItem.java deleted file mode 100644 index 0ca852b3c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RangeUpgradeItem.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; - -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry; -import com.refinedmods.refinedstorage2.platform.common.Platform; - -import java.util.Optional; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class RangeUpgradeItem extends AbstractUpgradeItem { - private static final Component HELP = createTranslation("item", "range_upgrade.help"); - private static final Component CREATIVE_HELP = createTranslation("item", "creative_range_upgrade.help"); - - private final boolean creative; - - public RangeUpgradeItem(final UpgradeRegistry registry, final boolean creative) { - super(new Item.Properties(), registry); - this.creative = creative; - } - - @Override - public long getEnergyUsage() { - if (creative) { - return Platform.INSTANCE.getConfig().getUpgrade().getCreativeRangeUpgradeEnergyUsage(); - } - return Platform.INSTANCE.getConfig().getUpgrade().getRangeUpgradeEnergyUsage(); - } - - @Override - public Optional getTooltipImage(final ItemStack stack) { - return Optional.of(new HelpTooltipComponent(creative ? CREATIVE_HELP : HELP)); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeContainerMenu.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeContainerMenu.java deleted file mode 100644 index 0f689fd83..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeContainerMenu.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; - -import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference; -import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceContainer; -import com.refinedmods.refinedstorage2.platform.common.content.Menus; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.SingleAmountData; - -import java.util.function.Consumer; -import javax.annotation.Nullable; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class RegulatorUpgradeContainerMenu extends AbstractSingleAmountContainerMenu { - private static final Component FILTER_HELP = createTranslation("gui", "regulator_upgrade.filter_help"); - - @Nullable - private Consumer amountAcceptor; - - public RegulatorUpgradeContainerMenu(final int syncId, - final Inventory playerInventory, - final SingleAmountData singleAmountData) { - super(Menus.INSTANCE.getRegulatorUpgrade(), syncId, playerInventory, singleAmountData, FILTER_HELP); - } - - RegulatorUpgradeContainerMenu(final int syncId, - final Player player, - final ResourceContainer resourceContainer, - final Consumer amountAcceptor, - final SlotReference slotReference) { - super( - Menus.INSTANCE.getRegulatorUpgrade(), - syncId, - player, - resourceContainer, - FILTER_HELP, - slotReference - ); - this.amountAcceptor = amountAcceptor; - } - - @Override - public void changeAmountOnServer(final double newAmount) { - if (amountAcceptor == null) { - return; - } - amountAcceptor.accept(newAmount); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeScreen.java deleted file mode 100644 index eb92ce2d7..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/RegulatorUpgradeScreen.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.upgrade; - -import com.refinedmods.refinedstorage2.platform.common.support.amount.AbstractSingleAmountScreen; - -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; - -public class RegulatorUpgradeScreen extends AbstractSingleAmountScreen { - public RegulatorUpgradeScreen(final RegulatorUpgradeContainerMenu menu, - final Inventory playerInventory, - final Component text) { - super(menu, playerInventory, text, menu.getAmount(), 1); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/package-info.java deleted file mode 100644 index 0d95fe01c..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/upgrade/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.upgrade; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/package-info.java deleted file mode 100644 index dd9e09398..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/util/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.util; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java deleted file mode 100644 index d61f68a1e..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/BaseWirelessTransmitterRangeModifier.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; - -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage2.platform.common.Platform; - -public class BaseWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { - @Override - public int modifyRange(final UpgradeState upgradeState, final int range) { - return Platform.INSTANCE.getConfig().getWirelessTransmitter().getBaseRange() + range; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java deleted file mode 100644 index 19d8ee641..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/CreativeRangeUpgradeWirelessTransmitterRangeModifier.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; - -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage2.platform.common.content.Items; - -public class CreativeRangeUpgradeWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { - @Override - public int modifyRange(final UpgradeState upgradeState, final int range) { - if (upgradeState.has(Items.INSTANCE.getCreativeRangeUpgrade())) { - return Integer.MAX_VALUE; - } - return range; - } - - @Override - public int getPriority() { - return Integer.MAX_VALUE; - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java deleted file mode 100644 index 7fbb9ae87..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/RangeUpgradeWirelessTransmitterRangeModifier.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; - -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.Items; - -public class RangeUpgradeWirelessTransmitterRangeModifier implements WirelessTransmitterRangeModifier { - @Override - public int modifyRange(final UpgradeState upgradeState, final int range) { - final int amountOfRangeUpgrades = upgradeState.getAmount(Items.INSTANCE.getRangeUpgrade()); - final int rangePerUpgrade = Platform.INSTANCE.getConfig().getUpgrade().getRangeUpgradeRange(); - return range + (amountOfRangeUpgrades * rangePerUpgrade); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java deleted file mode 100644 index ab60a85dc..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/WirelessTransmitterScreen.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; - -import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.PropertyTypes; -import com.refinedmods.refinedstorage2.platform.common.support.widget.RedstoneModeSideButtonWidget; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; - -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslation; - -public class WirelessTransmitterScreen extends AbstractBaseScreen { - private static final ResourceLocation TEXTURE = createIdentifier("textures/gui/wireless_transmitter.png"); - - public WirelessTransmitterScreen(final WirelessTransmitterContainerMenu containerMenu, - final Inventory inventory, - final Component title) { - super(containerMenu, inventory, title); - this.inventoryLabelY = 43; - this.imageWidth = 211; - this.imageHeight = 137; - } - - @Override - protected void init() { - super.init(); - addSideButton(new RedstoneModeSideButtonWidget(getMenu().getProperty(PropertyTypes.REDSTONE_MODE))); - } - - @Override - protected ResourceLocation getTexture() { - return TEXTURE; - } - - @Override - protected void renderLabels(final GuiGraphics graphics, final int mouseX, final int mouseY) { - super.renderLabels(graphics, mouseX, mouseY); - graphics.drawString( - font, - createTranslation("gui", "wireless_transmitter.distance", getMenu().getRange()), - 28, - 25, - 4210752, - false - ); - } -} diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/package-info.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/package-info.java deleted file mode 100644 index 131caf83d..000000000 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/wirelesstransmitter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/1024b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/1024b_fluid_storage_block.json deleted file mode 100644 index 383f010a8..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/1024b_fluid_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/1024b_fluid_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/16k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/16k_storage_block.json deleted file mode 100644 index 01835651f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/16k_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/16k_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/1k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/1k_storage_block.json deleted file mode 100644 index 713b8da0c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/1k_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/1k_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/256b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/256b_fluid_storage_block.json deleted file mode 100644 index 874b8e52c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/256b_fluid_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/256b_fluid_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/4096b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/4096b_fluid_storage_block.json deleted file mode 100644 index 60f4de268..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/4096b_fluid_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/4096b_fluid_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/4k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/4k_storage_block.json deleted file mode 100644 index 024ffbfd2..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/4k_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/4k_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/64b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/64b_fluid_storage_block.json deleted file mode 100644 index 9581cec55..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/64b_fluid_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/64b_fluid_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/64k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/64k_storage_block.json deleted file mode 100644 index ccc7729f7..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/64k_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/64k_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_fluid_storage_block.json deleted file mode 100644 index 05f117777..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_fluid_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/creative_fluid_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_portable_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_portable_grid.json deleted file mode 100644 index da5b59a5a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_portable_grid.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/portable_grid" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_storage_block.json deleted file mode 100644 index 8f137e74f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/creative_storage_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/creative_storage_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/disk_drive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/disk_drive.json deleted file mode 100644 index 20fe7047b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/disk_drive.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/disk_drive" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/interface.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/interface.json deleted file mode 100644 index 6ea166513..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/interface.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=true": { - "model": "refinedstorage2:block/interface_active" - }, - "active=false": { - "model": "refinedstorage2:block/interface_inactive" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/machine_casing.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/machine_casing.json deleted file mode 100644 index 2c0840ed0..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/machine_casing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/machine_casing" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/portable_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/portable_grid.json deleted file mode 100644 index da5b59a5a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/portable_grid.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/portable_grid" - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_copper_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_copper_block.json deleted file mode 100644 index a659cb284..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_copper_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/quartz_enriched_copper_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_iron_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_iron_block.json deleted file mode 100644 index a8d649494..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/quartz_enriched_iron_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "refinedstorage2:block/quartz_enriched_iron_block" - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/storage_monitor.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/storage_monitor.json deleted file mode 100644 index 01d572529..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/blockstates/storage_monitor.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "variants": { - "direction=down_east": { - "model": "refinedstorage2:block/storage_monitor", - "x": 90, - "y": -90 - }, - "direction=down_north": { - "model": "refinedstorage2:block/storage_monitor", - "x": 90 - }, - "direction=down_south": { - "model": "refinedstorage2:block/storage_monitor", - "x": 90, - "y": 180 - }, - "direction=down_west": { - "model": "refinedstorage2:block/storage_monitor", - "x": 90, - "y": 90 - }, - "direction=east": { - "model": "refinedstorage2:block/storage_monitor", - "y": 90 - }, - "direction=north": { - "model": "refinedstorage2:block/storage_monitor" - }, - "direction=south": { - "model": "refinedstorage2:block/storage_monitor", - "y": 180 - }, - "direction=up_east": { - "model": "refinedstorage2:block/storage_monitor", - "x": -90, - "y": -90 - }, - "direction=up_north": { - "model": "refinedstorage2:block/storage_monitor", - "x": -90, - "y": 180 - }, - "direction=up_south": { - "model": "refinedstorage2:block/storage_monitor", - "x": -90 - }, - "direction=up_west": { - "model": "refinedstorage2:block/storage_monitor", - "x": -90, - "y": 90 - }, - "direction=west": { - "model": "refinedstorage2:block/storage_monitor", - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/de_de.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/de_de.json deleted file mode 100644 index 4f45cee84..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/de_de.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Kabel", - "block.refinedstorage2.quartz_enriched_iron_block": "Quarz angereichertes Eisenblock", - "block.refinedstorage2.disk_drive": "Laufwerk", - "block.refinedstorage2.machine_casing": "Maschinengehäuse", - "block.refinedstorage2.grid": "Konsole", - "block.refinedstorage2.crafting_grid": "Herstellungskonsole", - "block.refinedstorage2.controller": "Kontrollblock", - "block.refinedstorage2.creative_controller": "Kreativer Kontrollblock", - "block.refinedstorage2.1k_storage_block": "1k Speicherblock", - "block.refinedstorage2.4k_storage_block": "4k Speicherblock", - "block.refinedstorage2.16k_storage_block": "16k Speicherblock", - "block.refinedstorage2.64k_storage_block": "64k Speicherblock", - "block.refinedstorage2.creative_storage_block": "Kreativer Speicherblock", - "block.refinedstorage2.64b_fluid_storage_block": "64B Flüssigspeicherblock", - "block.refinedstorage2.256b_fluid_storage_block": "256B Flüssigspeicherblock", - "block.refinedstorage2.1024b_fluid_storage_block": "1024B Flüssigspeicherblock", - "block.refinedstorage2.4096b_fluid_storage_block": "4096B Flüssigspeicherblock", - "block.refinedstorage2.creative_fluid_storage_block": "Kreativer Flüssigspeicherblock", - "block.refinedstorage2.importer": "Importierer", - "block.refinedstorage2.exporter": "Exportierer", - "block.refinedstorage2.interface": "Schnittstelle", - "block.refinedstorage2.external_storage": "Externer Speicher", - "block.refinedstorage2.detector": "Detektor", - "block.refinedstorage2.constructor": "Konstruktor", - "block.refinedstorage2.destructor": "Destruktor", - "block.refinedstorage2.wireless_transmitter": "Funksender", - "block.refinedstorage2.storage_monitor": "Speichermonitor", - "block.refinedstorage2.network_receiver": "Netzwerkempfänger", - "block.refinedstorage2.network_transmitter": "Netzwerksender", - "block.refinedstorage2.portable_grid": "Mobile Konsole", - "block.refinedstorage2.creative_portable_grid": "Mobile Kreative Konsole", - "block.refinedstorage2.security_manager": "Sicherheits-Manager", - "block.refinedstorage2.security_manager.help": "Während aktivem Betrieb ist das Netzwerk geschützt und es werden alle Zugriffe blockiert. Füge Sicherheits-Karten hinzu, um spezifische Zugriffe für Spieler zuzulassen.", - "block.refinedstorage2.relay": "Relais", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "Falls dieses Gerät inaktiv ist, kann das Speichernetzwerk dieses Gerät nicht als Energiequelle nutzen.", - "gui.refinedstorage2.disk_drive.disks": "Speicherplatten", - "gui.refinedstorage2.storage.redstone_mode_help": "Falls dieses Gerät inaktiv ist, ist der enthaltene Speicher nicht mehr über das Speichernetzwerk zugänglich.", - "gui.refinedstorage2.storage.filter_help": "Die Ressourcen, die in diesem Speicher erlaubt sind oder nicht, je nachdem, ob sich das Gerät in der Erlaubnisliste oder in der Sperrliste befindet.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Ohne konfigurierte Filter werden keine Ressourcen in diesem Speicher akzeptiert.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Erlaube nur Ressourcen in diesen Speicher, die in den Filtern konfiguriert sind.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Erlaube nur Ressourcen in diesen Speicher, die in den Filtern konfiguriert sind.", - "gui.refinedstorage2.grid.sorting.direction": "Sortierrichtung", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Aufsteigend", - "gui.refinedstorage2.grid.sorting.direction.descending": "Absteigend", - "gui.refinedstorage2.grid.sorting.type": "Sortierart", - "gui.refinedstorage2.grid.sorting.type.quantity": "Quantität", - "gui.refinedstorage2.grid.sorting.type.name": "Name", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Zuletzt geändert", - "gui.refinedstorage2.grid.auto_selected": "Automatisch ausgewählt", - "gui.refinedstorage2.grid.auto_selected.help": "Gibt an, ob das Suchfeld beim Öffnen der Konsole automatisch ausgewählt werden soll.", - "gui.refinedstorage2.grid.synchronizer": "Synchronisierungsmodus", - "gui.refinedstorage2.grid.synchronizer.off": "Aus", - "gui.refinedstorage2.grid.synchronizer.off.help": "Suchfeldtext nicht synchronisieren.", - "gui.refinedstorage2.grid.resource_type": "Ressourcentyp", - "gui.refinedstorage2.grid.resource_type.all": "Alle", - "gui.refinedstorage2.grid.resource_type.help": "Spezifische Ressourcentypen filtern.", - "gui.refinedstorage2.crafting_grid.move.network": "Items ins Netzwerk verschieben", - "gui.refinedstorage2.crafting_grid.move.inventory": "Items ins Inventar verschieben", - "gui.refinedstorage2.screen_size": "Bildschirmgröße", - "gui.refinedstorage2.screen_size.stretch": "Strecken", - "gui.refinedstorage2.screen_size.small": "Klein", - "gui.refinedstorage2.screen_size.medium": "Normal", - "gui.refinedstorage2.screen_size.large": "Groß", - "gui.refinedstorage2.screen_size.extra_large": "Sehr groß", - "gui.refinedstorage2.detector.mode": "Modus", - "gui.refinedstorage2.detector.mode.under": "Redstone-Signal ausgeben, falls unter der Menge", - "gui.refinedstorage2.detector.mode.equal": "Redstone-Signal ausgeben, falls auf der Menge", - "gui.refinedstorage2.detector.mode.above": "Redstone-Signal ausgeben, falls über der Menge", - "gui.refinedstorage2.detector.filter_help": "Die Ressource, die im Speichernetzwerk erkannt werden sollte.", - "gui.refinedstorage2.destructor.pickup_items": "Items aufheben, statt abzubauen", - "gui.refinedstorage2.destructor.filter_help": "Die Blöcke, die in diesem Speicher zerstört werden sollen oder nicht, je nachdem, ob sich das Gerät in der Erlaubnisliste oder in der Sperrliste befindet.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Erlaube nur Blöcke in das Speichernetzwerk, die in den Filtern konfiguriert sind.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Erlaube keine Blöcke in das Speichernetzwerk, die in den Filtern konfiguriert sind.", - "gui.refinedstorage2.constructor.drop_items": "Items fallenlassen, anstatt Blöcke zu platzieren", - "gui.refinedstorage2.constructor.filter_help": "Die Ressourcen, die ins Speichernetzwerk platziert werden sollen.", - "gui.refinedstorage2.interface.filter_help": "Die Ressourcen, die ins Speichernetzwerk exportiert werden sollen.", - "gui.refinedstorage2.exporter.filter_help": "Die Ressourcen, die vom Speichernetzwerk exportiert werden sollen.", - "gui.refinedstorage2.importer.filter_help": "Die Ressourcen, die aus dem Zielinventar importiert werden können.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Erlaube nur Ressourcen in das Speichernetzwerk, die in den Filtern konfiguriert sind.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Erlaube keine Ressourcen in das Speichernetzwerk, die in den Filtern konfiguriert sind.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d Block(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "Die anzuzeigende Ressource.", - "gui.refinedstorage2.redstone_mode": "Redstone-Modus", - "gui.refinedstorage2.redstone_mode.ignore": "Ignorieren", - "gui.refinedstorage2.redstone_mode.ignore.help": "Dieses Gerät ist immer aktiv, unabhängig von Redstone-Signal.", - "gui.refinedstorage2.redstone_mode.high": "Hoch", - "gui.refinedstorage2.redstone_mode.high.help": "Dieses Gerät ist nur mit einem Redstone-Signal aktiv.", - "gui.refinedstorage2.redstone_mode.low": "Niedrig", - "gui.refinedstorage2.redstone_mode.low.help": "Dieses Gerät ist nur ohne Redstone-Signal aktiv.", - "gui.refinedstorage2.scheduling_mode": "Planungsmodus", - "gui.refinedstorage2.scheduling_mode.default": "Standard", - "gui.refinedstorage2.scheduling_mode.default.help": "Den ersten verfügbaren Filter verwenden.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Rundlaufverfahren", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Verwenden Sie jeden Filter nacheinander.", - "gui.refinedstorage2.scheduling_mode.random": "Zufällig", - "gui.refinedstorage2.scheduling_mode.random.help": "Benutze einen zufälligen Filter.", - "gui.refinedstorage2.priority": "Priorität", - "gui.refinedstorage2.priority.storage_help": "Die Reihenfolge, in der das Speichernetzwerk Ressourcen einfügen oder extrahieren soll, das höchste zuerst.", - "gui.refinedstorage2.amount": "Anzahl", - "gui.refinedstorage2.amount.reset": "Zurücksetzen", - "gui.refinedstorage2.amount.set": "Setzen", - "gui.refinedstorage2.filter_mode": "Filtermodus", - "gui.refinedstorage2.filter_mode.allow": "Erlaubnisliste", - "gui.refinedstorage2.filter_mode.block": "Sperrliste", - "gui.refinedstorage2.fuzzy_mode": "Unscharfer Modus", - "gui.refinedstorage2.fuzzy_mode.on": "An", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Passen Sie die Filter exakt auf die Erlaubnis- oder Sperrliste an.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Passen Sie den Filter exakt an.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Passen Sie die Filter beim Extrahieren aus dem Speichernetzwerk genau an.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Passen Sie die Filter beim Extrahieren aus der Quelle genau an.", - "gui.refinedstorage2.fuzzy_mode.off": "Aus", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Passen Sie die Filter für die Erlaubnisliste oder die Sperrliste an, ohne NBT-Tags zu vergleichen.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Passen Sie den Filter an, ohne NBT-Tags zu vergleichen.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Passen Sie die Filter beim Extrahieren aus dem Speichernetzwerk an, ohne NBT-Tags zu vergleichen.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Passen Sie die Filter an, wenn Sie aus der Quelle extrahieren, ohne NBT-Tags zu vergleichen.", - "gui.refinedstorage2.access_mode": "Zugriffsmodus", - "gui.refinedstorage2.access_mode.insert_extract": "Importieren und exportieren", - "gui.refinedstorage2.access_mode.insert_extract.help": "Das Speichernetzwerk kann von diesem Speicher importieren oder exportieren.", - "gui.refinedstorage2.access_mode.insert": "Nur importieren", - "gui.refinedstorage2.access_mode.insert.help": "Das Speichernetzwerk kann nur in diesen Speicher importieren. Enthaltene Ressourcen werden weiterhin in der Konsole sichtbar sein.", - "gui.refinedstorage2.access_mode.extract": "Nur exportieren", - "gui.refinedstorage2.access_mode.extract.help": "Das Speichernetzwerk kann nur von diesem Speicher extrahieren.", - "gui.refinedstorage2.void_excess": "Überschüssige Ressourcen löschen", - "gui.refinedstorage2.void_excess.help": "Wenn der überschüssige Modus eingeschaltet ist und die Speicherung voll ist, akzeptiert er weiterhin Ressourcen, löscht sie jedoch.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Der überschüssige Modus funktioniert nur, wenn der Speicher im Erlaubnisliste Modus ist.", - "gui.refinedstorage2.upgrade_slot": "Leerer Upgrade-Slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Leerer Filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Linksklick für", - "gui.refinedstorage2.filter_slot.right_click_for": "Rechtsklick für", - "gui.refinedstorage2.filter_slot.click_to_clear": "Klicke zum Löschen", - "gui.refinedstorage2.regulator_upgrade.filter_help": "Die Ressource, die im Ziel reguliert werden sollte.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inaktiv", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Fehlende Netzwerkkarte", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d Block(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Unerreichbar", - "gui.refinedstorage2.security_card.permission.reset": "Zurücksetzen", - "gui.refinedstorage2.security_card.permission.modified": "Modifiziert", - "gui.refinedstorage2.security_manager.redstone_mode_help": "Wenn dieses Gerät inaktiv ist, wird das Netzwerk nicht geschützt.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot für eine Standard-Sicherheitskarte.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Fügen Sie diesem Slot eine Standard-Sicherheitskarte hinzu, um Berechtigungen für jeden Spieler ohne Sicherheitskarte festzulegen. Standardmäßig werden alle Aktionen verweigert.", - "gui.refinedstorage2.relay.filter_help": "Ressourcen, die vom Eingabenetzwerk dem Ausgabenetz ausgesetzt werden sollen, wenn das Relais nicht im Durchlaufmodus ist.", - "gui.refinedstorage2.relay.pass_through": "Durchlaufen", - "gui.refinedstorage2.relay.pass_through.help": "Ob dieses Gerät das gesamte Eingangsnetzsignal so durchlaufen soll, wie es ist. Schalten Sie dies aus, um Komponenten selektiv dem Ausgangsnetz anzuzeigen.", - "gui.refinedstorage2.relay.pass_energy": "Energie weitergeben", - "gui.refinedstorage2.relay.pass_energy.help": "Gibt an, ob dieses Gerät den Energiepuffer vom Eingangsnetz an das Ausgangsnetz übergeben soll.", - "gui.refinedstorage2.relay.pass_storage": "Speicher weitergeben", - "gui.refinedstorage2.relay.pass_storage.help": "Gibt an, ob dieses Gerät den Speicher aus dem Eingangsnetzwerk an das Ausgangsnetz übergeben soll.", - "gui.refinedstorage2.relay.pass_security": "Sicherheit weitergeben", - "gui.refinedstorage2.relay.pass_security.help": "Gibt an, ob dieses Gerät die Sicherheitseinstellungen vom Eingangsnetzwerk an das Ausgangsnetz übergeben soll.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Stellen Sie nur Ressourcen aus dem Eingabenetzwerk dem Ausgabenetzwerk aus, die in den Filtern konfiguriert sind.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Stellen Sie keine Ressourcen aus dem Eingabenetzwerk dem Ausgabenetzwerk aus, die in den Filtern konfiguriert sind.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Stellt das Speichernetzwerk mit Energie zur Verfügung. Mehrere sind in einem einzigen Speichernetzwerk erlaubt.", - "item.refinedstorage2.creative_controller.help": "Stellt dem Speichernetzwerk eine unendliche Energiequelle zur Verfügung.", - "item.refinedstorage2.disk_drive.help": "Akzeptiert Speicherplatten, um dem Speichernetz Speicherplatz zur Verfügung zu stellen.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Ermöglicht die Interaktion mit dem Speichernetzwerk.", - "item.refinedstorage2.crafting_grid.help": "Ermöglicht die Interaktion mit dem Speichernetzwerk, mit Herstellungsfähigkeiten.", - "item.refinedstorage2.importer.help": "Importiert Ressourcen von einer externen Quelle in das Speichernetzwerk.", - "item.refinedstorage2.exporter.help": "Exportiert Ressourcen aus dem Speichernetzwerk an ein externes Ziel.", - "item.refinedstorage2.interface.help": "Funktioniert als die Kombination von Importierer und Exportierer.", - "item.refinedstorage2.external_storage.help": "Stellt dem Speichernetzwerk Speicher von einer externen Quelle zur Verfügung.", - "item.refinedstorage2.detector.help": "Sendet ein Redstone Signal, wenn das Speichernetzwerk eine Ressource enthält, die gleich über oder unter einer bestimmten Menge ist.", - "item.refinedstorage2.constructor.help": "Platziert Blöcke aus dem Speichernetzwerk in der Welt.", - "item.refinedstorage2.destructor.help": "Zerstört Blöcke aus der Welt und setzt sie in das Speichernetzwerk.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Quarz angereichertes Eisen", - "item.refinedstorage2.processor_binding": "Prozessor Rohmaterial", - "item.refinedstorage2.silicon": "Silikon", - "item.refinedstorage2.raw_basic_processor": "Basisrohprozessor", - "item.refinedstorage2.raw_improved_processor": "Verbesserter Rohprozessor", - "item.refinedstorage2.raw_advanced_processor": "Fortschrittlicher Rohprozessor", - "item.refinedstorage2.basic_processor": "Basisprozessor", - "item.refinedstorage2.improved_processor": "Verbesserter Prozessor", - "item.refinedstorage2.advanced_processor": "Fortschrittlicher Prozessor", - "item.refinedstorage2.1k_storage_part": "1k Speicherkern", - "item.refinedstorage2.4k_storage_part": "4k Speicherkern", - "item.refinedstorage2.16k_storage_part": "16k Speicherkern", - "item.refinedstorage2.64k_storage_part": "64k Speicherkern", - "item.refinedstorage2.1k_storage_disk": "1k Speicherplatte", - "item.refinedstorage2.4k_storage_disk": "4k Speicherplatte", - "item.refinedstorage2.16k_storage_disk": "16k Speicherplatte", - "item.refinedstorage2.64k_storage_disk": "64k Speicherplatte", - "item.refinedstorage2.creative_storage_disk": "Kreative Speicherplatte", - "item.refinedstorage2.64b_fluid_storage_part": "64B Flüssigspeicherkern", - "item.refinedstorage2.256b_fluid_storage_part": "256B Flüssigspeicherkern", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Flüssigspeicherkern", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Flüssigspeicherkern", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Flüssigspeicherplatte", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Flüssigspeicherplatte", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Flüssigspeicherplatte", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Flüssigspeicherplatte", - "item.refinedstorage2.creative_fluid_storage_disk": "Kreative Flüssigspeicherplatte", - "item.refinedstorage2.storage_housing": "Speichergehäuse", - "item.refinedstorage2.construction_core": "Konstruktionskern", - "item.refinedstorage2.destruction_core": "Zerstörungskern", - "item.refinedstorage2.wrench": "Schraubenschlüssel", - "item.refinedstorage2.wrench.helper": "Verwende es, um Blöcke zu drehen oder drücke SHIFT und baue Refined Storage Blöcke ab.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Geschwindigkeitsupgrade", - "item.refinedstorage2.stack_upgrade": "Stapelupgrade", - "item.refinedstorage2.silk_touch_upgrade": "Behutsamkeitsupgrade", - "item.refinedstorage2.fortune_upgrade.1": "Glück I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Glück II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Glück III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In einem Exportierer wird nur dann exportiert, wenn der Betrag im Ziel geringer als im Upgrade konfiguriert ist. In einem Importierer wird nur importiert, wenn der Betrag im Ziel mehr als im Upgrade konfiguriert ist. Benutzen Sie das Item zur Konfiguration.", - "item.refinedstorage2.range_upgrade": "Reichweitenupgrade", - "item.refinedstorage2.creative_range_upgrade": "Kreativer Reichweitenupgrade", - "item.refinedstorage2.wireless_grid": "Drahtlose Konsole", - "item.refinedstorage2.creative_wireless_grid": "Kreative drahtlose Konsole", - "item.refinedstorage2.wireless_transmitter.help": "Stellt drahtlosen Netzwerkzugang für Items wie die drahtlose Konsole zur Verfügung. Mehrere sind in einem Bereich für eine breitere Abdeckung erlaubt.", - "item.refinedstorage2.network_item.unbound": "Ungebunden.", - "item.refinedstorage2.network_item.unbound.help": "Auf irgendeinem Speichernetzwerk verwenden, um es zu verbinden.", - "item.refinedstorage2.network_item.bound_to": "Verbunden zu %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "Es gibt mehr als ein %s in deinem Inventar.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "Es gibt keine %s in deinem Inventar.", - "item.refinedstorage2.configuration_card": "Konfigurationskarte", - "item.refinedstorage2.configuration_card.empty": "Leer.", - "item.refinedstorage2.configuration_card.configured": "Enthält Konfiguration für %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Konfiguration für %s kopiert.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Konfiguration geleert.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Konfigurationskarte kann nicht auf andere Gerätetypen angewendet werden. Sie ist für %s konfiguriert.", - "item.refinedstorage2.configuration_card.applied_configuration": "Konfiguration angewandt.", - "item.refinedstorage2.configuration_card.empty_help": "Benutzen auf einem Speichernetzwerkgerät während Sie schleichen um die Konfigurationen und Upgrades auf die Karte zu kopieren.", - "item.refinedstorage2.configuration_card.configured_help": "Benutzen auf dem Ziel Speichernetzwerk während Sie Schleichen um die Konfigurationen und Upgrades zu übertragen. Zum Leeren beim Schleichen verwenden.", - "item.refinedstorage2.network_card": "Netzwerkkarte", - "item.refinedstorage2.network_card.unbound_help": "Verwende beim Schleichen auf einem Netzwerk-Empfänger.", - "item.refinedstorage2.network_card.unbound": "Ungebunden.", - "item.refinedstorage2.network_card.bound_help": "Einfügen in einen Netzwerksender. Benutzen beim Schleichen um die Verbindung zu löschen.", - "item.refinedstorage2.network_card.bound": "Verbunden zu %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Sicherheitskarte", - "item.refinedstorage2.security_card.cleared_configuration": "Konfiguration gelöscht.", - "item.refinedstorage2.security_card.unbound": "Nicht zugewiesen.", - "item.refinedstorage2.security_card.unbound.help": "Rechtsklick zum Konfigurieren und Zuweisen an den aktuellen Spieler.", - "item.refinedstorage2.security_card.bound": "Zugewiesen an %s.", - "item.refinedstorage2.security_card.bound.help": "Rechtsklick zum Konfigurieren. Benutze während Schleichen, um die Konfiguration und Zuweisung zu löschen.", - "item.refinedstorage2.fallback_security_card": "Standard-Sicherheitskarte", - "item.refinedstorage2.fallback_security_card.help": "Funktioniert als Standard, wenn keine passende Sicherheitskarte für einen Spieler gefunden wurde. Rechtsklick zum Konfigurieren. Benutze während Schleichen, um die Konfiguration zu löschen.", - "misc.refinedstorage2.stored": "Gespeichert: %s", - "misc.refinedstorage2.stored_with_capacity": "Gespeichert: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d Gesamt", - "misc.refinedstorage2.last_modified.just_now": "Zuletzt geändert von %s", - "misc.refinedstorage2.last_modified.second": "Zuletzt vor %d Sekunde von %s geändert", - "misc.refinedstorage2.last_modified.seconds": "Zuletzt vor %d Sekunden von %s geändert", - "misc.refinedstorage2.last_modified.minute": "Zuletzt vor %d Minute von %s geändert", - "misc.refinedstorage2.last_modified.minutes": "Zuletzt vor %d Minuten von %s geändert", - "misc.refinedstorage2.last_modified.hour": "Zuletzt vor %d Stunde von %s geändert", - "misc.refinedstorage2.last_modified.hours": "Zuletzt vor %d Stunden von %s geändert", - "misc.refinedstorage2.last_modified.day": "Zuletzt vor %d Tag von %s geändert", - "misc.refinedstorage2.last_modified.days": "Zuletzt vor %d Tagen von %s geändert", - "misc.refinedstorage2.last_modified.week": "Zuletzt vor %d Woche von %s geändert", - "misc.refinedstorage2.last_modified.weeks": "Zuletzt vor %d Wochen von %s geändert", - "misc.refinedstorage2.last_modified.year": "Zuletzt vor %d Jahr von %s geändert", - "misc.refinedstorage2.last_modified.years": "Zuletzt vor %d Jahren von %s geändert", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Flüssigkeit", - "misc.refinedstorage2.press_shift_for_help": "Drücke SHIFT für Hilfe", - "misc.refinedstorage2.no_permission": "Kein Zugriff", - "misc.refinedstorage2.no_permission.open": "Sie sind nicht berechtigt, die %s zu öffnen.", - "misc.refinedstorage2.no_permission.insert": "Sie haben keine Berechtigung zum Einfügen.", - "misc.refinedstorage2.no_permission.extract": "Sie haben keine Berechtigung zum Extrahieren.", - "misc.refinedstorage2.no_permission.build.place": "Sie sind nicht berechtigt, hier %s zu platzieren.", - "misc.refinedstorage2.no_permission.build.break": "Du hast keine Berechtigung die %s zu brechen.", - "misc.refinedstorage2.no_permission.build.rotate": "Sie haben keine Berechtigung die %s zu drehen.", - "misc.refinedstorage2.no_permission.build.dismantle": "Sie haben keine Berechtigung die %s abzubauen.", - "key.refinedstorage2.focus_search_bar": "Suchleiste Selektieren", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Werkbank in der Konsole zum Netzwerk leeren", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Werkbank in der Konsole zum Inventar leeren", - "key.refinedstorage2.open_wireless_grid": "Drahtlose Konsole öffnen", - "refinedstorage2.subtitle.wrench": "Schraubenschlüssel benutzt", - "permission.refinedstorage2.insert": "Einfügen", - "permission.refinedstorage2.insert.description": "Gibt an, ob der Spieler Ressourcen in ein Netzwerk einfügen kann.", - "permission.refinedstorage2.extract": "Extrahieren", - "permission.refinedstorage2.extract.description": "Gibt an, ob der Spieler Ressourcen aus einem Netzwerk extrahieren kann.", - "permission.refinedstorage2.autocrafting": "Automatisches Herstellen", - "permission.refinedstorage2.autocrafting.description": "Ob der Spieler einen Herstellungsauftrag starten, abbrechen oder sehen kann.", - "permission.refinedstorage2.open": "Öffnen", - "permission.refinedstorage2.open.description": "Gibt an, ob der Player GUIs des Netzwerkgeräts öffnen kann.", - "permission.refinedstorage2.build": "Bauen", - "permission.refinedstorage2.build.description": "Gibt an, ob der Player Netzwerkgeräte hinzufügen oder entfernen kann.", - "permission.refinedstorage2.security": "Sicherheit", - "permission.refinedstorage2.security.description": "Ob der Spieler die Sicherheitsoptionen für ein Netzwerk verwalten kann.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Flüssiges Scrollen", - "text.autoconfig.refinedstorage2.option.screenSize": "Bildschirmgröße", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximale Anzahl von Zeilen, wenn Bildschirmgröße gestreckt ist", - "text.autoconfig.refinedstorage2.option.grid": "Konsole", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Große Schriftart", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Sortierung verhindern während SHIFT gedrückt ist", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detaillierte Kurzinfo", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Suchabfrage merken", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Autoselektieres Suchfeld", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronisator", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Ressourcentyp", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sortierrichtung", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sortierart", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Herstellungskonsole", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Werkbank Schließverhalten", - "text.autoconfig.refinedstorage2.option.controller": "Kontrollblock", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energiekapazität", - "text.autoconfig.refinedstorage2.option.cable": "Kabel", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.diskDrive": "Laufwerk", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energieverbrauch pro Festplatte", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Speicherblock", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1k Energieverbrauch", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4k Energieverbrauch", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16k Energieverbrauch", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64k Energieverbrauch", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Kreativer Energieverbrauch", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Flüssigspeicherblock", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B Energieverbrauch", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B Energieverbrauch", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B Energieverbrauch", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B Energieverbrauch", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Kreativer Energieverbrauch", - "text.autoconfig.refinedstorage2.option.importer": "Importierer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.exporter": "Exportierer", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.detector": "Detektor", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.constructor": "Konstruktor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.destructor": "Destruktor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Energieverbrauch von Geschwindigkeitsupgrade", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Energieverbrauch vom Stapelupgrade", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Energieverbrauch vom Glück 1 Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Energieverbrauch vom Glück 2 Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Energieverbrauch vom Glück 3 Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Energieverbrauch vom Behutsamkeitsupgrade", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Energieverbrauch vom Regulator Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Energieverbrauch vom Reichweitenupgrade", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Energieverbrauch vom Kreativen Reichweitenupgrade", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Reichweite vom Reichweitenupgrade", - "text.autoconfig.refinedstorage2.option.iface": "Schnittstelle", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.externalStorage": "Externer Speicher", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Drahtlose Konsole", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energiekapazität", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Energieverbrauch beim Öffnen", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Energieverbrauch beim Importieren", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Energieverbrauch beim Exportieren", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Funksender", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Basisreichweite", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Speichermonitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Netzwerkempfänger", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Netzwerksender", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.portableGrid": "Mobile Konsole", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energiekapazität", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Energieverbrauch beim Öffnen", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Energieverbrauch beim Importieren", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Energieverbrauch beim Exportieren", - "text.autoconfig.refinedstorage2.option.securityCard": "Sicherheitskarte", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Standard-Sicherheitskarte", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.securityManager": "Sicherheits-Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energieverbrauch", - "text.autoconfig.refinedstorage2.option.relay": "Relais", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Eingabenetzwerk Energienutzung", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Ausgangsnetzwerk Energieverbrauch (wenn nicht im Durchlauf-Modus)", - "advancements.refinedstorage2.root.description": "Nutzen Sie einen oder mehrere Kontrollblöcke in einem Speichernetzwerk, um das Netzwerk mit Energie zu versorgen", - "advancements.refinedstorage2.connecting": "Verbinden", - "advancements.refinedstorage2.connecting.description": "Benutze Kabel um Geräte miteinander zu verbinden, oder platziere Geräte nebeneinander", - "advancements.refinedstorage2.drives": "Festplatten", - "advancements.refinedstorage2.drives.description": "Erstellen Sie ein Laufwerk, um Ihre Speicherplatten einsetzen zu können", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Items speichern", - "advancements.refinedstorage2.storing_items.description": "Erstelle eine Speicherplatte und stecke sie in dein Laufwerk", - "advancements.refinedstorage2.viewing_your_storage": "Ihren Speicher anzeigen", - "advancements.refinedstorage2.viewing_your_storage.description": "Stelle eine Konsole her, um mit deinem Speicher zu interagieren", - "advancements.refinedstorage2.upgrading_your_grid": "Konsole verbessern", - "advancements.refinedstorage2.upgrading_your_grid.description": "Verbessere deine Konsole zu einem Handwerksraster, um eine Werkbank zu erhalten", - "advancements.refinedstorage2.storing_fluids": "Flüssigkeiten speichern", - "advancements.refinedstorage2.storing_fluids.description": "Erstelle eine Flüssigspeicherplatte und stecke sie in dein Laufwerk", - "advancements.refinedstorage2.importing": "Importieren", - "advancements.refinedstorage2.importing.description": "Holen Sie sich Ressourcen in das Speichernetzwerk mit einem Importierer", - "advancements.refinedstorage2.exporting": "Exportieren", - "advancements.refinedstorage2.exporting.description": "Holen Sie Ressourcen aus dem Speichernetzwerk mit einem Exportierer", - "advancements.refinedstorage2.upgrading": "Verbessern", - "advancements.refinedstorage2.upgrading.description": "Bau ein Upgrade um verschiedene Geräte zu verbessern", - "advancements.refinedstorage2.interface_to_the_world": "Schnittstelle zur Welt", - "advancements.refinedstorage2.interface_to_the_world.description": "Exportieren und Importieren von Items gleichzeitig mit einer Schnittstelle", - "advancements.refinedstorage2.storing_externally": "Extern speichern", - "advancements.refinedstorage2.storing_externally.description": "Verwenden Sie einen externen Speicher um dem Netzwerk Speicher von einem externen Block wie einer Truhe zur Verfügung zu stellen", - "advancements.refinedstorage2.detecting": "Erkennung", - "advancements.refinedstorage2.detecting.description": "Nutzen Sie Redstone um die, in einem Netzwerk gespeicherten, Ressourcen zu überprüfen", - "advancements.refinedstorage2.construction": "Konstruktion", - "advancements.refinedstorage2.construction.description": "Erhalte Blöcke aus dem Speichernetzwerk in die Welt mit einem Konstruktor", - "advancements.refinedstorage2.destruction": "Zerstörung", - "advancements.refinedstorage2.destruction.description": "Erhalte Blöcke aus der Welt in das Speichernetzwerk mit einem Destruktor", - "advancements.refinedstorage2.wireless": "Drahtlos", - "advancements.refinedstorage2.wireless.description": "Greifen Sie drahtlos auf Ihre Ressourcen mit einer drahtlosen Konsole zu", - "advancements.refinedstorage2.better_than_a_barrel": "Besser als ein Fass", - "advancements.refinedstorage2.better_than_a_barrel.description": "Stelle einen Speichermonitor her, um Ressourcen in einem Speichernetzwerk anzuzeigen, zu importieren oder zu exportieren", - "advancements.refinedstorage2.no_cables_required": "Keine Kabel erforderlich", - "advancements.refinedstorage2.no_cables_required.description": "Fügen Sie Ihrem Speichernetzwerk zusätzliche Komponenten hinzu, ohne Kabel zu verwenden, indem Sie einen Netzwerkübermittler, Netzwerkempfänger und Netzwerkkarte verwenden", - "advancements.refinedstorage2.portable_storage": "Tragbarer Speicher", - "advancements.refinedstorage2.portable_storage.description": "Erstelle eine mobile Konsole um auf den Inhalt von Speicherplatten zuzugreifen, ohne ein Speichernetzwerk zu benötigen", - "advancements.refinedstorage2.security": "Sicherheit", - "advancements.refinedstorage2.security.description": "Sichern Sie Ihr Speichernetzwerk mit einem Security-Manager und einer Sicherheitskarte", - "advancements.refinedstorage2.conditional_connecting": "Bedingte Verbindung", - "advancements.refinedstorage2.conditional_connecting.description": "Schalten Sie ganze Abschnitte eines Speichernetzwerks ein oder aus und erstellen Sie neue Zweige Ihres Netzwerks mit einem Relais" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json deleted file mode 100644 index 33e2cc97c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/en_us.json +++ /dev/null @@ -1,473 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Cable", - "block.refinedstorage2.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", - "block.refinedstorage2.quartz_enriched_copper_block": "Block of Quartz Enriched Copper", - "block.refinedstorage2.disk_drive": "Disk Drive", - "block.refinedstorage2.machine_casing": "Machine Casing", - "block.refinedstorage2.grid": "Grid", - "block.refinedstorage2.crafting_grid": "Crafting Grid", - "block.refinedstorage2.controller": "Controller", - "block.refinedstorage2.creative_controller": "Creative Controller", - "block.refinedstorage2.1k_storage_block": "1K Storage Block", - "block.refinedstorage2.4k_storage_block": "4K Storage Block", - "block.refinedstorage2.16k_storage_block": "16K Storage Block", - "block.refinedstorage2.64k_storage_block": "64K Storage Block", - "block.refinedstorage2.creative_storage_block": "Creative Storage Block", - "block.refinedstorage2.64b_fluid_storage_block": "64B Fluid Storage Block", - "block.refinedstorage2.256b_fluid_storage_block": "256B Fluid Storage Block", - "block.refinedstorage2.1024b_fluid_storage_block": "1024B Fluid Storage Block", - "block.refinedstorage2.4096b_fluid_storage_block": "4096B Fluid Storage Block", - "block.refinedstorage2.creative_fluid_storage_block": "Creative Fluid Storage Block", - "block.refinedstorage2.importer": "Importer", - "block.refinedstorage2.exporter": "Exporter", - "block.refinedstorage2.interface": "Interface", - "block.refinedstorage2.external_storage": "External Storage", - "block.refinedstorage2.detector": "Detector", - "block.refinedstorage2.constructor": "Constructor", - "block.refinedstorage2.destructor": "Destructor", - "block.refinedstorage2.wireless_transmitter": "Wireless Transmitter", - "block.refinedstorage2.storage_monitor": "Storage Monitor", - "block.refinedstorage2.network_receiver": "Network Receiver", - "block.refinedstorage2.network_transmitter": "Network Transmitter", - "block.refinedstorage2.portable_grid": "Portable Grid", - "block.refinedstorage2.creative_portable_grid": "Creative Portable Grid", - "block.refinedstorage2.security_manager": "Security Manager", - "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", - "gui.refinedstorage2.disk_drive.disks": "Disks", - "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage2.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "Sorting direction", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Ascending", - "gui.refinedstorage2.grid.sorting.direction.descending": "Descending", - "gui.refinedstorage2.grid.sorting.type": "Sorting type", - "gui.refinedstorage2.grid.sorting.type.quantity": "Quantity", - "gui.refinedstorage2.grid.sorting.type.name": "Name", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Last modified", - "gui.refinedstorage2.grid.auto_selected": "Auto-selected", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "Synchronization mode", - "gui.refinedstorage2.grid.synchronizer.off": "Off", - "gui.refinedstorage2.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage2.grid.resource_type": "Resource type", - "gui.refinedstorage2.grid.resource_type.all": "All", - "gui.refinedstorage2.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage2.crafting_grid.move.network": "Move items to network", - "gui.refinedstorage2.crafting_grid.move.inventory": "Move items to inventory", - "gui.refinedstorage2.screen_size": "Screen size", - "gui.refinedstorage2.screen_size.stretch": "Stretch", - "gui.refinedstorage2.screen_size.small": "Small", - "gui.refinedstorage2.screen_size.medium": "Medium", - "gui.refinedstorage2.screen_size.large": "Large", - "gui.refinedstorage2.screen_size.extra_large": "Extra large", - "gui.refinedstorage2.detector.mode": "Mode", - "gui.refinedstorage2.detector.mode.under": "Emit redstone signal when under the amount", - "gui.refinedstorage2.detector.mode.equal": "Emit redstone signal when on the amount", - "gui.refinedstorage2.detector.mode.above": "Emit redstone signal when above the amount", - "gui.refinedstorage2.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage2.destructor.pickup_items": "Pickup items instead of breaking", - "gui.refinedstorage2.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "Drop items instead of placing blocks", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d block(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage2.redstone_mode": "Redstone mode", - "gui.refinedstorage2.redstone_mode.ignore": "Ignore", - "gui.refinedstorage2.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage2.redstone_mode.high": "High", - "gui.refinedstorage2.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage2.redstone_mode.low": "Low", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Scheduling mode", - "gui.refinedstorage2.scheduling_mode.default": "Default", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "Random", - "gui.refinedstorage2.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage2.priority": "Priority", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Amount", - "gui.refinedstorage2.amount.reset": "Reset", - "gui.refinedstorage2.amount.set": "Set", - "gui.refinedstorage2.filter_mode": "Filter mode", - "gui.refinedstorage2.filter_mode.allow": "Allowlist", - "gui.refinedstorage2.filter_mode.block": "Blocklist", - "gui.refinedstorage2.fuzzy_mode": "Fuzzy mode", - "gui.refinedstorage2.fuzzy_mode.on": "On", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Off", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Access mode", - "gui.refinedstorage2.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Insert only", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Extract only", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Void excess resources", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d block(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Unreachable", - "gui.refinedstorage2.security_card.permission.reset": "Reset", - "gui.refinedstorage2.security_card.permission.modified": "Modified", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage2.quartz_enriched_copper": "Quartz Enriched Copper", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicon", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage2.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage2.basic_processor": "Basic Processor", - "item.refinedstorage2.improved_processor": "Improved Processor", - "item.refinedstorage2.advanced_processor": "Advanced Processor", - "item.refinedstorage2.1k_storage_part": "1K Storage Part", - "item.refinedstorage2.4k_storage_part": "4K Storage Part", - "item.refinedstorage2.16k_storage_part": "16K Storage Part", - "item.refinedstorage2.64k_storage_part": "64K Storage Part", - "item.refinedstorage2.1k_storage_disk": "1K Storage Disk", - "item.refinedstorage2.4k_storage_disk": "4K Storage Disk", - "item.refinedstorage2.16k_storage_disk": "16K Storage Disk", - "item.refinedstorage2.64k_storage_disk": "64K Storage Disk", - "item.refinedstorage2.storage_disk.help": "Stores %s items.", - "item.refinedstorage2.storage_block.help": "Stores %s items.", - "item.refinedstorage2.creative_storage_disk": "Creative Storage Disk", - "item.refinedstorage2.creative_storage_disk.help": "Stores an infinite amount of items.", - "item.refinedstorage2.creative_storage_block.help": "Stores an infinite amount of items.", - "item.refinedstorage2.64b_fluid_storage_part": "64B Fluid Storage Part", - "item.refinedstorage2.256b_fluid_storage_part": "256B Fluid Storage Part", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage2.fluid_storage_disk.help": "Stores %s buckets.", - "item.refinedstorage2.fluid_storage_block.help": "Stores %s buckets.", - "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage2.creative_fluid_storage_disk.help": "Stores an infinite amount of buckets.", - "item.refinedstorage2.creative_fluid_storage_block.help": "Stores an infinite amount of buckets.", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.help": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.speed_upgrade.help": "Increases the operation speed of a storage network device.", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.stack_upgrade.help": "Increases the amount of resources that the storage network device handles per operation.", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.silk_touch_upgrade.help": "Acts like the Silk Touch enchantment on a pickaxe.", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.fortune_upgrade.help": "Yields more resources when breaking a block. Acts like the Fortune enchantment on a pickaxe.", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.range_upgrade.help": "Increases the range of the Wireless Transmitter.", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.creative_range_upgrade.help": "Provides infinite range for the Wireless Transmitter. Does not work cross-dimensionally.", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.network_transmitter.help": "Transmits a network signal wirelessly. Needs a Network Card that is paired with a Network Receiver.", - "item.refinedstorage2.network_receiver.help": "Receives a network signal wirelessly. Bind a Network Card to this block.", - "item.refinedstorage2.cable.help": "Connects storage network devices with each other.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "item.refinedstorage2.portable_grid.help": "Allows to interact with a storage disk while not being connected to a storage network. Can be used as a block in world, or from your inventory.", - "item.refinedstorage2.storage_monitor.help": "A block that displays the current amount of a certain resource in your storage network. SHIFT + right click to configure. Left click to extract a stack, SHIFT + left click to extract a single resource, right click to insert a resource, right click multiple times to insert resources in bulk.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/es_es.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/es_es.json deleted file mode 100644 index 6debab5f3..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/es_es.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Almacenamiento refinado 2", - "block.refinedstorage2.cable": "Cable", - "block.refinedstorage2.quartz_enriched_iron_block": "Bloque de Hierro Enriquecido", - "block.refinedstorage2.disk_drive": "Unidad de Disco", - "block.refinedstorage2.machine_casing": "Carcasa de la Máquina", - "block.refinedstorage2.grid": "Rejilla", - "block.refinedstorage2.crafting_grid": "Rejilla de Fabricación", - "block.refinedstorage2.controller": "Controlador", - "block.refinedstorage2.creative_controller": "Controlador Creativo", - "block.refinedstorage2.1k_storage_block": "Bloque de almacenamiento de 1K", - "block.refinedstorage2.4k_storage_block": "Bloque de almacenamiento de 4K", - "block.refinedstorage2.16k_storage_block": "Bloque de almacenamiento de 16K", - "block.refinedstorage2.64k_storage_block": "Bloque de almacenamiento de 64K", - "block.refinedstorage2.creative_storage_block": "Bloque de almacenamiento creativo", - "block.refinedstorage2.64b_fluid_storage_block": "Bloque de almacenamiento de fluidos de 64B", - "block.refinedstorage2.256b_fluid_storage_block": "Bloque de almacenamiento de fluidos de 64B", - "block.refinedstorage2.1024b_fluid_storage_block": "Bloque de almacenamiento de fluidos de 1024B", - "block.refinedstorage2.4096b_fluid_storage_block": "Bloque de almacenamiento de fluidos de 4096B", - "block.refinedstorage2.creative_fluid_storage_block": "Bloque de almacenamiento de fluidos creativo", - "block.refinedstorage2.importer": "Importador", - "block.refinedstorage2.exporter": "Exportador", - "block.refinedstorage2.interface": "Interfaz", - "block.refinedstorage2.external_storage": "Almacenamiento Externo", - "block.refinedstorage2.detector": "Detector", - "block.refinedstorage2.constructor": "Constructor", - "block.refinedstorage2.destructor": "Destructor", - "block.refinedstorage2.wireless_transmitter": "Transmisor Inalámbrico", - "block.refinedstorage2.storage_monitor": "Monitor de Almacenamiento", - "block.refinedstorage2.network_receiver": "Receptor de Red", - "block.refinedstorage2.network_transmitter": "Transmisor de Red", - "block.refinedstorage2.portable_grid": "Rejilla Portátil", - "block.refinedstorage2.creative_portable_grid": "Rejilla Portátil Creativa", - "block.refinedstorage2.security_manager": "Gestor de seguridad", - "block.refinedstorage2.security_manager.help": "Cuando este dispositivo está activo, protegerá la red por defecto y bloqueará todas las operaciones. Empieza a añadir tarjetas de seguridad para permitir o denegar operaciones específicas para un jugador.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "Cuando este dispositivo está inactivo, la red de almacenamiento no podrá utilizar este dispositivo como fuente de energía.", - "gui.refinedstorage2.disk_drive.disks": "Discos", - "gui.refinedstorage2.storage.redstone_mode_help": "Cuando este dispositivo está inactivo, ya no se podrá acceder al almacenamiento contenido desde la red de almacenamiento.", - "gui.refinedstorage2.storage.filter_help": "Los recursos que pueden o no ser permitidos en este almacenamiento, dependiendo de si el dispositivo está en la lista de permitidos o en el modo de lista de bloqueos.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Sin filtros configurados, no se aceptarán recursos en este almacenamiento.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Sólo permitir recursos en este almacenamiento que estén configurados en los filtros.", - "gui.refinedstorage2.storage.filter_mode.block.help": "No permitir recursos en este almacenamiento que están configurados en los filtros.", - "gui.refinedstorage2.grid.sorting.direction": "Dirección de ordenación", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Ascendente", - "gui.refinedstorage2.grid.sorting.direction.descending": "Descendente", - "gui.refinedstorage2.grid.sorting.type": "Tipo de ordenación", - "gui.refinedstorage2.grid.sorting.type.quantity": "Cantidad", - "gui.refinedstorage2.grid.sorting.type.name": "Nombre", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Última modificación", - "gui.refinedstorage2.grid.auto_selected": "Auto-seleccionado", - "gui.refinedstorage2.grid.auto_selected.help": "Si seleccionar automáticamente el cuadro de búsqueda al abrir el cuadrículo.", - "gui.refinedstorage2.grid.synchronizer": "Modo de sincronización", - "gui.refinedstorage2.grid.synchronizer.off": "Apagado", - "gui.refinedstorage2.grid.synchronizer.off.help": "No sincronizar el texto del cuadro de búsqueda.", - "gui.refinedstorage2.grid.resource_type": "Tipo de Recurso", - "gui.refinedstorage2.grid.resource_type.all": "Todo", - "gui.refinedstorage2.grid.resource_type.help": "Filtrar tipos de recurso específicos.", - "gui.refinedstorage2.crafting_grid.move.network": "Mover objetos a la red", - "gui.refinedstorage2.crafting_grid.move.inventory": "Mover objetos al inventario", - "gui.refinedstorage2.screen_size": "Tamaño de pantalla", - "gui.refinedstorage2.screen_size.stretch": "Estirar", - "gui.refinedstorage2.screen_size.small": "Pequeño", - "gui.refinedstorage2.screen_size.medium": "Mediano", - "gui.refinedstorage2.screen_size.large": "Grande", - "gui.refinedstorage2.screen_size.extra_large": "Muy grande", - "gui.refinedstorage2.detector.mode": "Modo", - "gui.refinedstorage2.detector.mode.under": "Emitir señal de redstone cuando esté por debajo de la cantidad", - "gui.refinedstorage2.detector.mode.equal": "Emitir señal de redstone cuando esté en la cantidad", - "gui.refinedstorage2.detector.mode.above": "Emitir señal de redstone cuando esté por encima de la cantidad", - "gui.refinedstorage2.detector.filter_help": "El recurso que debería ser detectado en la red de almacenamiento.", - "gui.refinedstorage2.destructor.pickup_items": "Recoger objetos en lugar de romperlos", - "gui.refinedstorage2.destructor.filter_help": "Los bloques que pueden o no ser destruidos, dependiendo de si el dispositivo está en la lista de permitidos o en el modo de lista de bloqueos.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Solo permitir bloques en esta red de almacenamiento que estén configurados en los filtros.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "Soltar objetos en lugar de poner bloques", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d bloque(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "El recurso a mostrar.", - "gui.refinedstorage2.redstone_mode": "Modo Redstone", - "gui.refinedstorage2.redstone_mode.ignore": "Ignorar", - "gui.refinedstorage2.redstone_mode.ignore.help": "Este dispositivo siempre estará activo, independientemente de la señal de redstone.", - "gui.refinedstorage2.redstone_mode.high": "Alto", - "gui.refinedstorage2.redstone_mode.high.help": "Este dispositivo solo estará activo con una señal de redstone.", - "gui.refinedstorage2.redstone_mode.low": "Bajo", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Modo programado", - "gui.refinedstorage2.scheduling_mode.default": "Por defecto", - "gui.refinedstorage2.scheduling_mode.default.help": "Usar el primer filtro disponible.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Usar cada filtro al girar.", - "gui.refinedstorage2.scheduling_mode.random": "Aleatorio", - "gui.refinedstorage2.scheduling_mode.random.help": "Usar un filtro aleatorio.", - "gui.refinedstorage2.priority": "Prioridad", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Cantidad", - "gui.refinedstorage2.amount.reset": "Reiniciar", - "gui.refinedstorage2.amount.set": "Establecer", - "gui.refinedstorage2.filter_mode": "Modo de filtro", - "gui.refinedstorage2.filter_mode.allow": "Lista blanca", - "gui.refinedstorage2.filter_mode.block": "Lista negra", - "gui.refinedstorage2.fuzzy_mode": "Modo Fuzzy", - "gui.refinedstorage2.fuzzy_mode.on": "Encendido", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Coincidir exactamente con el filtro.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Apagado", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Coincide los filtros al extraer de la red de almacenamiento sin comparar las etiquetas NBT.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Coincide los filtros al extraer de la fuente sin comparar las etiquetas NBT.", - "gui.refinedstorage2.access_mode": "Modo de acceso", - "gui.refinedstorage2.access_mode.insert_extract": "Insertar y extraer", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Solo Insertar", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Solo Extraer", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Eliminar recursos excedentes", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Ranura de mejora vacía", - "gui.refinedstorage2.filter_slot.empty_filter": "Filtro vacío", - "gui.refinedstorage2.filter_slot.left_click_for": "Clic izquierdo para", - "gui.refinedstorage2.filter_slot.right_click_for": "Clic derecho para", - "gui.refinedstorage2.filter_slot.click_to_clear": "Clic para limpiar", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Falta tarjeta de red", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d bloque(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Fuera del alcance", - "gui.refinedstorage2.security_card.permission.reset": "Reiniciar", - "gui.refinedstorage2.security_card.permission.modified": "Modificado", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exporta recursos de la red de almacenamiento a un destino externo.", - "item.refinedstorage2.interface.help": "Actúa como la combinación de un importador y exportador.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Hierro enriquecido con cuarzo", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicio", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Procesador Mejorado Bruto", - "item.refinedstorage2.raw_advanced_processor": "Procesador Avanzado Bruto", - "item.refinedstorage2.basic_processor": "Procesador básico", - "item.refinedstorage2.improved_processor": "Procesador Mejorado", - "item.refinedstorage2.advanced_processor": "Procesador Avanzado", - "item.refinedstorage2.1k_storage_part": "Parte de almacenamiento de 1K", - "item.refinedstorage2.4k_storage_part": "Parte de almacenamiento de 4K", - "item.refinedstorage2.16k_storage_part": "Parte de almacenamiento de 16K", - "item.refinedstorage2.64k_storage_part": "Parte de almacenamiento de 64K", - "item.refinedstorage2.1k_storage_disk": "Disco de almacenamiento de 1K", - "item.refinedstorage2.4k_storage_disk": "Disco de almacenamiento de 4K", - "item.refinedstorage2.16k_storage_disk": "Disco de almacenamiento de 16K", - "item.refinedstorage2.64k_storage_disk": "Disco de almacenamiento de 64K", - "item.refinedstorage2.creative_storage_disk": "Disco de almacenamiento creativo", - "item.refinedstorage2.64b_fluid_storage_part": "Parte de almacenamiento de fluidos de 64B", - "item.refinedstorage2.256b_fluid_storage_part": "Parte de almacenamiento de fluidos de 256B", - "item.refinedstorage2.1024b_fluid_storage_part": "Parte de almacenamiento de fluidos de 1024B", - "item.refinedstorage2.4096b_fluid_storage_part": "Parte de almacenamiento de fluidos de 4096B", - "item.refinedstorage2.64b_fluid_storage_disk": "Disco de almacenamiento de fluidos de 64B", - "item.refinedstorage2.256b_fluid_storage_disk": "Disco de almacenamiento de fluidos de 256B", - "item.refinedstorage2.1024b_fluid_storage_disk": "Disco de almacenamiento de fluidos de 1024B", - "item.refinedstorage2.4096b_fluid_storage_disk": "Disco de almacenamiento de fluidos de 4096B", - "item.refinedstorage2.creative_fluid_storage_disk": "Disco de almacenamiento de fluidos creativo", - "item.refinedstorage2.storage_housing": "Carcasa de almacenamiento", - "item.refinedstorage2.construction_core": "Núcleo de construcción", - "item.refinedstorage2.destruction_core": "Núcleo de destrucción", - "item.refinedstorage2.wrench": "Llave inglesa", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Mejora", - "item.refinedstorage2.speed_upgrade": "Mejora de Velocidad", - "item.refinedstorage2.stack_upgrade": "Mejora de Stack", - "item.refinedstorage2.silk_touch_upgrade": "Mejora de Toque de Seda", - "item.refinedstorage2.fortune_upgrade.1": "Mejora de Fortuna I", - "item.refinedstorage2.fortune_upgrade.2": "Mejora de Fortune II", - "item.refinedstorage2.fortune_upgrade.3": "Mejora de Fortuna III", - "item.refinedstorage2.regulator_upgrade": "Mejora de Regulador", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Mejora de rango", - "item.refinedstorage2.creative_range_upgrade": "Mejora de Rango Creativo", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Desvincular.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Vinculado a %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Tarjeta de Configuración", - "item.refinedstorage2.configuration_card.empty": "Vacío.", - "item.refinedstorage2.configuration_card.configured": "Contiene configuración para %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Desvinculado.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Tarjeta de Seguridad", - "item.refinedstorage2.security_card.cleared_configuration": "Configuración limpiada.", - "item.refinedstorage2.security_card.unbound": "Desvinculado.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Vinculado a %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Almacenado: %s", - "misc.refinedstorage2.stored_with_capacity": "Almacenado: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Última modificación ahora por %s", - "misc.refinedstorage2.last_modified.second": "Última modificación hace %d segundo por %s", - "misc.refinedstorage2.last_modified.seconds": "Última modificación hace %d segundos por %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Objeto", - "misc.refinedstorage2.resource_type.fluid": "Fluido", - "misc.refinedstorage2.press_shift_for_help": "Presiona SHIFT para ayuda", - "misc.refinedstorage2.no_permission": "No tienes permisos", - "misc.refinedstorage2.no_permission.open": "No tienes permiso para abrir el %s.", - "misc.refinedstorage2.no_permission.insert": "No tienes permiso para insertar.", - "misc.refinedstorage2.no_permission.extract": "No tienes permiso para extraer.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Enfocar la barra de búsqueda", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Llave Inglesa usada", - "permission.refinedstorage2.insert": "Insertar", - "permission.refinedstorage2.insert.description": "Si el jugador puede insertar recursos en una red.", - "permission.refinedstorage2.extract": "Extraer", - "permission.refinedstorage2.extract.description": "Si el jugador puede extraer recursos de una red.", - "permission.refinedstorage2.autocrafting": "Autocrafteo", - "permission.refinedstorage2.autocrafting.description": "Si el jugador puede comenzar, cancelar o ver una tarea de autocrafteo.", - "permission.refinedstorage2.open": "Abrir", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Construir", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Seguridad", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Desplazamiento suave", - "text.autoconfig.refinedstorage2.option.screenSize": "Tamaño de pantalla", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Fuente grande", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Evitar ordenar mientras SHIFT está presionado", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Descripción detallada", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Recordar búsqueda", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Tipo de Recurso", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Dirección de ordenación", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Tipo de ordenación", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disco Duro", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Uso de energía por disco", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Bloque de almacenamiento", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K de consumo de energía", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K de consumo de energía", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K de consumo de energía", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K de consumo de energía", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Consumo de energía creativo", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importador", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.exporter": "Exportador", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.upgrade": "Mejora", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Rango de mejora de rango", - "text.autoconfig.refinedstorage2.option.iface": "Interfaz", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.externalStorage": "Almacenamiento Externo", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Consumo de energía al extraer", - "text.autoconfig.refinedstorage2.option.securityCard": "Tarjeta de Seguridad", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.securityManager": "Gestor de seguridad", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Uso de energía", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Utilice uno o varios controladores en una red de almacenamiento para proporcionar energía a su red", - "advancements.refinedstorage2.connecting": "Conectando", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Dispositivos y unidades", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Almacenando fluidos", - "advancements.refinedstorage2.storing_fluids.description": "Crea un disco de almacenamiento de fluidos y colócalo en tu unidad de discos", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Mejorando", - "advancements.refinedstorage2.upgrading.description": "Crea una mejora para actualizar varios dispositivos", - "advancements.refinedstorage2.interface_to_the_world": "Interfaz al mundo", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Almacenando externamente", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detectando", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construcción", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destrucción", - "advancements.refinedstorage2.destruction.description": "Obtén bloques del mundo a la red mediante un Destructor", - "advancements.refinedstorage2.wireless": "Comunicaciones Inalámbricas", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Mejor que un barril", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No se necesitan cables", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Almacenamiento portátil", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Seguridad", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/fr_fr.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/fr_fr.json deleted file mode 100644 index a97ad1eec..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/fr_fr.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Câble", - "block.refinedstorage2.quartz_enriched_iron_block": "Bloc de Fer Enrichi en Quartz", - "block.refinedstorage2.disk_drive": "Lecteur de Disque", - "block.refinedstorage2.machine_casing": "Boitier de Machine", - "block.refinedstorage2.grid": "Grille", - "block.refinedstorage2.crafting_grid": "Grille d’Artisanat", - "block.refinedstorage2.controller": "Contrôleur", - "block.refinedstorage2.creative_controller": "Contrôleur créatif", - "block.refinedstorage2.1k_storage_block": "Bloc de Stockage 1K", - "block.refinedstorage2.4k_storage_block": "Bloc de Stockage 4k", - "block.refinedstorage2.16k_storage_block": "Bloc de Stockage 16k", - "block.refinedstorage2.64k_storage_block": "Bloc de Stockage 64k", - "block.refinedstorage2.creative_storage_block": "Bloc de Stockage Créatif", - "block.refinedstorage2.64b_fluid_storage_block": "Bloc de Stockage de Fluides 64B", - "block.refinedstorage2.256b_fluid_storage_block": "Bloc de Stockage de Fluides 256B", - "block.refinedstorage2.1024b_fluid_storage_block": "Bloc de Stockage de Fluides 1024B", - "block.refinedstorage2.4096b_fluid_storage_block": "Bloc de Stockage de Fluides 4096B", - "block.refinedstorage2.creative_fluid_storage_block": "Bloc de Stockage de Fluides Créatif", - "block.refinedstorage2.importer": "Importateur", - "block.refinedstorage2.exporter": "Exportateur", - "block.refinedstorage2.interface": "Interface", - "block.refinedstorage2.external_storage": "Stockage Externe", - "block.refinedstorage2.detector": "Détecteur", - "block.refinedstorage2.constructor": "Constructeur", - "block.refinedstorage2.destructor": "Destructeur", - "block.refinedstorage2.wireless_transmitter": "Transmetteur sans fil", - "block.refinedstorage2.storage_monitor": "Moniteur de Stockage", - "block.refinedstorage2.network_receiver": "Récepteur Réseau", - "block.refinedstorage2.network_transmitter": "Transmetteur Réseau", - "block.refinedstorage2.portable_grid": "Grille portable", - "block.refinedstorage2.creative_portable_grid": "Grille portable créative", - "block.refinedstorage2.security_manager": "Poste de sécurité", - "block.refinedstorage2.security_manager.help": "Lorsque ce périphérique est actif, il protège le réseau par défaut et bloque toutes les opérations. Commencez à ajouter des Cartes de Sécurité pour permettre ou refuser des opérations spécifiques pour un joueur.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "Lorsque ce périphérique est inactif, le réseau de stockage ne peut pas utiliser ce périphérique comme source d'énergie.", - "gui.refinedstorage2.disk_drive.disks": "Disques", - "gui.refinedstorage2.storage.redstone_mode_help": "Lorsque ce périphérique est inactif, le stockage contenu ne sera plus accessible depuis le réseau de stockage.", - "gui.refinedstorage2.storage.filter_help": "Les ressources qui sont autorisées ou refusées dans ce stockage, en fonction du mode de filtrage du périphérique.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Sans filtre configuré, aucune ressource ne sera accepté dans ce stockage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Autorise dans ce stockage uniquement les ressources configurées dans les filtres.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Interdis dans ce stockage les ressources configurées dans les filtres.", - "gui.refinedstorage2.grid.sorting.direction": "Direction du tri", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Ascendant", - "gui.refinedstorage2.grid.sorting.direction.descending": "Descendant", - "gui.refinedstorage2.grid.sorting.type": "Type de tri", - "gui.refinedstorage2.grid.sorting.type.quantity": "Quantité", - "gui.refinedstorage2.grid.sorting.type.name": "Nom", - "gui.refinedstorage2.grid.sorting.type.id": "Identifiant", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Dernière modification", - "gui.refinedstorage2.grid.auto_selected": "Sélection automatique", - "gui.refinedstorage2.grid.auto_selected.help": "Si la barre de recherche doit être sélectionnée automatique à l'ouverture de la grille.", - "gui.refinedstorage2.grid.synchronizer": "Mode de synchronisation", - "gui.refinedstorage2.grid.synchronizer.off": "Éteint", - "gui.refinedstorage2.grid.synchronizer.off.help": "Ne pas synchroniser la recherche.", - "gui.refinedstorage2.grid.resource_type": "Type de ressource", - "gui.refinedstorage2.grid.resource_type.all": "Toutes", - "gui.refinedstorage2.grid.resource_type.help": "Filtrer un type de ressources spécifique.", - "gui.refinedstorage2.crafting_grid.move.network": "Déplacer les objets dans le réseau", - "gui.refinedstorage2.crafting_grid.move.inventory": "Déplacer les objets dans l'inventaire", - "gui.refinedstorage2.screen_size": "Taille de l'écran", - "gui.refinedstorage2.screen_size.stretch": "Etiré", - "gui.refinedstorage2.screen_size.small": "Petit", - "gui.refinedstorage2.screen_size.medium": "Moyen", - "gui.refinedstorage2.screen_size.large": "Grand", - "gui.refinedstorage2.screen_size.extra_large": "Très grand", - "gui.refinedstorage2.detector.mode": "Mode", - "gui.refinedstorage2.detector.mode.under": "Émet un signal de redstone si la valeur est inférieure au seuil.", - "gui.refinedstorage2.detector.mode.equal": "Émet un signal de redstone si la valeur est égale au seuil.", - "gui.refinedstorage2.detector.mode.above": "Émet un signal de redstone si la valeur est supérieure au seuil.", - "gui.refinedstorage2.detector.filter_help": "La ressource qui doit être détectée dans le réseau de stockage.", - "gui.refinedstorage2.destructor.pickup_items": "Ramasser des objets au lieu de casser des blocs.", - "gui.refinedstorage2.destructor.filter_help": "Les blocs qui seront détruits ou ignorés en fonction du mode de filtrage du périphérique.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Autorise dans le réseau de stockage uniquement les blocs configurés dans les filtres.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Interdit dans le réseau de stockage les blocs configurés dans les filtres.", - "gui.refinedstorage2.constructor.drop_items": "Laisser tomber des objets au lieu de placer des blocs.", - "gui.refinedstorage2.constructor.filter_help": "Les ressources qui doivent être placées depuis le réseau de stockage.", - "gui.refinedstorage2.interface.filter_help": "Les ressources qui doivent être exportées depuis le réseau de stockage.", - "gui.refinedstorage2.exporter.filter_help": "Les ressources qui doivent être exportées depuis le réseau de stockage.", - "gui.refinedstorage2.importer.filter_help": "Les ressources qui doivent être importées depuis l'inventaire ciblé.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Autorise dans le réseau de stockage uniquement les ressources configurées dans les filtres.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Interdit dans le réseau de stockage les ressources configurées dans les filtres.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d bloc(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "La ressource à afficher.", - "gui.refinedstorage2.redstone_mode": "Mode redstone", - "gui.refinedstorage2.redstone_mode.ignore": "Ignoré", - "gui.refinedstorage2.redstone_mode.ignore.help": "Ce périphérique sera toujours actif quel que soit le signal de redstone.", - "gui.refinedstorage2.redstone_mode.high": "Allumé", - "gui.refinedstorage2.redstone_mode.high.help": "Ce périphérique sera actif seulement s'il reçoit un signal de redstone.", - "gui.refinedstorage2.redstone_mode.low": "Éteint", - "gui.refinedstorage2.redstone_mode.low.help": "Ce périphérique sera actif seulement s'il ne reçoit pas de signal de redstone.", - "gui.refinedstorage2.scheduling_mode": "Mode de distribution", - "gui.refinedstorage2.scheduling_mode.default": "Par défaut", - "gui.refinedstorage2.scheduling_mode.default.help": "Utilise le premier filtre disponible.", - "gui.refinedstorage2.scheduling_mode.round_robin": "À tour de rôle", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Utiliser chaque filtre à tour de rôle.", - "gui.refinedstorage2.scheduling_mode.random": "Aléatoire", - "gui.refinedstorage2.scheduling_mode.random.help": "Utiliser un filtre aléatoire.", - "gui.refinedstorage2.priority": "Priorité", - "gui.refinedstorage2.priority.storage_help": "L'ordre dans lequel le réseau de stockage va insérer ou extraire les ressources, le plus élevé en premier.", - "gui.refinedstorage2.amount": "Quantité", - "gui.refinedstorage2.amount.reset": "Réinitialiser", - "gui.refinedstorage2.amount.set": "Définir", - "gui.refinedstorage2.filter_mode": "Mode de filtrage", - "gui.refinedstorage2.filter_mode.allow": "Liste blanche", - "gui.refinedstorage2.filter_mode.block": "Liste noire", - "gui.refinedstorage2.fuzzy_mode": "Mode flou", - "gui.refinedstorage2.fuzzy_mode.on": "Activé", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Désactivé", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Mode d'accès", - "gui.refinedstorage2.access_mode.insert_extract": "Insertion et extraction", - "gui.refinedstorage2.access_mode.insert_extract.help": "Le réseau de stockage pourra insérer et extraire depuis ce stockage.", - "gui.refinedstorage2.access_mode.insert": "Insertion uniquement", - "gui.refinedstorage2.access_mode.insert.help": "Le réseau de stockage ne pourra qu'insérer dans stockage. Les ressources seront tout de même visible dans une grille.", - "gui.refinedstorage2.access_mode.extract": "Extraction uniquement", - "gui.refinedstorage2.access_mode.extract.help": "Le réseau de stockage ne pourra qu'extraire depuis ce stockage.", - "gui.refinedstorage2.void_excess": "Anéantir les ressources en excès", - "gui.refinedstorage2.void_excess.help": "Quand le mode anéantir les ressources en excès est allumé et que le stockage est plein, il continuera d'accepter les ressources mais les détruira.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Le mode anéantir les ressources en excès ne fonction que lorsque le stockage est en mode liste blanche.", - "gui.refinedstorage2.upgrade_slot": "Emplacement d'amélioration vide", - "gui.refinedstorage2.filter_slot.empty_filter": "Filtre vide", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "La ressource qui doit être régulée dans la cible.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactif", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Carte réseau manquante", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d bloc(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Inaccessible", - "gui.refinedstorage2.security_card.permission.reset": "Réinitialiser", - "gui.refinedstorage2.security_card.permission.modified": "Modifiée", - "gui.refinedstorage2.security_manager.redstone_mode_help": "Lorsque ce périphérique est inactif, le réseau ne sera pas protégé.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Emplacement pour une carte de sécurité de repli.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Ajoutez une Carte de sécurité de repli à cet emplacement pour définir les permissions de tous les joueurs sans Carte de sécurité. Par défaut, toutes les actions sont interdites.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Alimente le réseau de stockage en énergie. Plusieurs sont autorisés dans un seul réseau de stockage. ", - "item.refinedstorage2.creative_controller.help": "Alimente le réseau de stockage avec une source d'énergie infinie. ", - "item.refinedstorage2.disk_drive.help": "Accepte des disques de stockage pour fournir de l'espace de stockage au réseau.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Permet d'interagir avec le réseau de stockage.", - "item.refinedstorage2.crafting_grid.help": "Permet d'interagir avec le réseau de stockage, avec les capacités d'artisanat.", - "item.refinedstorage2.importer.help": "Importe des ressources depuis une source externe vers le réseau de stockage.", - "item.refinedstorage2.exporter.help": "Exporte les ressources du réseau de stockage vers une destination externe.", - "item.refinedstorage2.interface.help": "Agit comme la combinaison d'un importateur et d'un exportateur.", - "item.refinedstorage2.external_storage.help": "Fournit au réseau de stockage accès à un inventaire externe.", - "item.refinedstorage2.detector.help": "Émet un signal de redstone si le réseau de stockage contient une ressource en quantité égale, supérieure ou inférieure à un seuil donné.", - "item.refinedstorage2.constructor.help": "Place des blocs du réseau de stockage dans le monde.", - "item.refinedstorage2.destructor.help": "Détruit les blocs du monde et les met dans le réseau de stockage.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Fer enrichi en quartz", - "item.refinedstorage2.processor_binding": "Liant pour processeur", - "item.refinedstorage2.silicon": "Silicone", - "item.refinedstorage2.raw_basic_processor": "Processeur basique brut", - "item.refinedstorage2.raw_improved_processor": "Processeur amélioré brut", - "item.refinedstorage2.raw_advanced_processor": "Processeur avancé brut", - "item.refinedstorage2.basic_processor": "Processeur basique", - "item.refinedstorage2.improved_processor": "Processeur amélioré", - "item.refinedstorage2.advanced_processor": "Processeur avancé", - "item.refinedstorage2.1k_storage_part": "Pièce de stockage 1k", - "item.refinedstorage2.4k_storage_part": "Pièce de stockage 4k", - "item.refinedstorage2.16k_storage_part": "Pièce de stockage 16k", - "item.refinedstorage2.64k_storage_part": "Pièce de stockage 64k", - "item.refinedstorage2.1k_storage_disk": "Disque de stockage 1k", - "item.refinedstorage2.4k_storage_disk": "Disque de stockage 4k", - "item.refinedstorage2.16k_storage_disk": "Disque de stockage 16k", - "item.refinedstorage2.64k_storage_disk": "Disque de stockage 64k", - "item.refinedstorage2.creative_storage_disk": "Disque de stockage créatif", - "item.refinedstorage2.64b_fluid_storage_part": "Pièce de stockage de fluides 64B", - "item.refinedstorage2.256b_fluid_storage_part": "Pièce de stockage de fluides 256B", - "item.refinedstorage2.1024b_fluid_storage_part": "Pièce de stockage de fluides 1024B", - "item.refinedstorage2.4096b_fluid_storage_part": "Pièce de stockage de fluides 4096B", - "item.refinedstorage2.64b_fluid_storage_disk": "Disque de stockage de fluides 64B", - "item.refinedstorage2.256b_fluid_storage_disk": "Disque de stockage de fluides 256B", - "item.refinedstorage2.1024b_fluid_storage_disk": "Disque de stockage de fluides 1024B", - "item.refinedstorage2.4096b_fluid_storage_disk": "Disque de stockage de fluides 4096B", - "item.refinedstorage2.creative_fluid_storage_disk": "Disque de stockage de fluides créatif", - "item.refinedstorage2.storage_housing": "Boitier de stockage", - "item.refinedstorage2.construction_core": "Cœur de construction", - "item.refinedstorage2.destruction_core": "Cœur de destruction", - "item.refinedstorage2.wrench": "Clé", - "item.refinedstorage2.wrench.helper": "Utilisez pour faire tourner un bloc, ou appuyez sur Maj et utilisez pour démonter les blocs de Refined Storage.", - "item.refinedstorage2.upgrade": "Amélioration", - "item.refinedstorage2.speed_upgrade": "Amélioration de vitesse", - "item.refinedstorage2.stack_upgrade": "Amélioration de stack", - "item.refinedstorage2.silk_touch_upgrade": "Amélioration de toucher de soie", - "item.refinedstorage2.fortune_upgrade.1": "Amélioration de fortune I", - "item.refinedstorage2.fortune_upgrade.2": "Amélioration de fortune II", - "item.refinedstorage2.fortune_upgrade.3": "Amélioration de fortune III", - "item.refinedstorage2.regulator_upgrade": "Amélioration de régulation", - "item.refinedstorage2.regulator_upgrade.help": "Dans un Exportateur, n'exportera que si le montant dans la cible est inférieur à la valeur configurée dans l'amélioration. Dans un Importateur, n'importera que si le montant dans la cible est supérieur à la valeur configurée dans l'amélioration. Utilisez l'objet pour configurer.", - "item.refinedstorage2.range_upgrade": "Amélioration de portée", - "item.refinedstorage2.creative_range_upgrade": "Amélioration de portée créative", - "item.refinedstorage2.wireless_grid": "Grille sans fil", - "item.refinedstorage2.creative_wireless_grid": "Grille sans fil créative", - "item.refinedstorage2.wireless_transmitter.help": "Fournit un accès au réseau sans fil pour des objets comme la grille sans fil. Plusieurs sont autorisés pour une couverture plus large.", - "item.refinedstorage2.network_item.unbound": "Non liée.", - "item.refinedstorage2.network_item.unbound.help": "Utiliser sur n'importe quel périphérique du réseau de stockage pour relier.", - "item.refinedstorage2.network_item.bound_to": "Lié à %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "Il y a plusieurs %s dans votre inventaire.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "Il n'y a pas de %s dans votre inventaire.", - "item.refinedstorage2.configuration_card": "Carte de configuration", - "item.refinedstorage2.configuration_card.empty": "Vide.", - "item.refinedstorage2.configuration_card.configured": "Contient une configuration pour %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Configuration copiée pour %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Configuration effacée.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Impossible d'appliquer la carte de configuration à un autre type de périphérique. Elle est configurée pour %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Configuration appliquée.", - "item.refinedstorage2.configuration_card.empty_help": "Utiliser sur un périphérique réseau en étant accroupi pour sauvegarder sa configuration et ses améliorations dans la carte.", - "item.refinedstorage2.configuration_card.configured_help": "Utiliser sur le périphérique de destination en étant accroupi pour transférer la configuration et les améliorations. Utiliser en étant accroupi pour effacer.", - "item.refinedstorage2.network_card": "Carte réseau", - "item.refinedstorage2.network_card.unbound_help": "Utilisez en étant accroupi sur un Récepteur réseau.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Stocké : %s", - "misc.refinedstorage2.stored_with_capacity": "Stocké : %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Dernière modification à l'instant par %s", - "misc.refinedstorage2.last_modified.second": "Dernière modification il y %d seconde par %s", - "misc.refinedstorage2.last_modified.seconds": "Dernière modification il y %d secondes par %s", - "misc.refinedstorage2.last_modified.minute": "Dernière modification il y %d minute par %s", - "misc.refinedstorage2.last_modified.minutes": "Dernière modification il y %d minutes par %s", - "misc.refinedstorage2.last_modified.hour": "Dernière modification il y %d heure par %s", - "misc.refinedstorage2.last_modified.hours": "Dernière modification il y %d heures par %s", - "misc.refinedstorage2.last_modified.day": "Dernière modification il y %d jour par %s", - "misc.refinedstorage2.last_modified.days": "Dernière modification il y %d jours par %s", - "misc.refinedstorage2.last_modified.week": "Dernière modification il y %d semaine par %s", - "misc.refinedstorage2.last_modified.weeks": "Dernière modification il y %d semaines par %s", - "misc.refinedstorage2.last_modified.year": "Dernière modification il y %d an par %s", - "misc.refinedstorage2.last_modified.years": "Dernière modification il y %d ans par %s", - "misc.refinedstorage2.resource_type.item": "Objet", - "misc.refinedstorage2.resource_type.fluid": "Fluide", - "misc.refinedstorage2.press_shift_for_help": "Appuyez sur Maj pour obtenir de l'aide", - "misc.refinedstorage2.no_permission": "Permission manquante", - "misc.refinedstorage2.no_permission.open": "Vous n'êtes pas autorisé à ouvrir %s.", - "misc.refinedstorage2.no_permission.insert": "Vous n'êtes pas autorisé à insérer.", - "misc.refinedstorage2.no_permission.extract": "Vous n'êtes pas autorisé à extraire.", - "misc.refinedstorage2.no_permission.build.place": "Vous n'êtes pas autorisé à placer %s ici.", - "misc.refinedstorage2.no_permission.build.break": "Vous n'êtes pas autorisé à casser %s.", - "misc.refinedstorage2.no_permission.build.rotate": "Vous n'êtes pas autorisé à faire pivoter %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "Vous n'êtes pas autorisé à démonter %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Vider la matrice d'artisanat dans le réseau", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Vider la matrice d'artisanat dans l'inventaire", - "key.refinedstorage2.open_wireless_grid": "Ouvrir la grille sans fil", - "refinedstorage2.subtitle.wrench": "Clé utilisée", - "permission.refinedstorage2.insert": "Insérer", - "permission.refinedstorage2.insert.description": "Si le joueur peut insérer des ressources dans le réseau.", - "permission.refinedstorage2.extract": "Extraire", - "permission.refinedstorage2.extract.description": "Si le joueur peut extraire des ressources du réseau.", - "permission.refinedstorage2.autocrafting": "Fabrication automatique", - "permission.refinedstorage2.autocrafting.description": "Si le joueur peut démarrer, annuler ou afficher les tâches de fabrication automatique.", - "permission.refinedstorage2.open": "Ouvrir", - "permission.refinedstorage2.open.description": "Si le joueur peut ouvrir l'interface graphique des périphériques du réseau.", - "permission.refinedstorage2.build": "Construire", - "permission.refinedstorage2.build.description": "Si le joueur peut ajouter ou enlever des périphériques au réseau.", - "permission.refinedstorage2.security": "Sécurité", - "permission.refinedstorage2.security.description": "Si le joueur peut gérer les options de sécurité du réseau.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grille", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Empêcher le tri lorsque la touche Maj est enfoncée", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronisation", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Direction du tri", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Type de tri", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importateur", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exportateur", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Détecteur", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructeur", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructeur", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "Stockage Externe", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Grille sans fil", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Capacité énergétique", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Émetteur sans fil", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Portée de base", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Moniteur de Stockage", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Récepteur Réseau", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Transmetteur Réseau", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Grille portable", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Utiliser un câble pour connecter pour connecter des périphériques ensembles, ou placer les périphériques l'un contre l'autre", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Construire une amélioration pour améliorer divers périphériques", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Sans fil", - "advancements.refinedstorage2.wireless.description": "Accédez à vos ressources à distance avec une grille sans fil", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/hu_hu.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/hu_hu.json deleted file mode 100644 index 79efad7d4..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/hu_hu.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Cable", - "block.refinedstorage2.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", - "block.refinedstorage2.disk_drive": "Disk Drive", - "block.refinedstorage2.machine_casing": "Machine Casing", - "block.refinedstorage2.grid": "Grid", - "block.refinedstorage2.crafting_grid": "Crafting Grid", - "block.refinedstorage2.controller": "Controller", - "block.refinedstorage2.creative_controller": "Creative Controller", - "block.refinedstorage2.1k_storage_block": "1K Storage Block", - "block.refinedstorage2.4k_storage_block": "4K Storage Block", - "block.refinedstorage2.16k_storage_block": "16K Storage Block", - "block.refinedstorage2.64k_storage_block": "64K Storage Block", - "block.refinedstorage2.creative_storage_block": "Creative Storage Block", - "block.refinedstorage2.64b_fluid_storage_block": "64B Fluid Storage Block", - "block.refinedstorage2.256b_fluid_storage_block": "256B Fluid Storage Block", - "block.refinedstorage2.1024b_fluid_storage_block": "1024B Fluid Storage Block", - "block.refinedstorage2.4096b_fluid_storage_block": "4096B Fluid Storage Block", - "block.refinedstorage2.creative_fluid_storage_block": "Creative Fluid Storage Block", - "block.refinedstorage2.importer": "Importer", - "block.refinedstorage2.exporter": "Exporter", - "block.refinedstorage2.interface": "Interface", - "block.refinedstorage2.external_storage": "External Storage", - "block.refinedstorage2.detector": "Detector", - "block.refinedstorage2.constructor": "Constructor", - "block.refinedstorage2.destructor": "Destructor", - "block.refinedstorage2.wireless_transmitter": "Wireless Transmitter", - "block.refinedstorage2.storage_monitor": "Storage Monitor", - "block.refinedstorage2.network_receiver": "Network Receiver", - "block.refinedstorage2.network_transmitter": "Network Transmitter", - "block.refinedstorage2.portable_grid": "Portable Grid", - "block.refinedstorage2.creative_portable_grid": "Creative Portable Grid", - "block.refinedstorage2.security_manager": "Security Manager", - "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", - "gui.refinedstorage2.disk_drive.disks": "Disks", - "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage2.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "Sorting direction", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Ascending", - "gui.refinedstorage2.grid.sorting.direction.descending": "Descending", - "gui.refinedstorage2.grid.sorting.type": "Sorting type", - "gui.refinedstorage2.grid.sorting.type.quantity": "Quantity", - "gui.refinedstorage2.grid.sorting.type.name": "Name", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Last modified", - "gui.refinedstorage2.grid.auto_selected": "Auto-selected", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "Synchronization mode", - "gui.refinedstorage2.grid.synchronizer.off": "Off", - "gui.refinedstorage2.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage2.grid.resource_type": "Resource type", - "gui.refinedstorage2.grid.resource_type.all": "All", - "gui.refinedstorage2.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage2.crafting_grid.move.network": "Move items to network", - "gui.refinedstorage2.crafting_grid.move.inventory": "Move items to inventory", - "gui.refinedstorage2.screen_size": "Screen size", - "gui.refinedstorage2.screen_size.stretch": "Stretch", - "gui.refinedstorage2.screen_size.small": "Small", - "gui.refinedstorage2.screen_size.medium": "Medium", - "gui.refinedstorage2.screen_size.large": "Large", - "gui.refinedstorage2.screen_size.extra_large": "Extra large", - "gui.refinedstorage2.detector.mode": "Mode", - "gui.refinedstorage2.detector.mode.under": "Emit redstone signal when under the amount", - "gui.refinedstorage2.detector.mode.equal": "Emit redstone signal when on the amount", - "gui.refinedstorage2.detector.mode.above": "Emit redstone signal when above the amount", - "gui.refinedstorage2.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage2.destructor.pickup_items": "Pickup items instead of breaking", - "gui.refinedstorage2.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "Drop items instead of placing blocks", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d block(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage2.redstone_mode": "Redstone mode", - "gui.refinedstorage2.redstone_mode.ignore": "Ignore", - "gui.refinedstorage2.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage2.redstone_mode.high": "High", - "gui.refinedstorage2.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage2.redstone_mode.low": "Low", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Scheduling mode", - "gui.refinedstorage2.scheduling_mode.default": "Default", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "Random", - "gui.refinedstorage2.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage2.priority": "Priority", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Amount", - "gui.refinedstorage2.amount.reset": "Reset", - "gui.refinedstorage2.amount.set": "Set", - "gui.refinedstorage2.filter_mode": "Filter mode", - "gui.refinedstorage2.filter_mode.allow": "Allowlist", - "gui.refinedstorage2.filter_mode.block": "Blocklist", - "gui.refinedstorage2.fuzzy_mode": "Fuzzy mode", - "gui.refinedstorage2.fuzzy_mode.on": "On", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Off", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Access mode", - "gui.refinedstorage2.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Insert only", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Extract only", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Void excess resources", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d block(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Unreachable", - "gui.refinedstorage2.security_card.permission.reset": "Reset", - "gui.refinedstorage2.security_card.permission.modified": "Modified", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicon", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage2.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage2.basic_processor": "Basic Processor", - "item.refinedstorage2.improved_processor": "Improved Processor", - "item.refinedstorage2.advanced_processor": "Advanced Processor", - "item.refinedstorage2.1k_storage_part": "1K Storage Part", - "item.refinedstorage2.4k_storage_part": "4K Storage Part", - "item.refinedstorage2.16k_storage_part": "16K Storage Part", - "item.refinedstorage2.64k_storage_part": "64K Storage Part", - "item.refinedstorage2.1k_storage_disk": "1K Storage Disk", - "item.refinedstorage2.4k_storage_disk": "4K Storage Disk", - "item.refinedstorage2.16k_storage_disk": "16K Storage Disk", - "item.refinedstorage2.64k_storage_disk": "64K Storage Disk", - "item.refinedstorage2.creative_storage_disk": "Creative Storage Disk", - "item.refinedstorage2.64b_fluid_storage_part": "64B Fluid Storage Part", - "item.refinedstorage2.256b_fluid_storage_part": "256B Fluid Storage Part", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/id_id.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/id_id.json deleted file mode 100644 index 97d548df5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/id_id.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Kabel", - "block.refinedstorage2.quartz_enriched_iron_block": "Balok Besi yang Diperkaya Kuarsa", - "block.refinedstorage2.disk_drive": "Lemari Cakram", - "block.refinedstorage2.machine_casing": "Kerangka Mesin", - "block.refinedstorage2.grid": "Kisi", - "block.refinedstorage2.crafting_grid": "Kisi Kerajinan", - "block.refinedstorage2.controller": "Pengendali", - "block.refinedstorage2.creative_controller": "Pengendali Kreatif", - "block.refinedstorage2.1k_storage_block": "Balok Penyimpanan 1K", - "block.refinedstorage2.4k_storage_block": "Balok Penyimpanan 4K", - "block.refinedstorage2.16k_storage_block": "Balok Penyimpanan 16K", - "block.refinedstorage2.64k_storage_block": "Balok Penyimpanan 64K", - "block.refinedstorage2.creative_storage_block": "Balok Penyimpanan Kreatif", - "block.refinedstorage2.64b_fluid_storage_block": "Balok Penyimpanan Cairan 64B", - "block.refinedstorage2.256b_fluid_storage_block": "Balok Penyimpanan Cairan 256B", - "block.refinedstorage2.1024b_fluid_storage_block": "Balok Penyimpanan Cairan 1024B", - "block.refinedstorage2.4096b_fluid_storage_block": "Balok Penyimpanan Cairan 4096B", - "block.refinedstorage2.creative_fluid_storage_block": "Balok Penyimpanan Cairan Kreatif", - "block.refinedstorage2.importer": "Importir", - "block.refinedstorage2.exporter": "Eksportir", - "block.refinedstorage2.interface": "Antarmuka", - "block.refinedstorage2.external_storage": "Penyimpanan Eksternal", - "block.refinedstorage2.detector": "Pendeteksi", - "block.refinedstorage2.constructor": "Pembangun", - "block.refinedstorage2.destructor": "Penghancur", - "block.refinedstorage2.wireless_transmitter": "Pemancar Nirkabel", - "block.refinedstorage2.storage_monitor": "Monitor Penyimpanan", - "block.refinedstorage2.network_receiver": "Penerima Jaringan", - "block.refinedstorage2.network_transmitter": "Pemancar Jaringan", - "block.refinedstorage2.portable_grid": "Kisi Portabel", - "block.refinedstorage2.creative_portable_grid": "Kisi Portabel Kreatif", - "block.refinedstorage2.security_manager": "Security Manager", - "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "Ketika peranagkat ini nonaktif, jaringan penyimpanan tidak dapat menggunakan perangkat ini sebagai sumber energi.", - "gui.refinedstorage2.disk_drive.disks": "Cakram", - "gui.refinedstorage2.storage.redstone_mode_help": "Ketika perangkat ini nonaktif, penyimpanan tidak akan dapat diakses dari dalam jaringan penyimpanan.", - "gui.refinedstorage2.storage.filter_help": "Sumber daya yang diperbolehkan atau tidak ke dalam penyimpanan ini, tergantung jika perangkat dalam mode diizinkan atau diblokir.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Tanpa konfigurasi filter, tidak ada sumber daya yang akan diterima kedalam penyimpanan ini.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Hanya izinkan sumber daya kedalam penyimpanan ini yang telah dikonfigurasi dalam filter.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Blokir sumber daya kedalam penyimpanan ini yang telah dikonfigurasi dalam filter.", - "gui.refinedstorage2.grid.sorting.direction": "Arah Pengurutan", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Menaik", - "gui.refinedstorage2.grid.sorting.direction.descending": "Menurun", - "gui.refinedstorage2.grid.sorting.type": "Jenis pengurutan", - "gui.refinedstorage2.grid.sorting.type.quantity": "Kuantitas", - "gui.refinedstorage2.grid.sorting.type.name": "Nama", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Terakhir dirubah", - "gui.refinedstorage2.grid.auto_selected": "Pilih otomatis", - "gui.refinedstorage2.grid.auto_selected.help": "Memilih kotak pencarian secara otomatis saat membuka Kisi.", - "gui.refinedstorage2.grid.synchronizer": "Mode sinkronisasi", - "gui.refinedstorage2.grid.synchronizer.off": "Nonaktif", - "gui.refinedstorage2.grid.synchronizer.off.help": "Jangan sinkronkan teks kotak pencarian.", - "gui.refinedstorage2.grid.resource_type": "Jenis sumber daya", - "gui.refinedstorage2.grid.resource_type.all": "Semua", - "gui.refinedstorage2.grid.resource_type.help": "Filter jenis sumber daya tertentu.", - "gui.refinedstorage2.crafting_grid.move.network": "Pindahkan barang ke jaringan", - "gui.refinedstorage2.crafting_grid.move.inventory": "Pindahkan barang ke inventaris", - "gui.refinedstorage2.screen_size": "Screen size", - "gui.refinedstorage2.screen_size.stretch": "Stretch", - "gui.refinedstorage2.screen_size.small": "Small", - "gui.refinedstorage2.screen_size.medium": "Medium", - "gui.refinedstorage2.screen_size.large": "Large", - "gui.refinedstorage2.screen_size.extra_large": "Extra large", - "gui.refinedstorage2.detector.mode": "Mode", - "gui.refinedstorage2.detector.mode.under": "Pancarkan sinyal redstone saat berada di bawah jumlah yang ditentukan", - "gui.refinedstorage2.detector.mode.equal": "Pancarkan sinyal redstone saat berada pada jumlah yang ditentukan", - "gui.refinedstorage2.detector.mode.above": "Pancarkan sinyal redstone saat berada diatas jumlah yang ditentukan", - "gui.refinedstorage2.detector.filter_help": "Sumber daya yang harus dideteksi dalam jaringan penyimpanan.", - "gui.refinedstorage2.destructor.pickup_items": "Ambil barang daripada memecah", - "gui.refinedstorage2.destructor.filter_help": "Balok yang dapat atau tidak dapat untuk dihancurkan, tergantung jika perangkat dalam mode diizinkan atau diblokir.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Hanya izinkan balok kedalam jaringan penyimpanan yang telah dikonfigurasi dalam filter.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Blokir balok kedalam jaringan penyimpanan yang telah dikonfigurasi dalam filter.", - "gui.refinedstorage2.constructor.drop_items": "Jatuhkan barang dibanding menempatkan balok", - "gui.refinedstorage2.constructor.filter_help": "Sumber daya yang harus ditempatkan dari jaringan penyimpanan.", - "gui.refinedstorage2.interface.filter_help": "Sumber daya yang harus diekspor dari jaringan penyimpanan.", - "gui.refinedstorage2.exporter.filter_help": "Sumber daya yang harus diekspor dari jaringan penyimpanan.", - "gui.refinedstorage2.importer.filter_help": "Sumber daya yang mungkin diimpor dari penyimpanan sasaran.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Hanya izinkan sumber daya kedalam jaringan penyimpanan yang telah dikonfigurasi dalam filter.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Blokir sumber daya kedalam jaringan penyimpanan yang telah dikonfigurasi dalam filter.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d blok", - "gui.refinedstorage2.storage_monitor.filter_help": "Sumber daya untuk ditampilkan.", - "gui.refinedstorage2.redstone_mode": "Mode redstone", - "gui.refinedstorage2.redstone_mode.ignore": "Abaikan", - "gui.refinedstorage2.redstone_mode.ignore.help": "Perangkat ini akan selalu aktif, menghiraukan sinyal redstone.", - "gui.refinedstorage2.redstone_mode.high": "Tinggi", - "gui.refinedstorage2.redstone_mode.high.help": "Perangkat ini hanya akan aktif dengan sinyal redstone.", - "gui.refinedstorage2.redstone_mode.low": "Rendah", - "gui.refinedstorage2.redstone_mode.low.help": "Perangkat ini hanya akan aktif tanpa sinyal redstone.", - "gui.refinedstorage2.scheduling_mode": "Mode penjadwalan", - "gui.refinedstorage2.scheduling_mode.default": "Bawaan", - "gui.refinedstorage2.scheduling_mode.default.help": "Gunakan filter yang tersedia terlebih dahulu.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Gunakan setiap filter secara bergilir.", - "gui.refinedstorage2.scheduling_mode.random": "Acak", - "gui.refinedstorage2.scheduling_mode.random.help": "Gunakan filter acak.", - "gui.refinedstorage2.priority": "Prioritas", - "gui.refinedstorage2.priority.storage_help": "Urutan dimana jaringan penyimpanan akan memasukkan atau mengekstrak sumber daya, mulai dari yang tertinggi.", - "gui.refinedstorage2.amount": "Jumlah", - "gui.refinedstorage2.amount.reset": "Atur Ulang", - "gui.refinedstorage2.amount.set": "Atur", - "gui.refinedstorage2.filter_mode": "Mode Filter", - "gui.refinedstorage2.filter_mode.allow": "Diizinkan", - "gui.refinedstorage2.filter_mode.block": "Diblokir", - "gui.refinedstorage2.fuzzy_mode": "Mode acak", - "gui.refinedstorage2.fuzzy_mode.on": "Hidup", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Cocokkan persis filter untuk daftar yang diizinkan atau yang diblokir.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Sesuaikan persis filter.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Sesuaikan persis filter ketika mengekstrak dari jaringan penyimpanan.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Sesuaikan persis filter ketika mengekstrak dari sumber.", - "gui.refinedstorage2.fuzzy_mode.off": "Nonaktif", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Cocokkan filter untuk daftar yang diizinkan atau yang diblokir tanpa membandingkan label NBT.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Sesuaikan filter tanpa membandingkan label NBT.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Sesuaikan filter ketika mengekstrak dari jaringan penyimpanan tanpa membandingkan label NBT.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Sesuaikan filter ketika mengekstrak dari sumber tanpa membandingkan label NBT.", - "gui.refinedstorage2.access_mode": "Modus akses", - "gui.refinedstorage2.access_mode.insert_extract": "Masukkan dan ekstrak", - "gui.refinedstorage2.access_mode.insert_extract.help": "Jaringan penyimpanan akan dapat memasukkan atau mengekstrak dari penyimpanan ini.", - "gui.refinedstorage2.access_mode.insert": "Masukkan saja", - "gui.refinedstorage2.access_mode.insert.help": "Jaringan penyimpanan hanya akan dapat memasukkan kedalam penyimpanan ini. Sumber daya masih dapat dilihat dalam Kisi.", - "gui.refinedstorage2.access_mode.extract": "Ekstrak saja", - "gui.refinedstorage2.access_mode.extract.help": "Jaringan penyimpanan hanya akan dapat mengekstrak dari penyimpanan ini.", - "gui.refinedstorage2.void_excess": "Kosongkan sumber daya berlebih", - "gui.refinedstorage2.void_excess.help": "Ketika mode kosongan kelebihan dihidupkan dan penyimpanan penuh, penyimpanan akan tetap menerima sumber daya akan tetapi akan mengosongkannya.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Kosongkan kelebihan hanya akan bekerja ketika penyimpanan dalam mode diizinkan.", - "gui.refinedstorage2.upgrade_slot": "Slot peningkatan kosong", - "gui.refinedstorage2.filter_slot.empty_filter": "Filter kosong", - "gui.refinedstorage2.filter_slot.left_click_for": "Klik kiri untuk", - "gui.refinedstorage2.filter_slot.right_click_for": "Klik kanan untuk", - "gui.refinedstorage2.filter_slot.click_to_clear": "Klik untuk membersihkan", - "gui.refinedstorage2.regulator_upgrade.filter_help": "Sumber daya yang harus diatur dalam sasaran.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Tidak aktif", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Kartu Jaringan Tidak Ditemukan", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d blok", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Tidak dapat diraih", - "gui.refinedstorage2.security_card.permission.reset": "Reset", - "gui.refinedstorage2.security_card.permission.modified": "Modified", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Menyediakan energi ke jaringan penyimpanan. dapat digunakan beberapa kali dalam satu jaringan penyimpanan.", - "item.refinedstorage2.creative_controller.help": "Menyediakan energi tidak terbatas ke jaringan penyimpanan.", - "item.refinedstorage2.disk_drive.help": "Menerima cakram penyimpanan untuk menyediakan ruang penyimpanan kedalam jaringan penyimpanan.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Memungkinkan untuk mengakses jaringan penyimpanan.", - "item.refinedstorage2.crafting_grid.help": "Memungkinkan untuk mengakses jaringan penyimpanan, dengan kemampuan untuk merakit.", - "item.refinedstorage2.importer.help": "Import sumber daya dari sumber eksternal kedalam jaringan penyimpanan.", - "item.refinedstorage2.exporter.help": "Ekspor sumber daya dari jaringan penyimpanan kedalam tujuan eksternal.", - "item.refinedstorage2.interface.help": "Berfungsi sebagai gabungan dari Importir dan Eksportir.", - "item.refinedstorage2.external_storage.help": "Menyediakan penyimpanan dari sumber eksternal kedalam jaringan penyimpanan.", - "item.refinedstorage2.detector.help": "Pancarkan sinyal redstone jika jaringan penyimpanan berisi sumber daya sama dengan, diatas atau dibawah jumlah yang ditentukan.", - "item.refinedstorage2.constructor.help": "Tempatkan balok dari jaringan penyimpanan ke dunia.", - "item.refinedstorage2.destructor.help": "Memecahkan balok dari dunia dan memasukkannya kedalam jaringan penyimpanan.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Besi yang Diperkaya Kuarsa", - "item.refinedstorage2.processor_binding": "Pengikat Prosesor", - "item.refinedstorage2.silicon": "Silikon", - "item.refinedstorage2.raw_basic_processor": "Procesor Dasar Mentah", - "item.refinedstorage2.raw_improved_processor": "Prosesor Ditingkatkan Mentah", - "item.refinedstorage2.raw_advanced_processor": "Prosesor Canggih Mentah", - "item.refinedstorage2.basic_processor": "Procesor Dasar", - "item.refinedstorage2.improved_processor": "Prosesor Ditingkatkan", - "item.refinedstorage2.advanced_processor": "Prosesor Canggih", - "item.refinedstorage2.1k_storage_part": "Suku Cadang Penyimpanan 1K", - "item.refinedstorage2.4k_storage_part": "Suku Cadang Penyimpanan 4K", - "item.refinedstorage2.16k_storage_part": "Suku Cadang Penyimpanan 16K", - "item.refinedstorage2.64k_storage_part": "Suku Cadang Penyimpanan 64K", - "item.refinedstorage2.1k_storage_disk": "Cakram Penyimpanan 1K", - "item.refinedstorage2.4k_storage_disk": "Cakram Penyimpanan 4K", - "item.refinedstorage2.16k_storage_disk": "Cakram Penyimpanan 16K", - "item.refinedstorage2.64k_storage_disk": "Cakram Penyimpanan 64K", - "item.refinedstorage2.creative_storage_disk": "Cakram Penyimpanan Kreatif", - "item.refinedstorage2.64b_fluid_storage_part": "Suku cadang Penyimpanan Cairan 64B", - "item.refinedstorage2.256b_fluid_storage_part": "Suku cadang Penyimpanan Cairan 256B", - "item.refinedstorage2.1024b_fluid_storage_part": "Suku cadang Penyimpanan Cairan 1024B", - "item.refinedstorage2.4096b_fluid_storage_part": "Suku cadang Penyimpanan Cairan 4096B", - "item.refinedstorage2.64b_fluid_storage_disk": "Cakram Penyimpanan Cairan 64B", - "item.refinedstorage2.256b_fluid_storage_disk": "Cakram Penyimpanan Cairan 256B", - "item.refinedstorage2.1024b_fluid_storage_disk": "Cakram Penyimpanan Cairan 1024B", - "item.refinedstorage2.4096b_fluid_storage_disk": "Cakram Penyimpanan Cairan 4096B", - "item.refinedstorage2.creative_fluid_storage_disk": "Cakram Penyimpanan Cairan Kreatif", - "item.refinedstorage2.storage_housing": "Kerangka Penyimpanan", - "item.refinedstorage2.construction_core": "Inti Pembangunan", - "item.refinedstorage2.destruction_core": "Inti Penghancuran", - "item.refinedstorage2.wrench": "Kunci inggris", - "item.refinedstorage2.wrench.helper": "Gunakan untuk memutar balok atau tekan SHIFT dan gunakan untuk membongkar balok Refined Storage.", - "item.refinedstorage2.upgrade": "Tingkatkan", - "item.refinedstorage2.speed_upgrade": "Peningkatan Kecepatan", - "item.refinedstorage2.stack_upgrade": "Peningkatan Tumpukan", - "item.refinedstorage2.silk_touch_upgrade": "Peningkatan Sentuhan Sutra", - "item.refinedstorage2.fortune_upgrade.1": "Peningkatan Peruntungan 1", - "item.refinedstorage2.fortune_upgrade.2": "Peningkatan Peruntungan 2", - "item.refinedstorage2.fortune_upgrade.3": "Peningkatan Peruntungan 3", - "item.refinedstorage2.regulator_upgrade": "Peningkatan Pengatur", - "item.refinedstorage2.regulator_upgrade.help": "Didalam Eksportir, hanya akan mengekspor jika jumlah sasaran kurang dari yang dikonfigurasi dalam peningkatan. Didalam Importir, hanya akan mengimpor jika jumlah sasaran lebih dari yang dikonfigurasi dalam peningkatan. Gunakan barang untuk mengonfigurasi.", - "item.refinedstorage2.range_upgrade": "Peningkatan Jangkauan", - "item.refinedstorage2.creative_range_upgrade": "Peningkatan Jangkauan Kreatif", - "item.refinedstorage2.wireless_grid": "Kisi Nirkabel", - "item.refinedstorage2.creative_wireless_grid": "Kisi Nirkabel Kreatif", - "item.refinedstorage2.wireless_transmitter.help": "Menyediakan akses jaringan nirkabel untuk barang seperti Kisi Nirkabel. Dapat digunakan beberapa dalam area untuk jangkauan yang lebih luas.", - "item.refinedstorage2.network_item.unbound": "Tidak terikat.", - "item.refinedstorage2.network_item.unbound.help": "Gunakan pada perangkat jaringan penyimpanan manapun untuk mengikat.", - "item.refinedstorage2.network_item.bound_to": "Terikat pada %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "Terdapat %s lebih dari satu di inventaris anda.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "Tidak ada %s di inventaris anda.", - "item.refinedstorage2.configuration_card": "Kartu Konfigurasi", - "item.refinedstorage2.configuration_card.empty": "Kosong.", - "item.refinedstorage2.configuration_card.configured": "Berisi konfigurasi untuk %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Menyalin konfigurasi untuk %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Konfigurasi dibersihkan.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Tidak dapat menerapkan kartu konfigurasi ke jenis perangkat yang berbeda. Kartu terkonfigurasi untuk %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Konfigurasi diterapkan.", - "item.refinedstorage2.configuration_card.empty_help": "Gunakan pada perangkat perangkat jaringan penyimpanan sambil berjongkok untuk menyalin konfigurasi dan peningkatannya kedalam kartu.", - "item.refinedstorage2.configuration_card.configured_help": "Gunakan pada perangkat jaringan penyimpanan tujuan sambil berjongkok untuk mengirimkan konfigurasi dan peningkatan. Gunakan sambil berjongkok untuk membersihkan.", - "item.refinedstorage2.network_card": "Kartu Jaringan", - "item.refinedstorage2.network_card.unbound_help": "Gunakan sambil berjongkok pada Penerima Jaringan.", - "item.refinedstorage2.network_card.unbound": "Tidak terikat.", - "item.refinedstorage2.network_card.bound_help": "Masukkan ke Pemancar Jaringan. Gunakan sambil berjongkok untuk membersihkan ikatan.", - "item.refinedstorage2.network_card.bound": "Terikat pada %d, %d, %d dalam %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Tersimpan: %s", - "misc.refinedstorage2.stored_with_capacity": "Tersimpan: %s / %s (%d%%)", - "misc.refinedstorage2.total": "Total %d", - "misc.refinedstorage2.last_modified.just_now": "Baru saja dirubah oleh %s", - "misc.refinedstorage2.last_modified.second": "Terakhir dirubah %d detik yang lalu oleh %s", - "misc.refinedstorage2.last_modified.seconds": "Terakhir dirubah %d detik yang lalu oleh %s", - "misc.refinedstorage2.last_modified.minute": "Terakhir dirubah %d menit yang lalu oleh %s", - "misc.refinedstorage2.last_modified.minutes": "Terakhir dirubah %d menit yang lalu oleh %s", - "misc.refinedstorage2.last_modified.hour": "Terakhir dirubah %d jam yang lalu oleh %s", - "misc.refinedstorage2.last_modified.hours": "Terakhir dirubah %d jam yang lalu oleh %s", - "misc.refinedstorage2.last_modified.day": "Terakhir dirubah %d hari yang lalu oleh %s", - "misc.refinedstorage2.last_modified.days": "Terakhir dirubah %d hari yang lalu oleh %s", - "misc.refinedstorage2.last_modified.week": "Terakhir dirubah %d minggu yang lalu oleh %s", - "misc.refinedstorage2.last_modified.weeks": "Terakhir dirubah %d minggu yang lalu oleh %s", - "misc.refinedstorage2.last_modified.year": "Terakhir dirubah %d tahun yang lalu oleh %s", - "misc.refinedstorage2.last_modified.years": "Terakhir dirubah %d tahun yang lalu oleh %s", - "misc.refinedstorage2.resource_type.item": "Barang", - "misc.refinedstorage2.resource_type.fluid": "Cairan", - "misc.refinedstorage2.press_shift_for_help": "Tekan SHIFT untuk bantuan", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Fokus pada kotak pencarian", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Singkirkan matriks Kisi Kerajinan ke jaringan", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Singkirkan matriks Kisi Kerajinan ke inventaris", - "key.refinedstorage2.open_wireless_grid": "Buka Kisi Nirkabel", - "refinedstorage2.subtitle.wrench": "Kunci inggris digunakan", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Kisi", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Font besar", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Mencegah pengurutan ketika SHIFT ditekan", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detail teks keterangan", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Ingat permintaan pencarian", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Memilih otomatis kotak pencarian", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Sinkronisasi", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Jenis sumber daya", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Arah Pengurutan", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Jenis pengurutan", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Kisi Kerajinan", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Perilaku menutup Matriks kerajinan", - "text.autoconfig.refinedstorage2.option.controller": "Pengendali", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Kapasitas daya", - "text.autoconfig.refinedstorage2.option.cable": "Kabel", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.diskDrive": "Lemari Cakram", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Pemakaian daya per cakram", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Balok Penyimpanan", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "Pemakaian daya 1K", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "Pemakaian daya 4K", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "Pemakaian daya 16K", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "Pemakaian daya 64K", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Pemakaian daya kreatif", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Balok Penyimpanan Cairan", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "Pemakaian daya 64M", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "Pemakaian daya 256M", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "Pemakaian daya 1024M", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "Pemakaian daya 4096M", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Pemakaian daya kreatif", - "text.autoconfig.refinedstorage2.option.importer": "Importir", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.exporter": "Eksportir", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.detector": "Pendeteksi", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.constructor": "Pembangun", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.destructor": "Penghancur", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.upgrade": "Peningkatan", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Pemakaian daya peningkat kecepatan", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Pemakaian daya peningkat tumpukan", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Pemakaian daya peningkat peruntungan 1", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Pemakaian daya peningkat peruntungan 2", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Pemakaian daya peningkat peruntungan 3", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Pemakaian daya peningkat sentuhan sutra", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Pemakaian daya peningkat pengatur", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Pemakaian daya peningkat jangkauan", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Pemakaian daya peningkat jangkauan kreatif", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Rentang Peningkatan Jangkauan", - "text.autoconfig.refinedstorage2.option.iface": "Antarmuka", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.externalStorage": "Penyimpanan Eksternal", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Kisi Nirkabel", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Kapasitas energi", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Buka pemakaian daya", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Masukkan pemakaian daya", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Ekstrak pemakaian daya", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Pemancar Nirkabel", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Jangkauan Dasar", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Monitor Penyimpanan", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Penerima Jaringan", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Pemancar Jaringan", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Pemakaian daya", - "text.autoconfig.refinedstorage2.option.portableGrid": "Kisi Portabel", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Kapasitas energi", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Buka pemakaian daya", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Masukkan pemakaian daya", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Ekstrak pemakaian daya", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Menyambungkan", - "advancements.refinedstorage2.connecting.description": "Gunakan Kabel untuk menghubungkan perangkat satu sama lain, atau letakkan perangkat melawan satu sama lain", - "advancements.refinedstorage2.drives": "Cakram", - "advancements.refinedstorage2.drives.description": "Rakit Lemari Cakram untuk menyimpan cakram penyimpanan anda", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Menyimpan Barang", - "advancements.refinedstorage2.storing_items.description": "Rakit Cakram Penyimpanan dan letakkan kedalam Lemari Cakram anda", - "advancements.refinedstorage2.viewing_your_storage": "Melihat penyimpanan anda", - "advancements.refinedstorage2.viewing_your_storage.description": "Rakit Kisi untuk berinteraksi dengan penyimpanan anda", - "advancements.refinedstorage2.upgrading_your_grid": "Meningkatkan Kisi anda", - "advancements.refinedstorage2.upgrading_your_grid.description": "Tingkatkan Kisi anda menjadi Kisi Kerajinan untuk mendapatkan kemampuan kerajinan", - "advancements.refinedstorage2.storing_fluids": "Menyimpan cairan", - "advancements.refinedstorage2.storing_fluids.description": "Rakit Cakram Penyimpanan Cairan dan letakkan kedalam Lemari Cakram anda", - "advancements.refinedstorage2.importing": "Pengimporan", - "advancements.refinedstorage2.importing.description": "Masukkan sumber daya kedalam jaringan penyimpanan menggunakan Importir", - "advancements.refinedstorage2.exporting": "Pengeksporan", - "advancements.refinedstorage2.exporting.description": "Keluarkan sumberdaya dari jaringan penyimpanan menggunakan Eksportir", - "advancements.refinedstorage2.upgrading": "Meningkatkan", - "advancements.refinedstorage2.upgrading.description": "Rakit Peningkatan untuk meningkatkan berbagai perangkat", - "advancements.refinedstorage2.interface_to_the_world": "Antarmuka ke dunia", - "advancements.refinedstorage2.interface_to_the_world.description": "Ekspor dan Impor barang secara bersamaan dengan Antarmuka", - "advancements.refinedstorage2.storing_externally": "Menyimpan secara eksternal", - "advancements.refinedstorage2.storing_externally.description": "Gunakan Penyimpanan Eksternal untuk menyediakan jaringan dengan penyimpanan dari balok eksternal seperti peti", - "advancements.refinedstorage2.detecting": "Mendeteksi", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Pembangunan", - "advancements.refinedstorage2.construction.description": "Tempatkan balok dari jaringan penyimpanan ke dunia menggunakan Pembangun", - "advancements.refinedstorage2.destruction": "Penghancuran", - "advancements.refinedstorage2.destruction.description": "Peroleh balok dari dunia kedalam jaringan penyimpanan menggunakan Penghancur", - "advancements.refinedstorage2.wireless": "Nirkabel", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Lebih baik dari tong", - "advancements.refinedstorage2.better_than_a_barrel.description": "Rakit Monitor Penyimpanan untuk melihat, memasukkan atau mengekstrak sumber daya dalam jaringan penyimpanan", - "advancements.refinedstorage2.no_cables_required": "Tidak memerlukan kabel", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Penyimpanan portabel", - "advancements.refinedstorage2.portable_storage.description": "Rakit Kisi Portabel untuk mengakses isi dari cakram tanpa memerlukan jaringan penyimpanan", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/it_it.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/it_it.json deleted file mode 100644 index 79efad7d4..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/it_it.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Cable", - "block.refinedstorage2.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", - "block.refinedstorage2.disk_drive": "Disk Drive", - "block.refinedstorage2.machine_casing": "Machine Casing", - "block.refinedstorage2.grid": "Grid", - "block.refinedstorage2.crafting_grid": "Crafting Grid", - "block.refinedstorage2.controller": "Controller", - "block.refinedstorage2.creative_controller": "Creative Controller", - "block.refinedstorage2.1k_storage_block": "1K Storage Block", - "block.refinedstorage2.4k_storage_block": "4K Storage Block", - "block.refinedstorage2.16k_storage_block": "16K Storage Block", - "block.refinedstorage2.64k_storage_block": "64K Storage Block", - "block.refinedstorage2.creative_storage_block": "Creative Storage Block", - "block.refinedstorage2.64b_fluid_storage_block": "64B Fluid Storage Block", - "block.refinedstorage2.256b_fluid_storage_block": "256B Fluid Storage Block", - "block.refinedstorage2.1024b_fluid_storage_block": "1024B Fluid Storage Block", - "block.refinedstorage2.4096b_fluid_storage_block": "4096B Fluid Storage Block", - "block.refinedstorage2.creative_fluid_storage_block": "Creative Fluid Storage Block", - "block.refinedstorage2.importer": "Importer", - "block.refinedstorage2.exporter": "Exporter", - "block.refinedstorage2.interface": "Interface", - "block.refinedstorage2.external_storage": "External Storage", - "block.refinedstorage2.detector": "Detector", - "block.refinedstorage2.constructor": "Constructor", - "block.refinedstorage2.destructor": "Destructor", - "block.refinedstorage2.wireless_transmitter": "Wireless Transmitter", - "block.refinedstorage2.storage_monitor": "Storage Monitor", - "block.refinedstorage2.network_receiver": "Network Receiver", - "block.refinedstorage2.network_transmitter": "Network Transmitter", - "block.refinedstorage2.portable_grid": "Portable Grid", - "block.refinedstorage2.creative_portable_grid": "Creative Portable Grid", - "block.refinedstorage2.security_manager": "Security Manager", - "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", - "gui.refinedstorage2.disk_drive.disks": "Disks", - "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage2.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "Sorting direction", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Ascending", - "gui.refinedstorage2.grid.sorting.direction.descending": "Descending", - "gui.refinedstorage2.grid.sorting.type": "Sorting type", - "gui.refinedstorage2.grid.sorting.type.quantity": "Quantity", - "gui.refinedstorage2.grid.sorting.type.name": "Name", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Last modified", - "gui.refinedstorage2.grid.auto_selected": "Auto-selected", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "Synchronization mode", - "gui.refinedstorage2.grid.synchronizer.off": "Off", - "gui.refinedstorage2.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage2.grid.resource_type": "Resource type", - "gui.refinedstorage2.grid.resource_type.all": "All", - "gui.refinedstorage2.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage2.crafting_grid.move.network": "Move items to network", - "gui.refinedstorage2.crafting_grid.move.inventory": "Move items to inventory", - "gui.refinedstorage2.screen_size": "Screen size", - "gui.refinedstorage2.screen_size.stretch": "Stretch", - "gui.refinedstorage2.screen_size.small": "Small", - "gui.refinedstorage2.screen_size.medium": "Medium", - "gui.refinedstorage2.screen_size.large": "Large", - "gui.refinedstorage2.screen_size.extra_large": "Extra large", - "gui.refinedstorage2.detector.mode": "Mode", - "gui.refinedstorage2.detector.mode.under": "Emit redstone signal when under the amount", - "gui.refinedstorage2.detector.mode.equal": "Emit redstone signal when on the amount", - "gui.refinedstorage2.detector.mode.above": "Emit redstone signal when above the amount", - "gui.refinedstorage2.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage2.destructor.pickup_items": "Pickup items instead of breaking", - "gui.refinedstorage2.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "Drop items instead of placing blocks", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d block(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage2.redstone_mode": "Redstone mode", - "gui.refinedstorage2.redstone_mode.ignore": "Ignore", - "gui.refinedstorage2.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage2.redstone_mode.high": "High", - "gui.refinedstorage2.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage2.redstone_mode.low": "Low", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Scheduling mode", - "gui.refinedstorage2.scheduling_mode.default": "Default", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "Random", - "gui.refinedstorage2.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage2.priority": "Priority", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Amount", - "gui.refinedstorage2.amount.reset": "Reset", - "gui.refinedstorage2.amount.set": "Set", - "gui.refinedstorage2.filter_mode": "Filter mode", - "gui.refinedstorage2.filter_mode.allow": "Allowlist", - "gui.refinedstorage2.filter_mode.block": "Blocklist", - "gui.refinedstorage2.fuzzy_mode": "Fuzzy mode", - "gui.refinedstorage2.fuzzy_mode.on": "On", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Off", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Access mode", - "gui.refinedstorage2.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Insert only", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Extract only", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Void excess resources", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d block(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Unreachable", - "gui.refinedstorage2.security_card.permission.reset": "Reset", - "gui.refinedstorage2.security_card.permission.modified": "Modified", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicon", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage2.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage2.basic_processor": "Basic Processor", - "item.refinedstorage2.improved_processor": "Improved Processor", - "item.refinedstorage2.advanced_processor": "Advanced Processor", - "item.refinedstorage2.1k_storage_part": "1K Storage Part", - "item.refinedstorage2.4k_storage_part": "4K Storage Part", - "item.refinedstorage2.16k_storage_part": "16K Storage Part", - "item.refinedstorage2.64k_storage_part": "64K Storage Part", - "item.refinedstorage2.1k_storage_disk": "1K Storage Disk", - "item.refinedstorage2.4k_storage_disk": "4K Storage Disk", - "item.refinedstorage2.16k_storage_disk": "16K Storage Disk", - "item.refinedstorage2.64k_storage_disk": "64K Storage Disk", - "item.refinedstorage2.creative_storage_disk": "Creative Storage Disk", - "item.refinedstorage2.64b_fluid_storage_part": "64B Fluid Storage Part", - "item.refinedstorage2.256b_fluid_storage_part": "256B Fluid Storage Part", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ja_jp.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ja_jp.json deleted file mode 100644 index a65ee59d3..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ja_jp.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "ケーブル", - "block.refinedstorage2.quartz_enriched_iron_block": "クォーツ濃縮鉄ブロック", - "block.refinedstorage2.disk_drive": "ディスクドライブ", - "block.refinedstorage2.machine_casing": "マシンケーシング", - "block.refinedstorage2.grid": "グリッド", - "block.refinedstorage2.crafting_grid": "クラフトグリッド", - "block.refinedstorage2.controller": "コントローラー", - "block.refinedstorage2.creative_controller": "クリエイティブコントローラー", - "block.refinedstorage2.1k_storage_block": "1Kストレージブロック", - "block.refinedstorage2.4k_storage_block": "4Kストレージブロック", - "block.refinedstorage2.16k_storage_block": "16Kストレージブロック", - "block.refinedstorage2.64k_storage_block": "64Kストレージブロック", - "block.refinedstorage2.creative_storage_block": "クリエイティブストレージブロック", - "block.refinedstorage2.64b_fluid_storage_block": "64B流体ストレージブロック", - "block.refinedstorage2.256b_fluid_storage_block": "256B流体ストレージブロック", - "block.refinedstorage2.1024b_fluid_storage_block": "1024B流体ストレージブロック", - "block.refinedstorage2.4096b_fluid_storage_block": "4096B流体ストレージブロック", - "block.refinedstorage2.creative_fluid_storage_block": "クリエイティブ流体ストレージブロック", - "block.refinedstorage2.importer": "インポーター", - "block.refinedstorage2.exporter": "エクスポーター", - "block.refinedstorage2.interface": "インターフェース", - "block.refinedstorage2.external_storage": "外部ストレージ", - "block.refinedstorage2.detector": "ディテクター", - "block.refinedstorage2.constructor": "コンストラクター", - "block.refinedstorage2.destructor": "ディストラクター", - "block.refinedstorage2.wireless_transmitter": "ワイヤレス送信機", - "block.refinedstorage2.storage_monitor": "ストレージモニター", - "block.refinedstorage2.network_receiver": "ネットワーク受信機", - "block.refinedstorage2.network_transmitter": "ネットワーク送信機", - "block.refinedstorage2.portable_grid": "携帯グリッド", - "block.refinedstorage2.creative_portable_grid": "クリエイティブ携帯グリッド", - "block.refinedstorage2.security_manager": "セキュリティマネージャー", - "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", - "block.refinedstorage2.relay": "リレー", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", - "gui.refinedstorage2.disk_drive.disks": "ディスク", - "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage2.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "並び順", - "gui.refinedstorage2.grid.sorting.direction.ascending": "昇順", - "gui.refinedstorage2.grid.sorting.direction.descending": "降順", - "gui.refinedstorage2.grid.sorting.type": "並べ替え", - "gui.refinedstorage2.grid.sorting.type.quantity": "量", - "gui.refinedstorage2.grid.sorting.type.name": "名前", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "最終変更時間", - "gui.refinedstorage2.grid.auto_selected": "自動選択", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "同期モード", - "gui.refinedstorage2.grid.synchronizer.off": "オフ", - "gui.refinedstorage2.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage2.grid.resource_type": "リソースの種類", - "gui.refinedstorage2.grid.resource_type.all": "すべて", - "gui.refinedstorage2.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage2.crafting_grid.move.network": "アイテムをネットワークに移動", - "gui.refinedstorage2.crafting_grid.move.inventory": "アイテムをインベントリに移動", - "gui.refinedstorage2.screen_size": "画面サイズ", - "gui.refinedstorage2.screen_size.stretch": "連動", - "gui.refinedstorage2.screen_size.small": "小", - "gui.refinedstorage2.screen_size.medium": "中", - "gui.refinedstorage2.screen_size.large": "大", - "gui.refinedstorage2.screen_size.extra_large": "特大", - "gui.refinedstorage2.detector.mode": "モード", - "gui.refinedstorage2.detector.mode.under": "指定数を下回るとレッドストーン信号を出力", - "gui.refinedstorage2.detector.mode.equal": "指定数と同量でレッドストーン信号を出力", - "gui.refinedstorage2.detector.mode.above": "指定数を上回るとレッドストーン信号を出力", - "gui.refinedstorage2.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage2.destructor.pickup_items": "ブロックを破壊せずにアイテムを拾う", - "gui.refinedstorage2.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "ブロックを設置せずにアイテム化させる", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%dブロック", - "gui.refinedstorage2.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage2.redstone_mode": "レッドストーン", - "gui.refinedstorage2.redstone_mode.ignore": "無視", - "gui.refinedstorage2.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage2.redstone_mode.high": "高", - "gui.refinedstorage2.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage2.redstone_mode.low": "低", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "スケジュールモード", - "gui.refinedstorage2.scheduling_mode.default": "デフォルト", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "ラウンドロビン", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "ランダム", - "gui.refinedstorage2.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage2.priority": "優先度", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "量", - "gui.refinedstorage2.amount.reset": "リセット", - "gui.refinedstorage2.amount.set": "設定", - "gui.refinedstorage2.filter_mode": "フィルターモード", - "gui.refinedstorage2.filter_mode.allow": "ホワイトリスト", - "gui.refinedstorage2.filter_mode.block": "ブラックリスト", - "gui.refinedstorage2.fuzzy_mode": "曖昧モード", - "gui.refinedstorage2.fuzzy_mode.on": "オン", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "オフ", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "アクセスモード", - "gui.refinedstorage2.access_mode.insert_extract": "搬入・搬出", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "搬入のみ", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "搬出のみ", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "余分なリソースを破棄", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%dブロック", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "アクセス不可", - "gui.refinedstorage2.security_card.permission.reset": "リセット", - "gui.refinedstorage2.security_card.permission.modified": "変更済み", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "通過", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "エネルギーを通過", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "ストレージを通過", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "セキュリティを通過", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "クォーツ濃縮鉄", - "item.refinedstorage2.processor_binding": "プロセッサ接合材", - "item.refinedstorage2.silicon": "シリコン", - "item.refinedstorage2.raw_basic_processor": "生の基本プロセッサ", - "item.refinedstorage2.raw_improved_processor": "生の改良プロセッサ", - "item.refinedstorage2.raw_advanced_processor": "生の発展プロセッサ", - "item.refinedstorage2.basic_processor": "基本プロセッサ", - "item.refinedstorage2.improved_processor": "改良プロセッサ", - "item.refinedstorage2.advanced_processor": "発展プロセッサ", - "item.refinedstorage2.1k_storage_part": "1Kストレージパーツ", - "item.refinedstorage2.4k_storage_part": "4Kストレージパーツ", - "item.refinedstorage2.16k_storage_part": "16Kストレージパーツ", - "item.refinedstorage2.64k_storage_part": "64Kストレージパーツ", - "item.refinedstorage2.1k_storage_disk": "1Kストレージディスク", - "item.refinedstorage2.4k_storage_disk": "4Kストレージディスク", - "item.refinedstorage2.16k_storage_disk": "16Kストレージディスク", - "item.refinedstorage2.64k_storage_disk": "64Kストレージディスク", - "item.refinedstorage2.creative_storage_disk": "クリエイティブストレージディスク", - "item.refinedstorage2.64b_fluid_storage_part": "64B流体ストレージパーツ", - "item.refinedstorage2.256b_fluid_storage_part": "256B流体ストレージパーツ", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ko_kr.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ko_kr.json deleted file mode 100644 index 79efad7d4..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ko_kr.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Cable", - "block.refinedstorage2.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", - "block.refinedstorage2.disk_drive": "Disk Drive", - "block.refinedstorage2.machine_casing": "Machine Casing", - "block.refinedstorage2.grid": "Grid", - "block.refinedstorage2.crafting_grid": "Crafting Grid", - "block.refinedstorage2.controller": "Controller", - "block.refinedstorage2.creative_controller": "Creative Controller", - "block.refinedstorage2.1k_storage_block": "1K Storage Block", - "block.refinedstorage2.4k_storage_block": "4K Storage Block", - "block.refinedstorage2.16k_storage_block": "16K Storage Block", - "block.refinedstorage2.64k_storage_block": "64K Storage Block", - "block.refinedstorage2.creative_storage_block": "Creative Storage Block", - "block.refinedstorage2.64b_fluid_storage_block": "64B Fluid Storage Block", - "block.refinedstorage2.256b_fluid_storage_block": "256B Fluid Storage Block", - "block.refinedstorage2.1024b_fluid_storage_block": "1024B Fluid Storage Block", - "block.refinedstorage2.4096b_fluid_storage_block": "4096B Fluid Storage Block", - "block.refinedstorage2.creative_fluid_storage_block": "Creative Fluid Storage Block", - "block.refinedstorage2.importer": "Importer", - "block.refinedstorage2.exporter": "Exporter", - "block.refinedstorage2.interface": "Interface", - "block.refinedstorage2.external_storage": "External Storage", - "block.refinedstorage2.detector": "Detector", - "block.refinedstorage2.constructor": "Constructor", - "block.refinedstorage2.destructor": "Destructor", - "block.refinedstorage2.wireless_transmitter": "Wireless Transmitter", - "block.refinedstorage2.storage_monitor": "Storage Monitor", - "block.refinedstorage2.network_receiver": "Network Receiver", - "block.refinedstorage2.network_transmitter": "Network Transmitter", - "block.refinedstorage2.portable_grid": "Portable Grid", - "block.refinedstorage2.creative_portable_grid": "Creative Portable Grid", - "block.refinedstorage2.security_manager": "Security Manager", - "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", - "gui.refinedstorage2.disk_drive.disks": "Disks", - "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage2.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "Sorting direction", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Ascending", - "gui.refinedstorage2.grid.sorting.direction.descending": "Descending", - "gui.refinedstorage2.grid.sorting.type": "Sorting type", - "gui.refinedstorage2.grid.sorting.type.quantity": "Quantity", - "gui.refinedstorage2.grid.sorting.type.name": "Name", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Last modified", - "gui.refinedstorage2.grid.auto_selected": "Auto-selected", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "Synchronization mode", - "gui.refinedstorage2.grid.synchronizer.off": "Off", - "gui.refinedstorage2.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage2.grid.resource_type": "Resource type", - "gui.refinedstorage2.grid.resource_type.all": "All", - "gui.refinedstorage2.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage2.crafting_grid.move.network": "Move items to network", - "gui.refinedstorage2.crafting_grid.move.inventory": "Move items to inventory", - "gui.refinedstorage2.screen_size": "Screen size", - "gui.refinedstorage2.screen_size.stretch": "Stretch", - "gui.refinedstorage2.screen_size.small": "Small", - "gui.refinedstorage2.screen_size.medium": "Medium", - "gui.refinedstorage2.screen_size.large": "Large", - "gui.refinedstorage2.screen_size.extra_large": "Extra large", - "gui.refinedstorage2.detector.mode": "Mode", - "gui.refinedstorage2.detector.mode.under": "Emit redstone signal when under the amount", - "gui.refinedstorage2.detector.mode.equal": "Emit redstone signal when on the amount", - "gui.refinedstorage2.detector.mode.above": "Emit redstone signal when above the amount", - "gui.refinedstorage2.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage2.destructor.pickup_items": "Pickup items instead of breaking", - "gui.refinedstorage2.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "Drop items instead of placing blocks", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d block(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage2.redstone_mode": "Redstone mode", - "gui.refinedstorage2.redstone_mode.ignore": "Ignore", - "gui.refinedstorage2.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage2.redstone_mode.high": "High", - "gui.refinedstorage2.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage2.redstone_mode.low": "Low", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Scheduling mode", - "gui.refinedstorage2.scheduling_mode.default": "Default", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "Random", - "gui.refinedstorage2.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage2.priority": "Priority", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Amount", - "gui.refinedstorage2.amount.reset": "Reset", - "gui.refinedstorage2.amount.set": "Set", - "gui.refinedstorage2.filter_mode": "Filter mode", - "gui.refinedstorage2.filter_mode.allow": "Allowlist", - "gui.refinedstorage2.filter_mode.block": "Blocklist", - "gui.refinedstorage2.fuzzy_mode": "Fuzzy mode", - "gui.refinedstorage2.fuzzy_mode.on": "On", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Off", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Access mode", - "gui.refinedstorage2.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Insert only", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Extract only", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Void excess resources", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d block(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Unreachable", - "gui.refinedstorage2.security_card.permission.reset": "Reset", - "gui.refinedstorage2.security_card.permission.modified": "Modified", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicon", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage2.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage2.basic_processor": "Basic Processor", - "item.refinedstorage2.improved_processor": "Improved Processor", - "item.refinedstorage2.advanced_processor": "Advanced Processor", - "item.refinedstorage2.1k_storage_part": "1K Storage Part", - "item.refinedstorage2.4k_storage_part": "4K Storage Part", - "item.refinedstorage2.16k_storage_part": "16K Storage Part", - "item.refinedstorage2.64k_storage_part": "64K Storage Part", - "item.refinedstorage2.1k_storage_disk": "1K Storage Disk", - "item.refinedstorage2.4k_storage_disk": "4K Storage Disk", - "item.refinedstorage2.16k_storage_disk": "16K Storage Disk", - "item.refinedstorage2.64k_storage_disk": "64K Storage Disk", - "item.refinedstorage2.creative_storage_disk": "Creative Storage Disk", - "item.refinedstorage2.64b_fluid_storage_part": "64B Fluid Storage Part", - "item.refinedstorage2.256b_fluid_storage_part": "256B Fluid Storage Part", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/nl_nl.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/nl_nl.json deleted file mode 100644 index 0e58472c8..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/nl_nl.json +++ /dev/null @@ -1,367 +0,0 @@ -{ - "itemGroup.refinedstorage2.general": "Refined Storage 2", - "block.refinedstorage2.cable": "Cable", - "block.refinedstorage2.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", - "block.refinedstorage2.disk_drive": "Disk Drive", - "block.refinedstorage2.machine_casing": "Machine Casing", - "block.refinedstorage2.grid": "Grid", - "block.refinedstorage2.crafting_grid": "Crafting Grid", - "block.refinedstorage2.controller": "Controller", - "block.refinedstorage2.controller.rei_fully_charged": "Fully charged Controller", - "block.refinedstorage2.creative_controller": "Creative Controller", - "block.refinedstorage2.1k_storage_block": "1K Storage Block", - "block.refinedstorage2.4k_storage_block": "4K Storage Block", - "block.refinedstorage2.16k_storage_block": "16K Storage Block", - "block.refinedstorage2.64k_storage_block": "64K Storage Block", - "block.refinedstorage2.creative_storage_block": "Creative Storage Block", - "block.refinedstorage2.64b_fluid_storage_block": "64B Fluid Storage Block", - "block.refinedstorage2.256b_fluid_storage_block": "256B Fluid Storage Block", - "block.refinedstorage2.1024b_fluid_storage_block": "1024B Fluid Storage Block", - "block.refinedstorage2.4096b_fluid_storage_block": "4096B Fluid Storage Block", - "block.refinedstorage2.creative_fluid_storage_block": "Creative Fluid Storage Block", - "block.refinedstorage2.importer": "Importer", - "block.refinedstorage2.exporter": "Exporter", - "block.refinedstorage2.interface": "Interface", - "block.refinedstorage2.external_storage": "External Storage", - "block.refinedstorage2.detector": "Detector", - "block.refinedstorage2.constructor": "Constructor", - "block.refinedstorage2.destructor": "Destructor", - "block.refinedstorage2.wireless_transmitter": "Wireless Transmitter", - "block.refinedstorage2.storage_monitor": "Storage Monitor", - "block.refinedstorage2.network_receiver": "Network Receiver", - "block.refinedstorage2.network_transmitter": "Network Transmitter", - "block.refinedstorage2.portable_grid": "Portable Grid", - "block.refinedstorage2.creative_portable_grid": "Creative Portable Grid", - "gui.refinedstorage2.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", - "gui.refinedstorage2.disk_drive.disks": "Disks", - "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage2.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "Sorting direction", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Ascending", - "gui.refinedstorage2.grid.sorting.direction.descending": "Descending", - "gui.refinedstorage2.grid.sorting.type": "Sorting type", - "gui.refinedstorage2.grid.sorting.type.quantity": "Quantity", - "gui.refinedstorage2.grid.sorting.type.name": "Name", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Last modified", - "gui.refinedstorage2.grid.size": "Size", - "gui.refinedstorage2.grid.size.stretch": "Stretch", - "gui.refinedstorage2.grid.size.small": "Small", - "gui.refinedstorage2.grid.size.medium": "Medium", - "gui.refinedstorage2.grid.size.large": "Large", - "gui.refinedstorage2.grid.size.extra_large": "Extra large", - "gui.refinedstorage2.grid.auto_selected": "Auto-selected", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "Synchronization mode", - "gui.refinedstorage2.grid.synchronizer.off": "Off", - "gui.refinedstorage2.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage2.grid.synchronizer.jei": "JEI", - "gui.refinedstorage2.grid.synchronizer.jei.help": "Sync the search box text to the JEI filter.", - "gui.refinedstorage2.grid.synchronizer.jei.two_way": "JEI two-way", - "gui.refinedstorage2.grid.synchronizer.jei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text.", - "gui.refinedstorage2.grid.synchronizer.rei": "REI", - "gui.refinedstorage2.grid.synchronizer.rei.help": "Sync the search box text to the REI filter.", - "gui.refinedstorage2.grid.synchronizer.rei.two_way": "REI two-way", - "gui.refinedstorage2.grid.synchronizer.rei.two_way.help": "Sync the search box text to the JEI filter, and the JEI filter to the search box text.", - "gui.refinedstorage2.grid.resource_type": "Resource type", - "gui.refinedstorage2.grid.resource_type.all": "All", - "gui.refinedstorage2.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage2.crafting_grid.move.network": "Move items to network", - "gui.refinedstorage2.crafting_grid.move.inventory": "Move items to inventory", - "gui.refinedstorage2.detector.mode": "Mode", - "gui.refinedstorage2.detector.mode.under": "Emit redstone signal when under the amount", - "gui.refinedstorage2.detector.mode.equal": "Emit redstone signal when on the amount", - "gui.refinedstorage2.detector.mode.above": "Emit redstone signal when above the amount", - "gui.refinedstorage2.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage2.destructor.pickup_items": "Pickup items instead of breaking", - "gui.refinedstorage2.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "Drop items instead of placing blocks", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d block(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage2.redstone_mode": "Redstone mode", - "gui.refinedstorage2.redstone_mode.ignore": "Ignore", - "gui.refinedstorage2.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage2.redstone_mode.high": "High", - "gui.refinedstorage2.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage2.redstone_mode.low": "Low", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Scheduling mode", - "gui.refinedstorage2.scheduling_mode.default": "Default", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "Random", - "gui.refinedstorage2.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage2.priority": "Priority", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Amount", - "gui.refinedstorage2.amount.reset": "Reset", - "gui.refinedstorage2.amount.set": "Set", - "gui.refinedstorage2.filter_mode": "Filter mode", - "gui.refinedstorage2.filter_mode.allow": "Allowlist", - "gui.refinedstorage2.filter_mode.block": "Blocklist", - "gui.refinedstorage2.fuzzy_mode": "Fuzzy mode", - "gui.refinedstorage2.fuzzy_mode.on": "On", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Off", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Access mode", - "gui.refinedstorage2.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Insert only", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Extract only", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Void excess resources", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d block(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Unreachable", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicon", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage2.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage2.basic_processor": "Basic Processor", - "item.refinedstorage2.improved_processor": "Improved Processor", - "item.refinedstorage2.advanced_processor": "Advanced Processor", - "item.refinedstorage2.1k_storage_part": "1K Storage Part", - "item.refinedstorage2.4k_storage_part": "4K Storage Part", - "item.refinedstorage2.16k_storage_part": "16K Storage Part", - "item.refinedstorage2.64k_storage_part": "64K Storage Part", - "item.refinedstorage2.1k_storage_disk": "1K Storage Disk", - "item.refinedstorage2.4k_storage_disk": "4K Storage Disk", - "item.refinedstorage2.16k_storage_disk": "16K Storage Disk", - "item.refinedstorage2.64k_storage_disk": "64K Storage Disk", - "item.refinedstorage2.creative_storage_disk": "Creative Storage Disk", - "item.refinedstorage2.64b_fluid_storage_part": "64B Fluid Storage Part", - "item.refinedstorage2.256b_fluid_storage_part": "256B Fluid Storage Part", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "category.refinedstorage2.key_bindings": "Refined Storage 2", - "curios.identifier.refinedstorage2": "Refined Storage 2", - "trinkets.slot.refinedstorage2.wireless": "Refined Storage 2", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.maxRowsStretch": "Maximum amount of rows when stretched", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.grid.size": "Size", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid.", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/pl_pl.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/pl_pl.json deleted file mode 100644 index 3d6f7d4c9..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/pl_pl.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Kabel", - "block.refinedstorage2.quartz_enriched_iron_block": "Blok kwarcowego żelaza", - "block.refinedstorage2.disk_drive": "Napęd dysku", - "block.refinedstorage2.machine_casing": "Osłona maszyny", - "block.refinedstorage2.grid": "Terminal", - "block.refinedstorage2.crafting_grid": "Terminal rzemieślniczy", - "block.refinedstorage2.controller": "Kontroler", - "block.refinedstorage2.creative_controller": "Kontroler kreatywny", - "block.refinedstorage2.1k_storage_block": "Blok pamięci 1k", - "block.refinedstorage2.4k_storage_block": "Blok pamięci 4k", - "block.refinedstorage2.16k_storage_block": "Blok pamięci 16k", - "block.refinedstorage2.64k_storage_block": "Blok pamięci 64k", - "block.refinedstorage2.creative_storage_block": "Kreatywny blok pamięci", - "block.refinedstorage2.64b_fluid_storage_block": "Blok pamięci płynów 64B", - "block.refinedstorage2.256b_fluid_storage_block": "Blok pamięci płynów 256B", - "block.refinedstorage2.1024b_fluid_storage_block": "Blok pamięci płynów 1024B", - "block.refinedstorage2.4096b_fluid_storage_block": "Blok pamięci płynów 4096B", - "block.refinedstorage2.creative_fluid_storage_block": "Kreatywny blok pamięci płynów", - "block.refinedstorage2.importer": "Importer", - "block.refinedstorage2.exporter": "Eksporter", - "block.refinedstorage2.interface": "Interfejs", - "block.refinedstorage2.external_storage": "Zewnętrzny magazyn", - "block.refinedstorage2.detector": "Detektor", - "block.refinedstorage2.constructor": "Konstruktor", - "block.refinedstorage2.destructor": "Destruktor", - "block.refinedstorage2.wireless_transmitter": "Nadajnik bezprzewodowy", - "block.refinedstorage2.storage_monitor": "Monitor magazynu", - "block.refinedstorage2.network_receiver": "Odbiornik sieci", - "block.refinedstorage2.network_transmitter": "Nadajnik sieci", - "block.refinedstorage2.portable_grid": "Przenośny terminal", - "block.refinedstorage2.creative_portable_grid": "Kreatywny przenośny terminal", - "block.refinedstorage2.security_manager": "Security Manager", - "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "Gdy to urządzenie jest nieaktywne, sieć magazynowa nie będzie w stanie używać tego urządzenia jako źródła energii.", - "gui.refinedstorage2.disk_drive.disks": "Dyski", - "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage2.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "Kierunek sortowania", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Rosnąco", - "gui.refinedstorage2.grid.sorting.direction.descending": "Malejąco", - "gui.refinedstorage2.grid.sorting.type": "Rodzaj sortowania", - "gui.refinedstorage2.grid.sorting.type.quantity": "Ilość", - "gui.refinedstorage2.grid.sorting.type.name": "Nazwa", - "gui.refinedstorage2.grid.sorting.type.id": "Identyfikator", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Ostatnia modyfikacja", - "gui.refinedstorage2.grid.auto_selected": "Automatycznie zaznaczone", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "Tryb synchronizacji", - "gui.refinedstorage2.grid.synchronizer.off": "Wyłączone", - "gui.refinedstorage2.grid.synchronizer.off.help": "Nie synchronizuj tekstu pola wyszukiwania.", - "gui.refinedstorage2.grid.resource_type": "Typ zasobu", - "gui.refinedstorage2.grid.resource_type.all": "Wszystko", - "gui.refinedstorage2.grid.resource_type.help": "Filtruj określone typy zasobów.", - "gui.refinedstorage2.crafting_grid.move.network": "Przenieś przedmioty do sieci", - "gui.refinedstorage2.crafting_grid.move.inventory": "Przenieś przedmioty do ekwipunku", - "gui.refinedstorage2.screen_size": "Screen size", - "gui.refinedstorage2.screen_size.stretch": "Stretch", - "gui.refinedstorage2.screen_size.small": "Small", - "gui.refinedstorage2.screen_size.medium": "Medium", - "gui.refinedstorage2.screen_size.large": "Large", - "gui.refinedstorage2.screen_size.extra_large": "Extra large", - "gui.refinedstorage2.detector.mode": "Tryb", - "gui.refinedstorage2.detector.mode.under": "Emituj sygnał redstone, kiedy poniżej danej ilości", - "gui.refinedstorage2.detector.mode.equal": "Emituj sygnał redstone, kiedy dana ilość", - "gui.refinedstorage2.detector.mode.above": "Emituj sygnał redstone, kiedy powyżej danej ilości", - "gui.refinedstorage2.detector.filter_help": "Zasób, który powinien zostać wykryty w sieci magazynowania.", - "gui.refinedstorage2.destructor.pickup_items": "Ponieść przedmiot, zamiast niszczyć", - "gui.refinedstorage2.destructor.filter_help": "Bloki, które mogą lub nie mogą być zniszczone, w zależności od tego, czy urządzenie jest w trybie dozwolonych lub zablokowanych.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Zezwalaj tylko na bloki do sieci magazynowej, które są skonfigurowane w filtrach.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Nie zezwalaj na bloki do sieci magazynowej, które są skonfigurowane w filtrach.", - "gui.refinedstorage2.constructor.drop_items": "Upuszczaj przedmioty zamiast stawiania bloków", - "gui.refinedstorage2.constructor.filter_help": "Zasób, który zostać postawiony z sieci magazynowania.", - "gui.refinedstorage2.interface.filter_help": "Zasoby, które powinny być eksportowane z sieci magazynowania.", - "gui.refinedstorage2.exporter.filter_help": "Zasoby, które powinny być eksportowane z sieci magazynowania.", - "gui.refinedstorage2.importer.filter_help": "Zasoby, które mogą być importowane z docelowego ekwipunku.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Zezwalaj tylko na zasoby do sieci magazynowej, które są skonfigurowane w filtrach.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Nie zezwalaj na zasoby do sieci magazynowej, które są skonfigurowane w filtrach.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d blok(ów)", - "gui.refinedstorage2.storage_monitor.filter_help": "Zasób do wyświetlenia.", - "gui.refinedstorage2.redstone_mode": "Tryb redstone", - "gui.refinedstorage2.redstone_mode.ignore": "Ignoruj", - "gui.refinedstorage2.redstone_mode.ignore.help": "To urządzenie będzie zawsze aktywne, niezależnie od sygnału redstone.", - "gui.refinedstorage2.redstone_mode.high": "Wysoki", - "gui.refinedstorage2.redstone_mode.high.help": "To urządzenie będzie aktywne tylko z sygnałem redstone.", - "gui.refinedstorage2.redstone_mode.low": "Niski", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Scheduling mode", - "gui.refinedstorage2.scheduling_mode.default": "Default", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "Losowy", - "gui.refinedstorage2.scheduling_mode.random.help": "Użyj filtru losowego.", - "gui.refinedstorage2.priority": "Priorytet", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Ilość", - "gui.refinedstorage2.amount.reset": "Reset", - "gui.refinedstorage2.amount.set": "Ustaw", - "gui.refinedstorage2.filter_mode": "Tryb filtrowania", - "gui.refinedstorage2.filter_mode.allow": "Allowlist", - "gui.refinedstorage2.filter_mode.block": "Blocklist", - "gui.refinedstorage2.fuzzy_mode": "Tryb nieprecyzyjny", - "gui.refinedstorage2.fuzzy_mode.on": "Włączono", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Off", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Access mode", - "gui.refinedstorage2.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Insert only", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Extract only", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Void excess resources", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Brak karty sieci", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d blok(ów)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Nieosiągalny", - "gui.refinedstorage2.security_card.permission.reset": "Reset", - "gui.refinedstorage2.security_card.permission.modified": "Modified", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Zapewnia sieć magazynowania w energie. Sieć może mieć ich kilka.", - "item.refinedstorage2.creative_controller.help": "Zapewnia sieć magazynowania w nieskończoną energię.", - "item.refinedstorage2.disk_drive.help": "Akceptuje dyski do zapewnienia przestrzeni dyskowej dla sieci magazynowania.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Umożliwia interakcję z siecią magazynowania.", - "item.refinedstorage2.crafting_grid.help": "Umożliwia interakcję z siecią magazynowania, z możliwością tworzenia.", - "item.refinedstorage2.importer.help": "Importuj zasoby ze źródła zewnętrznego do sieci magazynowej.", - "item.refinedstorage2.exporter.help": "Eksport zasobów z sieci magazynowej do zewnętrznego miejsca przeznaczenia.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Dostarcza pamięć z zewnętrznego źródła.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicon", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage2.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage2.basic_processor": "Basic Processor", - "item.refinedstorage2.improved_processor": "Improved Processor", - "item.refinedstorage2.advanced_processor": "Advanced Processor", - "item.refinedstorage2.1k_storage_part": "1K Storage Part", - "item.refinedstorage2.4k_storage_part": "4K Storage Part", - "item.refinedstorage2.16k_storage_part": "16K Storage Part", - "item.refinedstorage2.64k_storage_part": "64K Storage Part", - "item.refinedstorage2.1k_storage_disk": "1K Storage Disk", - "item.refinedstorage2.4k_storage_disk": "4K Storage Disk", - "item.refinedstorage2.16k_storage_disk": "16K Storage Disk", - "item.refinedstorage2.64k_storage_disk": "64K Storage Disk", - "item.refinedstorage2.creative_storage_disk": "Creative Storage Disk", - "item.refinedstorage2.64b_fluid_storage_part": "64B Fluid Storage Part", - "item.refinedstorage2.256b_fluid_storage_part": "256B Fluid Storage Part", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "Zewnętrzny magazyn", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Zużycie energii", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Przechowywanie zewnętrzne", - "advancements.refinedstorage2.storing_externally.description": "Użyj zewnętrznego magazynu, aby zapewnić sieć w pamięć z zewnętrznego bloku jak skrzynia", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/pt_br.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/pt_br.json deleted file mode 100644 index 600fd643e..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/pt_br.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Cabo", - "block.refinedstorage2.quartz_enriched_iron_block": "Bloco de ferro com quartzo infundido", - "block.refinedstorage2.disk_drive": "Disco rígido", - "block.refinedstorage2.machine_casing": "Revestimento de máquina", - "block.refinedstorage2.grid": "Grade", - "block.refinedstorage2.crafting_grid": "Grade de Criação", - "block.refinedstorage2.controller": "Controlador", - "block.refinedstorage2.creative_controller": "Controlador Criativo", - "block.refinedstorage2.1k_storage_block": "Bloco de armazenamento 1k", - "block.refinedstorage2.4k_storage_block": "Bloco de armazenamento 4K", - "block.refinedstorage2.16k_storage_block": "Bloco de armazenamento 16K", - "block.refinedstorage2.64k_storage_block": "Bloco de armazenamento 64K", - "block.refinedstorage2.creative_storage_block": "Bloco de armazenamento Criativo", - "block.refinedstorage2.64b_fluid_storage_block": "Bloco de Armazenamento de Fluido 64B", - "block.refinedstorage2.256b_fluid_storage_block": "Bloco de Armazenamento de Fluido 256B", - "block.refinedstorage2.1024b_fluid_storage_block": "Bloco de Armazenamento de Fluido 1024B", - "block.refinedstorage2.4096b_fluid_storage_block": "Bloco de armazenamento de fluido 4096B", - "block.refinedstorage2.creative_fluid_storage_block": "Bloco de armazenamento de fluido Criativo", - "block.refinedstorage2.importer": "Importador", - "block.refinedstorage2.exporter": "Exportador", - "block.refinedstorage2.interface": "Interface", - "block.refinedstorage2.external_storage": "Armazenamento Externo", - "block.refinedstorage2.detector": "Detector", - "block.refinedstorage2.constructor": "Construtor", - "block.refinedstorage2.destructor": "Destrutor", - "block.refinedstorage2.wireless_transmitter": "Transmissor sem fio", - "block.refinedstorage2.storage_monitor": "Monitor de Armazenamento", - "block.refinedstorage2.network_receiver": "Receptor da Rede", - "block.refinedstorage2.network_transmitter": "Transmissor de Rede", - "block.refinedstorage2.portable_grid": "Grade Portátil", - "block.refinedstorage2.creative_portable_grid": "Grade Portátil Criativa", - "block.refinedstorage2.security_manager": "Security Manager", - "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "Quando este dispositivo estiver inativo, a rede de armazenamento não poderá usar este dispositivo como fonte de energia.", - "gui.refinedstorage2.disk_drive.disks": "Discos", - "gui.refinedstorage2.storage.redstone_mode_help": "Quando este dispositivo estiver inativo, o armazenamento contido não estará mais acessível a partir da rede de armazenamento.", - "gui.refinedstorage2.storage.filter_help": "Os recursos que podem ou não ser permitidos neste armazenamento, dependendo se o dispositivo está no modo de lista de permissões ou lista de bloqueio.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Sem filtros configurados, nenhum recurso será aceito neste armazenamento.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Só permite recursos neste armazenamento que está configurado nos filtros.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "Sorting direction", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Ascending", - "gui.refinedstorage2.grid.sorting.direction.descending": "Descending", - "gui.refinedstorage2.grid.sorting.type": "Sorting type", - "gui.refinedstorage2.grid.sorting.type.quantity": "Quantity", - "gui.refinedstorage2.grid.sorting.type.name": "Name", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Last modified", - "gui.refinedstorage2.grid.auto_selected": "Auto-selected", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "Synchronization mode", - "gui.refinedstorage2.grid.synchronizer.off": "Off", - "gui.refinedstorage2.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage2.grid.resource_type": "Resource type", - "gui.refinedstorage2.grid.resource_type.all": "All", - "gui.refinedstorage2.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage2.crafting_grid.move.network": "Move items to network", - "gui.refinedstorage2.crafting_grid.move.inventory": "Move items to inventory", - "gui.refinedstorage2.screen_size": "Screen size", - "gui.refinedstorage2.screen_size.stretch": "Stretch", - "gui.refinedstorage2.screen_size.small": "Small", - "gui.refinedstorage2.screen_size.medium": "Medium", - "gui.refinedstorage2.screen_size.large": "Large", - "gui.refinedstorage2.screen_size.extra_large": "Extra large", - "gui.refinedstorage2.detector.mode": "Mode", - "gui.refinedstorage2.detector.mode.under": "Emit redstone signal when under the amount", - "gui.refinedstorage2.detector.mode.equal": "Emit redstone signal when on the amount", - "gui.refinedstorage2.detector.mode.above": "Emit redstone signal when above the amount", - "gui.refinedstorage2.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage2.destructor.pickup_items": "Pickup items instead of breaking", - "gui.refinedstorage2.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "Drop items instead of placing blocks", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d block(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage2.redstone_mode": "Redstone mode", - "gui.refinedstorage2.redstone_mode.ignore": "Ignore", - "gui.refinedstorage2.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage2.redstone_mode.high": "High", - "gui.refinedstorage2.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage2.redstone_mode.low": "Low", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Scheduling mode", - "gui.refinedstorage2.scheduling_mode.default": "Default", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "Random", - "gui.refinedstorage2.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage2.priority": "Priority", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Amount", - "gui.refinedstorage2.amount.reset": "Reset", - "gui.refinedstorage2.amount.set": "Set", - "gui.refinedstorage2.filter_mode": "Filter mode", - "gui.refinedstorage2.filter_mode.allow": "Allowlist", - "gui.refinedstorage2.filter_mode.block": "Blocklist", - "gui.refinedstorage2.fuzzy_mode": "Fuzzy mode", - "gui.refinedstorage2.fuzzy_mode.on": "On", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Off", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Access mode", - "gui.refinedstorage2.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Insert only", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Extract only", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Void excess resources", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d block(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Unreachable", - "gui.refinedstorage2.security_card.permission.reset": "Reset", - "gui.refinedstorage2.security_card.permission.modified": "Modified", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicon", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage2.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage2.basic_processor": "Basic Processor", - "item.refinedstorage2.improved_processor": "Improved Processor", - "item.refinedstorage2.advanced_processor": "Advanced Processor", - "item.refinedstorage2.1k_storage_part": "1K Storage Part", - "item.refinedstorage2.4k_storage_part": "4K Storage Part", - "item.refinedstorage2.16k_storage_part": "16K Storage Part", - "item.refinedstorage2.64k_storage_part": "64K Storage Part", - "item.refinedstorage2.1k_storage_disk": "1K Storage Disk", - "item.refinedstorage2.4k_storage_disk": "4K Storage Disk", - "item.refinedstorage2.16k_storage_disk": "16K Storage Disk", - "item.refinedstorage2.64k_storage_disk": "64K Storage Disk", - "item.refinedstorage2.creative_storage_disk": "Creative Storage Disk", - "item.refinedstorage2.64b_fluid_storage_part": "64B Fluid Storage Part", - "item.refinedstorage2.256b_fluid_storage_part": "256B Fluid Storage Part", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ru_ru.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ru_ru.json deleted file mode 100644 index d8ae6323b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/ru_ru.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Кабель", - "block.refinedstorage2.quartz_enriched_iron_block": "Блок обогащённого кварцем железа", - "block.refinedstorage2.disk_drive": "Дисковый привод", - "block.refinedstorage2.machine_casing": "Корпус механизма", - "block.refinedstorage2.grid": "Терминал", - "block.refinedstorage2.crafting_grid": "Терминал создания", - "block.refinedstorage2.controller": "Контроллер", - "block.refinedstorage2.creative_controller": "Творческий контроллер", - "block.refinedstorage2.1k_storage_block": "Блок хранения 1k", - "block.refinedstorage2.4k_storage_block": "Блок хранения 4k", - "block.refinedstorage2.16k_storage_block": "Блок хранения 16k", - "block.refinedstorage2.64k_storage_block": "Блок хранения 64k", - "block.refinedstorage2.creative_storage_block": "Творческий блок хранения", - "block.refinedstorage2.64b_fluid_storage_block": "Блок хранения жидкости 64b", - "block.refinedstorage2.256b_fluid_storage_block": "Блок хранения жидкости 256b", - "block.refinedstorage2.1024b_fluid_storage_block": "Блок хранения жидкости 1024b", - "block.refinedstorage2.4096b_fluid_storage_block": "Блок хранения жидкости 4096b", - "block.refinedstorage2.creative_fluid_storage_block": "Творческий блок хранения жидкости", - "block.refinedstorage2.importer": "Шина импорта", - "block.refinedstorage2.exporter": "Шина экспорта", - "block.refinedstorage2.interface": "Интерфейс", - "block.refinedstorage2.external_storage": "Шина внешнего хранения", - "block.refinedstorage2.detector": "Детектор", - "block.refinedstorage2.constructor": "Шина формирования", - "block.refinedstorage2.destructor": "Шина разрушения", - "block.refinedstorage2.wireless_transmitter": "Беспроводной передатчик", - "block.refinedstorage2.storage_monitor": "Монитор хранения", - "block.refinedstorage2.network_receiver": "Сетевой приёмник", - "block.refinedstorage2.network_transmitter": "Сетевой передатчик", - "block.refinedstorage2.portable_grid": "Переносной терминал", - "block.refinedstorage2.creative_portable_grid": "Творческий переносной терминал", - "block.refinedstorage2.security_manager": "Диспетчер безопасности", - "block.refinedstorage2.security_manager.help": "Когда это устройство активно, оно по умолчанию защищает сеть и блокирует все операции. Начните добавлять карты безопасности, чтобы разрешить или запретить определённые операции для игрока.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", - "gui.refinedstorage2.disk_drive.disks": "Диски", - "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage2.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "Порядок сортировки", - "gui.refinedstorage2.grid.sorting.direction.ascending": "По возрастанию", - "gui.refinedstorage2.grid.sorting.direction.descending": "По убыванию", - "gui.refinedstorage2.grid.sorting.type": "Тип сортировки", - "gui.refinedstorage2.grid.sorting.type.quantity": "Кол-во", - "gui.refinedstorage2.grid.sorting.type.name": "Название", - "gui.refinedstorage2.grid.sorting.type.id": "Идентификатор", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Last modified", - "gui.refinedstorage2.grid.auto_selected": "Auto-selected", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "Режим синхронизации", - "gui.refinedstorage2.grid.synchronizer.off": "Выкл.", - "gui.refinedstorage2.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage2.grid.resource_type": "Resource type", - "gui.refinedstorage2.grid.resource_type.all": "All", - "gui.refinedstorage2.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage2.crafting_grid.move.network": "Move items to network", - "gui.refinedstorage2.crafting_grid.move.inventory": "Move items to inventory", - "gui.refinedstorage2.screen_size": "Screen size", - "gui.refinedstorage2.screen_size.stretch": "Stretch", - "gui.refinedstorage2.screen_size.small": "Small", - "gui.refinedstorage2.screen_size.medium": "Medium", - "gui.refinedstorage2.screen_size.large": "Large", - "gui.refinedstorage2.screen_size.extra_large": "Extra large", - "gui.refinedstorage2.detector.mode": "Режим", - "gui.refinedstorage2.detector.mode.under": "Emit redstone signal when under the amount", - "gui.refinedstorage2.detector.mode.equal": "Emit redstone signal when on the amount", - "gui.refinedstorage2.detector.mode.above": "Emit redstone signal when above the amount", - "gui.refinedstorage2.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage2.destructor.pickup_items": "Pickup items instead of breaking", - "gui.refinedstorage2.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "Drop items instead of placing blocks", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d block(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage2.redstone_mode": "Redstone mode", - "gui.refinedstorage2.redstone_mode.ignore": "Ignore", - "gui.refinedstorage2.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage2.redstone_mode.high": "High", - "gui.refinedstorage2.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage2.redstone_mode.low": "Low", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Scheduling mode", - "gui.refinedstorage2.scheduling_mode.default": "По умолчанию", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "Random", - "gui.refinedstorage2.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage2.priority": "Priority", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Amount", - "gui.refinedstorage2.amount.reset": "Reset", - "gui.refinedstorage2.amount.set": "Set", - "gui.refinedstorage2.filter_mode": "Режим фильтрации", - "gui.refinedstorage2.filter_mode.allow": "Allowlist", - "gui.refinedstorage2.filter_mode.block": "Blocklist", - "gui.refinedstorage2.fuzzy_mode": "Fuzzy mode", - "gui.refinedstorage2.fuzzy_mode.on": "On", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Выкл.", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Access mode", - "gui.refinedstorage2.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Insert only", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Extract only", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Void excess resources", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d block(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Unreachable", - "gui.refinedstorage2.security_card.permission.reset": "Reset", - "gui.refinedstorage2.security_card.permission.modified": "Modified", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Должно ли это устройство передавать весь сигнал входящей сети как есть. Выключите это, чтобы выборочно дать доступ к компонентам в выходной сети.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicon", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage2.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage2.basic_processor": "Базовый процессор", - "item.refinedstorage2.improved_processor": "Улучшенный процессор", - "item.refinedstorage2.advanced_processor": "Продвинутый процессор", - "item.refinedstorage2.1k_storage_part": "Часть хранения на 1 Кбайт", - "item.refinedstorage2.4k_storage_part": "Часть хранения на 4 Кбайт", - "item.refinedstorage2.16k_storage_part": "Часть хранения на 16 Кбайт", - "item.refinedstorage2.64k_storage_part": "Часть хранения на 64 Кбайт", - "item.refinedstorage2.1k_storage_disk": "Диск хранения на 1 Кбайт", - "item.refinedstorage2.4k_storage_disk": "Диск хранения на 4 Кбайт", - "item.refinedstorage2.16k_storage_disk": "Диск хранения на 16 Кбайт", - "item.refinedstorage2.64k_storage_disk": "Диск хранения на 64 Кбайт", - "item.refinedstorage2.creative_storage_disk": "Диск хранения творческого режима", - "item.refinedstorage2.64b_fluid_storage_part": "Часть для хранения жидкости на 64 байт", - "item.refinedstorage2.256b_fluid_storage_part": "Часть для хранения жидкости на 256 байт", - "item.refinedstorage2.1024b_fluid_storage_part": "Часть для хранения жидкости на 1024 байт", - "item.refinedstorage2.4096b_fluid_storage_part": "Часть для хранения жидкости на 4096 байт", - "item.refinedstorage2.64b_fluid_storage_disk": "Диск для хранения жидкости на 64 байт", - "item.refinedstorage2.256b_fluid_storage_disk": "Диск для хранения жидкости на 256 байт", - "item.refinedstorage2.1024b_fluid_storage_disk": "Диск для хранения жидкости на 1024 байт", - "item.refinedstorage2.4096b_fluid_storage_disk": "Диск для хранения жидкости на 4096 байт", - "item.refinedstorage2.creative_fluid_storage_disk": "Диск для хранения жидкости творческого режима", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Гаечный ключ", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Улучшение", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "В экспортировщике экспортируется только в том случае, если количество в целевом месте меньше, чем указано в улучшении. В импортировщике импортируется только в том случае, если количество в целевом месте больше, чем указано в улучшении. Используйте предмет для настройки.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/zh_cn.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/zh_cn.json deleted file mode 100644 index 4ca3d891a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/zh_cn.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "精致存储 2", - "block.refinedstorage2.cable": "线缆", - "block.refinedstorage2.quartz_enriched_iron_block": "富石英铁块", - "block.refinedstorage2.disk_drive": "磁盘驱动器", - "block.refinedstorage2.machine_casing": "机器外壳", - "block.refinedstorage2.grid": "终端", - "block.refinedstorage2.crafting_grid": "合成终端", - "block.refinedstorage2.controller": "控制器", - "block.refinedstorage2.creative_controller": "创造控制器", - "block.refinedstorage2.1k_storage_block": "1K 存储方块", - "block.refinedstorage2.4k_storage_block": "4K 存储方块", - "block.refinedstorage2.16k_storage_block": "16K 存储方块", - "block.refinedstorage2.64k_storage_block": "64K 存储方块", - "block.refinedstorage2.creative_storage_block": "创造存储方块", - "block.refinedstorage2.64b_fluid_storage_block": "64B 流体存储方块", - "block.refinedstorage2.256b_fluid_storage_block": "256B 流体存储方块", - "block.refinedstorage2.1024b_fluid_storage_block": "1024B 流体存储方块", - "block.refinedstorage2.4096b_fluid_storage_block": "4096B 流体存储方块", - "block.refinedstorage2.creative_fluid_storage_block": "创造流体存储方块", - "block.refinedstorage2.importer": "输入总线", - "block.refinedstorage2.exporter": "输出总线", - "block.refinedstorage2.interface": "物品传输接口", - "block.refinedstorage2.external_storage": "外部存储总线", - "block.refinedstorage2.detector": "网络物品检测器", - "block.refinedstorage2.constructor": "成型面板", - "block.refinedstorage2.destructor": "破坏面板", - "block.refinedstorage2.wireless_transmitter": "无线访问点", - "block.refinedstorage2.storage_monitor": "存储监控器", - "block.refinedstorage2.network_receiver": "网络接收器", - "block.refinedstorage2.network_transmitter": "网络变送器", - "block.refinedstorage2.portable_grid": "便携式终端", - "block.refinedstorage2.creative_portable_grid": "创造模式便携式终端", - "block.refinedstorage2.security_manager": "权限管理器", - "block.refinedstorage2.security_manager.help": "当此设备处于激活状态时会默认阻止所有操作来保护网络。添加安全卡以配置特定玩家对于特定操作的权限", - "block.refinedstorage2.relay": "中继器", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "当此设备处于非激活状态时，存储网络将无法将此设备用作能源来源。", - "gui.refinedstorage2.disk_drive.disks": "磁盘", - "gui.refinedstorage2.storage.redstone_mode_help": "当此设备处于非激活状态时，其中的存储空间将无法从存储网络内访问。", - "gui.refinedstorage2.storage.filter_help": "这些资源可能会或可能不会被允许存储，具体取决于设备是否处于白名单或黑名单模式。", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "在没有配置任何过滤器的情况下，此存储将不接受任何资源。", - "gui.refinedstorage2.storage.filter_mode.allow.help": "只允许过滤器配置中的资源进入此存储。", - "gui.refinedstorage2.storage.filter_mode.block.help": "禁止过滤器配置中的资源进入此存储。", - "gui.refinedstorage2.grid.sorting.direction": "排序方式", - "gui.refinedstorage2.grid.sorting.direction.ascending": "升序", - "gui.refinedstorage2.grid.sorting.direction.descending": "降序", - "gui.refinedstorage2.grid.sorting.type": "排序按照", - "gui.refinedstorage2.grid.sorting.type.quantity": "数量", - "gui.refinedstorage2.grid.sorting.type.name": "名字", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "最后修改时间", - "gui.refinedstorage2.grid.auto_selected": "自动选取", - "gui.refinedstorage2.grid.auto_selected.help": "在打开终端时是否自动选择搜索框。", - "gui.refinedstorage2.grid.synchronizer": "同步模式", - "gui.refinedstorage2.grid.synchronizer.off": "关闭", - "gui.refinedstorage2.grid.synchronizer.off.help": "不同步搜索框文本。", - "gui.refinedstorage2.grid.resource_type": "存储通道", - "gui.refinedstorage2.grid.resource_type.all": "全部", - "gui.refinedstorage2.grid.resource_type.help": "从特定的存储通道中过滤资源。", - "gui.refinedstorage2.crafting_grid.move.network": "将物品移动到网络。", - "gui.refinedstorage2.crafting_grid.move.inventory": "将物品移动到物品栏。", - "gui.refinedstorage2.screen_size": "界面大小", - "gui.refinedstorage2.screen_size.stretch": "自适应", - "gui.refinedstorage2.screen_size.small": "小", - "gui.refinedstorage2.screen_size.medium": "中", - "gui.refinedstorage2.screen_size.large": "大", - "gui.refinedstorage2.screen_size.extra_large": "特大", - "gui.refinedstorage2.detector.mode": "模式", - "gui.refinedstorage2.detector.mode.under": "物品数量小于输入数量时输出信号。", - "gui.refinedstorage2.detector.mode.equal": "物品数量等于输入数量时输出信号。", - "gui.refinedstorage2.detector.mode.above": "物品数量大于于输入数量时输出信号。", - "gui.refinedstorage2.detector.filter_help": "应该在存储网络中检测的资源。", - "gui.refinedstorage2.destructor.pickup_items": "拾取物品而不是破坏。", - "gui.refinedstorage2.destructor.filter_help": "这些方块被破坏与否，具体取决于设备是否处于白名单或黑名单模式。", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "只允许过滤器配置中的方块进入存储网络。", - "gui.refinedstorage2.destructor.filter_mode.block.help": "禁止过滤器配置中的方块进入存储网络。", - "gui.refinedstorage2.constructor.drop_items": "丢出物品而不是放置方块", - "gui.refinedstorage2.constructor.filter_help": "应该从存储网络中放置的资源。", - "gui.refinedstorage2.interface.filter_help": "应该从存储网络导出的资源。", - "gui.refinedstorage2.exporter.filter_help": "应该从存储网络导出的资源。", - "gui.refinedstorage2.importer.filter_help": "可能从目标物品栏导入的资源。", - "gui.refinedstorage2.importer.filter_mode.allow.help": "只允许过滤器配置中的资源进入存储网络。", - "gui.refinedstorage2.importer.filter_mode.block.help": "禁止过滤器配置中的资源进入存储网络。", - "gui.refinedstorage2.wireless_transmitter.distance": "%d 方块", - "gui.refinedstorage2.storage_monitor.filter_help": "要显示的资源。", - "gui.refinedstorage2.redstone_mode": "红石模式", - "gui.refinedstorage2.redstone_mode.ignore": "忽略红石信号", - "gui.refinedstorage2.redstone_mode.ignore.help": "此设备将始终处于激活状态，不受红石信号影响。", - "gui.refinedstorage2.redstone_mode.high": "有红石信号时工作", - "gui.refinedstorage2.redstone_mode.high.help": "此设备仅在有红石信号时才会处于激活状态。", - "gui.refinedstorage2.redstone_mode.low": "无红石信号时工作", - "gui.refinedstorage2.redstone_mode.low.help": "此设备仅在没有红石信号时才会处于激活状态。", - "gui.refinedstorage2.scheduling_mode": "调度模式", - "gui.refinedstorage2.scheduling_mode.default": "默认", - "gui.refinedstorage2.scheduling_mode.default.help": "使用第一个可用的过滤器。", - "gui.refinedstorage2.scheduling_mode.round_robin": "轮询", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "轮询使用每个过滤器。", - "gui.refinedstorage2.scheduling_mode.random": "随机", - "gui.refinedstorage2.scheduling_mode.random.help": "使用随机过滤器。", - "gui.refinedstorage2.priority": "优先级", - "gui.refinedstorage2.priority.storage_help": "存储网络存入或提取资源的顺序，从高到低。", - "gui.refinedstorage2.amount": "物品数量", - "gui.refinedstorage2.amount.reset": "重置", - "gui.refinedstorage2.amount.set": "设置", - "gui.refinedstorage2.filter_mode": "过滤模式", - "gui.refinedstorage2.filter_mode.allow": "白名单", - "gui.refinedstorage2.filter_mode.block": "黑名单", - "gui.refinedstorage2.fuzzy_mode": "模糊模式", - "gui.refinedstorage2.fuzzy_mode.on": "开启", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "精确匹配白名单或黑名单的过滤器。", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "精确匹配过滤器。", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "从存储网络提取时精确匹配过滤器。", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "从源提取时精确匹配过滤器。", - "gui.refinedstorage2.fuzzy_mode.off": "关闭", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "在白名单或黑名单的过滤器中匹配时不比较NBT标签。", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "在匹配过滤器时不比较NBT标签。", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "从存储网络提取时，在过滤器中匹配时不比较NBT标签。", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "从源提取时，在过滤器中匹配时不比较NBT标签。", - "gui.refinedstorage2.access_mode": "访问模式", - "gui.refinedstorage2.access_mode.insert_extract": "插入和提取", - "gui.refinedstorage2.access_mode.insert_extract.help": "存储网络可以插入或从此存储中提取。", - "gui.refinedstorage2.access_mode.insert": "仅插入", - "gui.refinedstorage2.access_mode.insert.help": "存储网络只能插入此存储。包含的资源仍然可在终端中看到。", - "gui.refinedstorage2.access_mode.extract": "仅提取", - "gui.refinedstorage2.access_mode.extract.help": "存储网络只能从此存储中提取。", - "gui.refinedstorage2.void_excess": "销毁过量资源", - "gui.refinedstorage2.void_excess.help": "当销毁过量模式被打开且存储已满时，将继续接受资源并将其直接销毁。", - "gui.refinedstorage2.void_excess.allowlist_warning": "销毁过量仅在白名单模式下才会生效", - "gui.refinedstorage2.upgrade_slot": "空升级槽", - "gui.refinedstorage2.filter_slot.empty_filter": "空过滤器", - "gui.refinedstorage2.filter_slot.left_click_for": "左键点击", - "gui.refinedstorage2.filter_slot.right_click_for": "右键点击", - "gui.refinedstorage2.filter_slot.click_to_clear": "点击清除", - "gui.refinedstorage2.regulator_upgrade.filter_help": "目标中应调节的资源。", - "gui.refinedstorage2.network_transmitter.status.inactive": "未激活", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "缺少网络卡", - "gui.refinedstorage2.network_transmitter.status.transmitting": "传输中：%d个方块", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "无法访问", - "gui.refinedstorage2.security_card.permission.reset": "重置", - "gui.refinedstorage2.security_card.permission.modified": "已修改", - "gui.refinedstorage2.security_manager.redstone_mode_help": "当此设备处于未激活状态时，将不能保护网络。", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "后备安全卡卡槽", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "在此槽位加入后备权限卡来设置没有单独使用权限卡配置的玩家的权限。默认情况下所有操作均被阻止。", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "为存储网络提供能量。一个存储网络中允许包含多个。", - "item.refinedstorage2.creative_controller.help": "为存储网络提供无限能源。", - "item.refinedstorage2.disk_drive.help": "接受存储磁盘，为存储网络提供存储空间。", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "允许与存储网络交互。", - "item.refinedstorage2.crafting_grid.help": "允许与存储网络交互，并具有合成能力。", - "item.refinedstorage2.importer.help": "从外部源导入资源到存储网络。", - "item.refinedstorage2.exporter.help": "从存储网络将资源导出到外部目标。", - "item.refinedstorage2.interface.help": "充当输入总线和输出总线的结合。", - "item.refinedstorage2.external_storage.help": "为存储网络提供来自外部源的存储。", - "item.refinedstorage2.detector.help": "如果存储网络包含等于、大于或小于给定数量的资源，则发出红石信号。", - "item.refinedstorage2.constructor.help": "从存储网络中放置方块到世界中。", - "item.refinedstorage2.destructor.help": "从世界中销毁方块并将其放入存储网络。", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "富石英铁", - "item.refinedstorage2.processor_binding": "处理器绑定", - "item.refinedstorage2.silicon": "硅", - "item.refinedstorage2.raw_basic_processor": "原始基础处理器", - "item.refinedstorage2.raw_improved_processor": "原始进阶处理器", - "item.refinedstorage2.raw_advanced_processor": "原始高级处理器", - "item.refinedstorage2.basic_processor": "基础处理器", - "item.refinedstorage2.improved_processor": "进阶处理器", - "item.refinedstorage2.advanced_processor": "高级处理器", - "item.refinedstorage2.1k_storage_part": "1K 存储元件", - "item.refinedstorage2.4k_storage_part": "4K 存储元件", - "item.refinedstorage2.16k_storage_part": "16K 存储元件", - "item.refinedstorage2.64k_storage_part": "64K 存储元件", - "item.refinedstorage2.1k_storage_disk": "1K 存储磁盘", - "item.refinedstorage2.4k_storage_disk": "4K 存储磁盘", - "item.refinedstorage2.16k_storage_disk": "16K 存储磁盘", - "item.refinedstorage2.64k_storage_disk": "64K 存储磁盘", - "item.refinedstorage2.creative_storage_disk": "创造存储磁盘", - "item.refinedstorage2.64b_fluid_storage_part": "64B 流体存储原件", - "item.refinedstorage2.256b_fluid_storage_part": "256B 流体存储原件", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B 流体存储原件", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B 流体存储原件", - "item.refinedstorage2.64b_fluid_storage_disk": "64B 流体存储磁盘", - "item.refinedstorage2.256b_fluid_storage_disk": "256B 流体存储磁盘", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B 流体存储磁盘", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B 流体存储磁盘", - "item.refinedstorage2.creative_fluid_storage_disk": "创造流体存储磁盘", - "item.refinedstorage2.storage_housing": "磁盘外壳", - "item.refinedstorage2.construction_core": "成型核心", - "item.refinedstorage2.destruction_core": "破坏核心", - "item.refinedstorage2.wrench": "扳手", - "item.refinedstorage2.wrench.helper": "用于旋转方块，或按住SHIFT并使用以拆解精致存储方块。", - "item.refinedstorage2.upgrade": "空白升级", - "item.refinedstorage2.speed_upgrade": "速度升级", - "item.refinedstorage2.stack_upgrade": "堆叠升级", - "item.refinedstorage2.silk_touch_upgrade": "精准采集升级", - "item.refinedstorage2.fortune_upgrade.1": "时运 I 升级", - "item.refinedstorage2.fortune_upgrade.2": "时运 II 升级", - "item.refinedstorage2.fortune_upgrade.3": "时运 III 升级", - "item.refinedstorage2.regulator_upgrade": "调节器升级", - "item.refinedstorage2.regulator_upgrade.help": "在输出总线中，仅在目标中的数量少于升级中配置的数量时导出。在输入总线中，仅在目标中的数量大于升级中配置的数量时导入。使用物品进行配置。", - "item.refinedstorage2.range_upgrade": "范围升级", - "item.refinedstorage2.creative_range_upgrade": "创造范围升级", - "item.refinedstorage2.wireless_grid": "无线终端", - "item.refinedstorage2.creative_wireless_grid": "创造无线终端", - "item.refinedstorage2.wireless_transmitter.help": "为诸如无线终端之类的物品提供无线网络访问。一个区域内允许放置多个以扩大覆盖范围。", - "item.refinedstorage2.network_item.unbound": "未绑定。", - "item.refinedstorage2.network_item.unbound.help": "对任一存储网络设备使用以进行绑定。", - "item.refinedstorage2.network_item.bound_to": "绑定到 %d, %d, %d。", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "你的库存中存在多个 %s，无法使用快捷方式打开。", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "你的库存中没有任何 %s。", - "item.refinedstorage2.configuration_card": "配置卡", - "item.refinedstorage2.configuration_card.empty": "空。", - "item.refinedstorage2.configuration_card.configured": "包含 %s 的配置。", - "item.refinedstorage2.configuration_card.copied_configuration": "已复制 %s 的配置。", - "item.refinedstorage2.configuration_card.cleared_configuration": "已清除配置。", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "无法将配置卡应用于不同类型的设备。它配置为 %s。", - "item.refinedstorage2.configuration_card.applied_configuration": "已应用配置。", - "item.refinedstorage2.configuration_card.empty_help": "在潜行状态下对存储网络设备使用，以将其配置和升级复制到卡上。", - "item.refinedstorage2.configuration_card.configured_help": "在蹲下的同时用于目标存储网络设备，以传输配置和升级。蹲下时使用以清除。", - "item.refinedstorage2.network_card": "网络卡", - "item.refinedstorage2.network_card.unbound_help": "潜行状态下对网络接收器使用", - "item.refinedstorage2.network_card.unbound": "未绑定。", - "item.refinedstorage2.network_card.bound_help": "插入到网络变送器中。在潜行状态下使用以清除绑定。", - "item.refinedstorage2.network_card.bound": "绑定到 %d, %d, %d 在 %s 中。", - "item.refinedstorage2.security_card": "权限卡", - "item.refinedstorage2.security_card.cleared_configuration": "已清除配置。", - "item.refinedstorage2.security_card.unbound": "未绑定。", - "item.refinedstorage2.security_card.unbound.help": "右键使用以配置并绑定到当前玩家", - "item.refinedstorage2.security_card.bound": "绑定至：%s", - "item.refinedstorage2.security_card.bound.help": "右键使用以进行配置，潜行状态下使用以清除当前配置与绑定", - "item.refinedstorage2.fallback_security_card": "后备权限卡", - "item.refinedstorage2.fallback_security_card.help": "如果权限管理器中没有对应玩家的权限卡则将后备权限卡的权限配置应用于该玩家。右键使用以进行配置，潜行状态使用以清除当前配置", - "misc.refinedstorage2.stored": "存储：%s", - "misc.refinedstorage2.stored_with_capacity": "存储：%s / %s (%d%%)", - "misc.refinedstorage2.total": "总数：%d", - "misc.refinedstorage2.last_modified.just_now": "刚刚由 %s 修改", - "misc.refinedstorage2.last_modified.second": "%d 秒前由 %s 修改", - "misc.refinedstorage2.last_modified.seconds": "%d 秒前由 %s 修改", - "misc.refinedstorage2.last_modified.minute": "%d 分钟前由 %s 修改", - "misc.refinedstorage2.last_modified.minutes": "%d 分钟前由 %s 修改", - "misc.refinedstorage2.last_modified.hour": "%d 小时前由 %s 修改", - "misc.refinedstorage2.last_modified.hours": "%d 小时前由 %s 修改", - "misc.refinedstorage2.last_modified.day": "%d 天前由 %s 修改", - "misc.refinedstorage2.last_modified.days": "%d 天前由 %s 修改", - "misc.refinedstorage2.last_modified.week": "%d 周前由 %s 修改", - "misc.refinedstorage2.last_modified.weeks": "%d 周前由 %s 修改", - "misc.refinedstorage2.last_modified.year": "%d 年前由 %s 修改", - "misc.refinedstorage2.last_modified.years": "%d 年前由 %s 修改", - "misc.refinedstorage2.resource_type.item": "物品", - "misc.refinedstorage2.resource_type.fluid": "流体", - "misc.refinedstorage2.press_shift_for_help": "按下 SHIFT 获取帮助", - "misc.refinedstorage2.no_permission": "无权限", - "misc.refinedstorage2.no_permission.open": "你没有打开 %s 的权限", - "misc.refinedstorage2.no_permission.insert": "你没有存储物品的权限", - "misc.refinedstorage2.no_permission.extract": "你没有拿取物品的权限", - "misc.refinedstorage2.no_permission.build.place": "你没有在这里放置 %s 的权限", - "misc.refinedstorage2.no_permission.build.break": "你没有破坏 %s 的权限", - "misc.refinedstorage2.no_permission.build.rotate": "你没有旋转 %s 的权限", - "misc.refinedstorage2.no_permission.build.dismantle": "你没有拆除 %s 的权限", - "key.refinedstorage2.focus_search_bar": "聚焦搜索栏", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "清除合成终端矩阵到网络", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "清除合成终端矩阵到库存", - "key.refinedstorage2.open_wireless_grid": "打开无线终端", - "refinedstorage2.subtitle.wrench": "使用扳手", - "permission.refinedstorage2.insert": "存入", - "permission.refinedstorage2.insert.description": "玩家是否可以向存储网络中存入资源", - "permission.refinedstorage2.extract": "取出", - "permission.refinedstorage2.extract.description": "玩家是否可以从存储网络中取出物品", - "permission.refinedstorage2.autocrafting": "自动合成", - "permission.refinedstorage2.autocrafting.description": "玩家是否可以开始，取消或者查看自动合成任务", - "permission.refinedstorage2.open": "打开", - "permission.refinedstorage2.open.description": "玩家是否可以打开网络中设备的使用界面", - "permission.refinedstorage2.build": "建造", - "permission.refinedstorage2.build.description": "玩家是否可以在网络中添加或者移除设备", - "permission.refinedstorage2.security": "权限", - "permission.refinedstorage2.security.description": "玩家是否可以管理网络的权限设置", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "精致存储 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "平滑滚动", - "text.autoconfig.refinedstorage2.option.screenSize": "界面大小", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "截面尺寸拉伸时的最大显示行数", - "text.autoconfig.refinedstorage2.option.grid": "终端", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "大字体", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "按住 SHIFT 时阻止排序", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "详细提示", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "记住搜索查询", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "自动选择搜索框", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "同步器", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "存储通道类型", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "排序方向", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "排序类型", - "text.autoconfig.refinedstorage2.option.craftingGrid": "合成终端", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "合成矩阵关闭行为", - "text.autoconfig.refinedstorage2.option.controller": "控制器", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "能量容量", - "text.autoconfig.refinedstorage2.option.cable": "电缆", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.diskDrive": "磁盘驱动器", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "每个磁盘的耗能", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "存储方块", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K 能源", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K 能源", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K 能源", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K 能源", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "创造能源", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "流体存储块", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B 能源", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B 能源", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B 能源", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B 能源", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "创造能源", - "text.autoconfig.refinedstorage2.option.importer": "输入总线", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.exporter": "输出总线", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.detector": "检测器", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.constructor": "成型面板", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.destructor": "破坏面板", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.upgrade": "升级", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "速度升级耗能", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "堆叠升级耗能", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "时运 I 升级耗能", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "时运 II 升级耗能", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "时运 III 升级耗能", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "精准采集升级耗能", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "调节器升级耗能", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "范围升级耗能", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "创造范围升级耗能", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "范围升级范围", - "text.autoconfig.refinedstorage2.option.iface": "物品传输接口", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.externalStorage": "外部存储", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "无线网格", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "能量容量", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "打开耗能", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "插入耗能", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "取出耗能", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "无线访问点", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "基础范围", - "text.autoconfig.refinedstorage2.option.storageMonitor": "存储监控器", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.networkReceiver": "网络接收器", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "网络发送器", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.portableGrid": "便携式终端", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "能量容量", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "打开耗能", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "插入耗能", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "取出耗能", - "text.autoconfig.refinedstorage2.option.securityCard": "权限卡", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "后备权限卡", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.securityManager": "权限管理器", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "耗能", - "text.autoconfig.refinedstorage2.option.relay": "中继器", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "输入网络耗能", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "在网络中使用一个或多个控制器为其提供能量", - "advancements.refinedstorage2.connecting": "连接", - "advancements.refinedstorage2.connecting.description": "使用电缆将设备连接在一起，或放置时使设备贴在一起", - "advancements.refinedstorage2.drives": "驱动器", - "advancements.refinedstorage2.drives.description": "合成一个磁盘驱动器，以便能够收纳您的存储磁盘", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "存储物品", - "advancements.refinedstorage2.storing_items.description": "合成一个存储磁盘并将其放入磁盘驱动器中", - "advancements.refinedstorage2.viewing_your_storage": "查看您的存储", - "advancements.refinedstorage2.viewing_your_storage.description": "合成一个终端以与您的存储互动", - "advancements.refinedstorage2.upgrading_your_grid": "升级您的终端", - "advancements.refinedstorage2.upgrading_your_grid.description": "将您的终端升级为合成终端以获得制作能力", - "advancements.refinedstorage2.storing_fluids": "存储流体", - "advancements.refinedstorage2.storing_fluids.description": "合成流体存储磁盘并将其放入磁盘驱动器中", - "advancements.refinedstorage2.importing": "输入", - "advancements.refinedstorage2.importing.description": "使用输入总线将资源带入存储网络", - "advancements.refinedstorage2.exporting": "输出", - "advancements.refinedstorage2.exporting.description": "使用输出总线将资源从存储网络中取出", - "advancements.refinedstorage2.upgrading": "升级", - "advancements.refinedstorage2.upgrading.description": "合成一个升级以改善各种设备", - "advancements.refinedstorage2.interface_to_the_world": "通往世界的接口", - "advancements.refinedstorage2.interface_to_the_world.description": "使用物品传输接口同时导出和导入物品", - "advancements.refinedstorage2.storing_externally": "外部存储", - "advancements.refinedstorage2.storing_externally.description": "使用外部存储总线从外部方块（如箱子）提供网络存储", - "advancements.refinedstorage2.detecting": "检测", - "advancements.refinedstorage2.detecting.description": "使用红石检测存储网络内的资源", - "advancements.refinedstorage2.construction": "成型", - "advancements.refinedstorage2.construction.description": "使用构造器将方块从存储网络中放入世界", - "advancements.refinedstorage2.destruction": "破坏", - "advancements.refinedstorage2.destruction.description": "使用破坏器将世界中的方块放入存储网络", - "advancements.refinedstorage2.wireless": "无线", - "advancements.refinedstorage2.wireless.description": "使用无线终端远程访问你的资源", - "advancements.refinedstorage2.better_than_a_barrel": "比桶更好", - "advancements.refinedstorage2.better_than_a_barrel.description": "合成存储监视器以查看、插入或提取存储网络中的资源", - "advancements.refinedstorage2.no_cables_required": "无需电缆", - "advancements.refinedstorage2.no_cables_required.description": "通过使用网络变送器、网络接收器和网络卡，在不使用电缆的情况下添加额外组件到你的存储网络", - "advancements.refinedstorage2.portable_storage": "便携式存储", - "advancements.refinedstorage2.portable_storage.description": "合成一个便携式终端，在不需要连接到存储网络的情况下也可以访问磁盘内容。", - "advancements.refinedstorage2.security": "权限", - "advancements.refinedstorage2.security.description": "用权限管理器和权限卡来保护你的存储网络", - "advancements.refinedstorage2.conditional_connecting": "条件连接", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/zh_tw.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/zh_tw.json deleted file mode 100644 index 79efad7d4..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/lang/zh_tw.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "mod.refinedstorage2": "Refined Storage 2", - "block.refinedstorage2.cable": "Cable", - "block.refinedstorage2.quartz_enriched_iron_block": "Block of Quartz Enriched Iron", - "block.refinedstorage2.disk_drive": "Disk Drive", - "block.refinedstorage2.machine_casing": "Machine Casing", - "block.refinedstorage2.grid": "Grid", - "block.refinedstorage2.crafting_grid": "Crafting Grid", - "block.refinedstorage2.controller": "Controller", - "block.refinedstorage2.creative_controller": "Creative Controller", - "block.refinedstorage2.1k_storage_block": "1K Storage Block", - "block.refinedstorage2.4k_storage_block": "4K Storage Block", - "block.refinedstorage2.16k_storage_block": "16K Storage Block", - "block.refinedstorage2.64k_storage_block": "64K Storage Block", - "block.refinedstorage2.creative_storage_block": "Creative Storage Block", - "block.refinedstorage2.64b_fluid_storage_block": "64B Fluid Storage Block", - "block.refinedstorage2.256b_fluid_storage_block": "256B Fluid Storage Block", - "block.refinedstorage2.1024b_fluid_storage_block": "1024B Fluid Storage Block", - "block.refinedstorage2.4096b_fluid_storage_block": "4096B Fluid Storage Block", - "block.refinedstorage2.creative_fluid_storage_block": "Creative Fluid Storage Block", - "block.refinedstorage2.importer": "Importer", - "block.refinedstorage2.exporter": "Exporter", - "block.refinedstorage2.interface": "Interface", - "block.refinedstorage2.external_storage": "External Storage", - "block.refinedstorage2.detector": "Detector", - "block.refinedstorage2.constructor": "Constructor", - "block.refinedstorage2.destructor": "Destructor", - "block.refinedstorage2.wireless_transmitter": "Wireless Transmitter", - "block.refinedstorage2.storage_monitor": "Storage Monitor", - "block.refinedstorage2.network_receiver": "Network Receiver", - "block.refinedstorage2.network_transmitter": "Network Transmitter", - "block.refinedstorage2.portable_grid": "Portable Grid", - "block.refinedstorage2.creative_portable_grid": "Creative Portable Grid", - "block.refinedstorage2.security_manager": "Security Manager", - "block.refinedstorage2.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", - "block.refinedstorage2.relay": "Relay", - "block.refinedstorage2.disk_interface": "Disk Interface", - "gui.refinedstorage2.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", - "gui.refinedstorage2.disk_drive.disks": "Disks", - "gui.refinedstorage2.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", - "gui.refinedstorage2.storage.filter_help": "The resources that may or may not be allowed in this storage, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.storage.filter_mode.empty_warning": "Without any configured filters, no resources will be accepted in this storage.", - "gui.refinedstorage2.storage.filter_mode.allow.help": "Only allow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.storage.filter_mode.block.help": "Disallow resources into this storage that are configured in the filters.", - "gui.refinedstorage2.grid.sorting.direction": "Sorting direction", - "gui.refinedstorage2.grid.sorting.direction.ascending": "Ascending", - "gui.refinedstorage2.grid.sorting.direction.descending": "Descending", - "gui.refinedstorage2.grid.sorting.type": "Sorting type", - "gui.refinedstorage2.grid.sorting.type.quantity": "Quantity", - "gui.refinedstorage2.grid.sorting.type.name": "Name", - "gui.refinedstorage2.grid.sorting.type.id": "ID", - "gui.refinedstorage2.grid.sorting.type.last_modified": "Last modified", - "gui.refinedstorage2.grid.auto_selected": "Auto-selected", - "gui.refinedstorage2.grid.auto_selected.help": "Whether to auto-select the search box when opening the Grid.", - "gui.refinedstorage2.grid.synchronizer": "Synchronization mode", - "gui.refinedstorage2.grid.synchronizer.off": "Off", - "gui.refinedstorage2.grid.synchronizer.off.help": "Don't sync the search box text.", - "gui.refinedstorage2.grid.resource_type": "Resource type", - "gui.refinedstorage2.grid.resource_type.all": "All", - "gui.refinedstorage2.grid.resource_type.help": "Filter specific resource types.", - "gui.refinedstorage2.crafting_grid.move.network": "Move items to network", - "gui.refinedstorage2.crafting_grid.move.inventory": "Move items to inventory", - "gui.refinedstorage2.screen_size": "Screen size", - "gui.refinedstorage2.screen_size.stretch": "Stretch", - "gui.refinedstorage2.screen_size.small": "Small", - "gui.refinedstorage2.screen_size.medium": "Medium", - "gui.refinedstorage2.screen_size.large": "Large", - "gui.refinedstorage2.screen_size.extra_large": "Extra large", - "gui.refinedstorage2.detector.mode": "Mode", - "gui.refinedstorage2.detector.mode.under": "Emit redstone signal when under the amount", - "gui.refinedstorage2.detector.mode.equal": "Emit redstone signal when on the amount", - "gui.refinedstorage2.detector.mode.above": "Emit redstone signal when above the amount", - "gui.refinedstorage2.detector.filter_help": "The resource that should be detected in the storage network.", - "gui.refinedstorage2.destructor.pickup_items": "Pickup items instead of breaking", - "gui.refinedstorage2.destructor.filter_help": "The blocks that may or may not be destroyed, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.destructor.filter_mode.allow.help": "Only allow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.destructor.filter_mode.block.help": "Disallow blocks into the storage network that are configured in the filters.", - "gui.refinedstorage2.constructor.drop_items": "Drop items instead of placing blocks", - "gui.refinedstorage2.constructor.filter_help": "The resources that should be placed from the storage network.", - "gui.refinedstorage2.interface.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.exporter.filter_help": "The resources that should be exported from the storage network.", - "gui.refinedstorage2.importer.filter_help": "The resources that may be imported from the target inventory.", - "gui.refinedstorage2.importer.filter_mode.allow.help": "Only allow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.importer.filter_mode.block.help": "Disallow resources into the storage network that are configured in the filters.", - "gui.refinedstorage2.wireless_transmitter.distance": "%d block(s)", - "gui.refinedstorage2.storage_monitor.filter_help": "The resource to display.", - "gui.refinedstorage2.redstone_mode": "Redstone mode", - "gui.refinedstorage2.redstone_mode.ignore": "Ignore", - "gui.refinedstorage2.redstone_mode.ignore.help": "This device will always be active, regardless of redstone signal.", - "gui.refinedstorage2.redstone_mode.high": "High", - "gui.refinedstorage2.redstone_mode.high.help": "This device will only be active with a redstone signal.", - "gui.refinedstorage2.redstone_mode.low": "Low", - "gui.refinedstorage2.redstone_mode.low.help": "This device will only be active without a redstone signal.", - "gui.refinedstorage2.scheduling_mode": "Scheduling mode", - "gui.refinedstorage2.scheduling_mode.default": "Default", - "gui.refinedstorage2.scheduling_mode.default.help": "Use the first available filter.", - "gui.refinedstorage2.scheduling_mode.round_robin": "Round robin", - "gui.refinedstorage2.scheduling_mode.round_robin.help": "Use each filter in turn.", - "gui.refinedstorage2.scheduling_mode.random": "Random", - "gui.refinedstorage2.scheduling_mode.random.help": "Use a random filter.", - "gui.refinedstorage2.priority": "Priority", - "gui.refinedstorage2.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage2.amount": "Amount", - "gui.refinedstorage2.amount.reset": "Reset", - "gui.refinedstorage2.amount.set": "Set", - "gui.refinedstorage2.filter_mode": "Filter mode", - "gui.refinedstorage2.filter_mode.allow": "Allowlist", - "gui.refinedstorage2.filter_mode.block": "Blocklist", - "gui.refinedstorage2.fuzzy_mode": "Fuzzy mode", - "gui.refinedstorage2.fuzzy_mode.on": "On", - "gui.refinedstorage2.fuzzy_mode.on.storage_help": "Match the filters for the allowlist or blocklist exactly.", - "gui.refinedstorage2.fuzzy_mode.on.generic_help": "Match the filter exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_storage_network_help": "Match the filters when extracting from the storage network exactly.", - "gui.refinedstorage2.fuzzy_mode.on.extracting_source_help": "Match the filters when extracting from the source exactly.", - "gui.refinedstorage2.fuzzy_mode.off": "Off", - "gui.refinedstorage2.fuzzy_mode.off.storage_help": "Match the filters for the allowlist or blocklist without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.generic_help": "Match the filter without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_storage_network_help": "Match the filters when extracting from the storage network without comparing NBT tags.", - "gui.refinedstorage2.fuzzy_mode.off.extracting_source_help": "Match the filters when extracting from the source without comparing NBT tags.", - "gui.refinedstorage2.access_mode": "Access mode", - "gui.refinedstorage2.access_mode.insert_extract": "Insert and extract", - "gui.refinedstorage2.access_mode.insert_extract.help": "The storage network will be able to insert or extract from this storage.", - "gui.refinedstorage2.access_mode.insert": "Insert only", - "gui.refinedstorage2.access_mode.insert.help": "The storage network will only be able to insert into this storage. Contained resources will still be visible in a Grid.", - "gui.refinedstorage2.access_mode.extract": "Extract only", - "gui.refinedstorage2.access_mode.extract.help": "The storage network will only be able to extract from this storage.", - "gui.refinedstorage2.void_excess": "Void excess resources", - "gui.refinedstorage2.void_excess.help": "When void excess mode is turned on and the storage is full, it will keep accepting resources but void them.", - "gui.refinedstorage2.void_excess.allowlist_warning": "Void excess will only work when the storage is in allowlist mode.", - "gui.refinedstorage2.upgrade_slot": "Empty upgrade slot", - "gui.refinedstorage2.filter_slot.empty_filter": "Empty filter", - "gui.refinedstorage2.filter_slot.left_click_for": "Left click for", - "gui.refinedstorage2.filter_slot.right_click_for": "Right click for", - "gui.refinedstorage2.filter_slot.click_to_clear": "Click to clear", - "gui.refinedstorage2.regulator_upgrade.filter_help": "The resource that should be regulated in the target.", - "gui.refinedstorage2.network_transmitter.status.inactive": "Inactive", - "gui.refinedstorage2.network_transmitter.status.missing_network_card": "Missing Network Card", - "gui.refinedstorage2.network_transmitter.status.transmitting": "%d block(s)", - "gui.refinedstorage2.network_transmitter.status.receiver_unreachable": "Unreachable", - "gui.refinedstorage2.security_card.permission.reset": "Reset", - "gui.refinedstorage2.security_card.permission.modified": "Modified", - "gui.refinedstorage2.security_manager.redstone_mode_help": "When this device is inactive, the network will not be protected.", - "gui.refinedstorage2.security_manager.fallback_security_card_slot_hint": "Slot for a Fallback Security Card.", - "gui.refinedstorage2.security_manager.no_fallback_security_card_consequence": "Add a Fallback Security Card to this slot to set permissions for every player without a Security Card. By default, all actions are denied.", - "gui.refinedstorage2.relay.filter_help": "Resources which should be exposed from the input network to the output network if the Relay isn't in pass-through mode.", - "gui.refinedstorage2.relay.pass_through": "Pass-through", - "gui.refinedstorage2.relay.pass_through.help": "Whether this device should pass-through the entire input network signal as-is. Turn this off to selectively expose components to the output network.", - "gui.refinedstorage2.relay.pass_energy": "Pass energy", - "gui.refinedstorage2.relay.pass_energy.help": "Whether this device should pass the energy buffer from the input network to the output network.", - "gui.refinedstorage2.relay.pass_storage": "Pass storage", - "gui.refinedstorage2.relay.pass_storage.help": "Whether this device should pass the storage from the input network to the output network.", - "gui.refinedstorage2.relay.pass_security": "Pass security", - "gui.refinedstorage2.relay.pass_security.help": "Whether this device should pass the security settings from the input network to the output network.", - "gui.refinedstorage2.relay.filter_mode.allow.help": "Only expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.relay.filter_mode.block.help": "Don't expose resources from the input network to the output network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.allow.help": "Only allow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.filter_mode.block.help": "Disallow resources into the storage disks or into the network that are configured in the filters.", - "gui.refinedstorage2.disk_interface.in": "In", - "gui.refinedstorage2.disk_interface.out": "Out", - "gui.refinedstorage2.disk_interface.filter_help": "The resources that may or may not be allowed transferred from or into the provided storage disks, depending if the device is in allowlist or blocklist mode.", - "gui.refinedstorage2.disk_interface.transfer_mode": "Transfer mode", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network": "Insert into network", - "gui.refinedstorage2.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network": "Extract from network", - "gui.refinedstorage2.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "item.refinedstorage2.controller.help": "Provides the storage network with energy. Multiple are allowed in a single storage network.", - "item.refinedstorage2.creative_controller.help": "Provides the storage network with an infinite source of energy.", - "item.refinedstorage2.disk_drive.help": "Accepts storage disks to provide the storage network with storage space.", - "item.refinedstorage2.disk_interface.help": "Transfers resources between the storage network and provided storage disks.", - "item.refinedstorage2.grid.help": "Allows for interacting with the storage network.", - "item.refinedstorage2.crafting_grid.help": "Allows for interacting with the storage network, with crafting abilities.", - "item.refinedstorage2.importer.help": "Imports resources from an external source to the storage network.", - "item.refinedstorage2.exporter.help": "Exports resources from the storage network to an external destination.", - "item.refinedstorage2.interface.help": "Acts as the combination of an Importer and Exporter.", - "item.refinedstorage2.external_storage.help": "Provides the storage network with storage from an external source.", - "item.refinedstorage2.detector.help": "Emits a redstone signal if the storage network contains a resource equal, above or under a given amount.", - "item.refinedstorage2.constructor.help": "Places blocks from the storage network in the world.", - "item.refinedstorage2.destructor.help": "Destroys blocks from the world and puts them in the storage network.", - "item.refinedstorage2.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage2.quartz_enriched_iron": "Quartz Enriched Iron", - "item.refinedstorage2.processor_binding": "Processor Binding", - "item.refinedstorage2.silicon": "Silicon", - "item.refinedstorage2.raw_basic_processor": "Raw Basic Processor", - "item.refinedstorage2.raw_improved_processor": "Raw Improved Processor", - "item.refinedstorage2.raw_advanced_processor": "Raw Advanced Processor", - "item.refinedstorage2.basic_processor": "Basic Processor", - "item.refinedstorage2.improved_processor": "Improved Processor", - "item.refinedstorage2.advanced_processor": "Advanced Processor", - "item.refinedstorage2.1k_storage_part": "1K Storage Part", - "item.refinedstorage2.4k_storage_part": "4K Storage Part", - "item.refinedstorage2.16k_storage_part": "16K Storage Part", - "item.refinedstorage2.64k_storage_part": "64K Storage Part", - "item.refinedstorage2.1k_storage_disk": "1K Storage Disk", - "item.refinedstorage2.4k_storage_disk": "4K Storage Disk", - "item.refinedstorage2.16k_storage_disk": "16K Storage Disk", - "item.refinedstorage2.64k_storage_disk": "64K Storage Disk", - "item.refinedstorage2.creative_storage_disk": "Creative Storage Disk", - "item.refinedstorage2.64b_fluid_storage_part": "64B Fluid Storage Part", - "item.refinedstorage2.256b_fluid_storage_part": "256B Fluid Storage Part", - "item.refinedstorage2.1024b_fluid_storage_part": "1024B Fluid Storage Part", - "item.refinedstorage2.4096b_fluid_storage_part": "4096B Fluid Storage Part", - "item.refinedstorage2.64b_fluid_storage_disk": "64B Fluid Storage Disk", - "item.refinedstorage2.256b_fluid_storage_disk": "256B Fluid Storage Disk", - "item.refinedstorage2.1024b_fluid_storage_disk": "1024B Fluid Storage Disk", - "item.refinedstorage2.4096b_fluid_storage_disk": "4096B Fluid Storage Disk", - "item.refinedstorage2.creative_fluid_storage_disk": "Creative Fluid Storage Disk", - "item.refinedstorage2.storage_housing": "Storage Housing", - "item.refinedstorage2.construction_core": "Construction Core", - "item.refinedstorage2.destruction_core": "Destruction Core", - "item.refinedstorage2.wrench": "Wrench", - "item.refinedstorage2.wrench.helper": "Use to rotate blocks or press SHIFT and use to dismantle Refined Storage blocks.", - "item.refinedstorage2.upgrade": "Upgrade", - "item.refinedstorage2.speed_upgrade": "Speed Upgrade", - "item.refinedstorage2.stack_upgrade": "Stack Upgrade", - "item.refinedstorage2.silk_touch_upgrade": "Silk Touch Upgrade", - "item.refinedstorage2.fortune_upgrade.1": "Fortune I Upgrade", - "item.refinedstorage2.fortune_upgrade.2": "Fortune II Upgrade", - "item.refinedstorage2.fortune_upgrade.3": "Fortune III Upgrade", - "item.refinedstorage2.regulator_upgrade": "Regulator Upgrade", - "item.refinedstorage2.regulator_upgrade.help": "In an Exporter, will only export if the amount in the target is less than configured in the upgrade. In an Importer, will only import if the amount in the target is more than configured in the upgrade. Use item to configure.", - "item.refinedstorage2.range_upgrade": "Range Upgrade", - "item.refinedstorage2.creative_range_upgrade": "Creative Range Upgrade", - "item.refinedstorage2.wireless_grid": "Wireless Grid", - "item.refinedstorage2.creative_wireless_grid": "Creative Wireless Grid", - "item.refinedstorage2.wireless_transmitter.help": "Provides wireless network access for items like the Wireless Grid. Multiple are allowed in an area for wider coverage.", - "item.refinedstorage2.network_item.unbound": "Unbound.", - "item.refinedstorage2.network_item.unbound.help": "Use on any storage network device to bind.", - "item.refinedstorage2.network_item.bound_to": "Bound to %d, %d, %d.", - "item.refinedstorage2.network_item.cannot_open_with_shortcut_due_to_duplicate": "There is more than one %s in your inventory.", - "item.refinedstorage2.network_item.cannot_open_because_not_found": "There isn't any %s in your inventory.", - "item.refinedstorage2.configuration_card": "Configuration Card", - "item.refinedstorage2.configuration_card.empty": "Empty.", - "item.refinedstorage2.configuration_card.configured": "Contains configuration for %s.", - "item.refinedstorage2.configuration_card.copied_configuration": "Copied configuration for %s.", - "item.refinedstorage2.configuration_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.configuration_card.cannot_apply_configuration": "Cannot apply configuration card to different type of device. It is configured for %s.", - "item.refinedstorage2.configuration_card.applied_configuration": "Applied configuration.", - "item.refinedstorage2.configuration_card.empty_help": "Use on a storage network device while crouching to copy its configuration and upgrades to the card.", - "item.refinedstorage2.configuration_card.configured_help": "Use on the destination storage network device while crouching to transfer the configuration and upgrades. Use while crouching to clear.", - "item.refinedstorage2.network_card": "Network Card", - "item.refinedstorage2.network_card.unbound_help": "Use while crouching on a Network Receiver.", - "item.refinedstorage2.network_card.unbound": "Unbound.", - "item.refinedstorage2.network_card.bound_help": "Insert into a Network Transmitter. Use while crouching to clear binding.", - "item.refinedstorage2.network_card.bound": "Bound to %d, %d, %d in %s.", - "item.refinedstorage2.security_card": "Security Card", - "item.refinedstorage2.security_card.cleared_configuration": "Cleared configuration.", - "item.refinedstorage2.security_card.unbound": "Unbound.", - "item.refinedstorage2.security_card.unbound.help": "Right click to configure and bind to the current player.", - "item.refinedstorage2.security_card.bound": "Bound to %s.", - "item.refinedstorage2.security_card.bound.help": "Right click to configure. Use while crouching to clear configuration and binding.", - "item.refinedstorage2.fallback_security_card": "Fallback Security Card", - "item.refinedstorage2.fallback_security_card.help": "Acts as a fallback if no matching Security Card for a player is found. Right click to configure. Use while crouching to clear configuration.", - "misc.refinedstorage2.stored": "Stored: %s", - "misc.refinedstorage2.stored_with_capacity": "Stored: %s / %s (%d%%)", - "misc.refinedstorage2.total": "%d total", - "misc.refinedstorage2.last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage2.last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage2.last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage2.last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage2.last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage2.last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage2.last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage2.last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage2.last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage2.last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage2.last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage2.last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage2.last_modified.years": "Last modified %d years ago by %s", - "misc.refinedstorage2.resource_type.item": "Item", - "misc.refinedstorage2.resource_type.fluid": "Fluid", - "misc.refinedstorage2.press_shift_for_help": "Press SHIFT for help", - "misc.refinedstorage2.no_permission": "No permission", - "misc.refinedstorage2.no_permission.open": "You are not allowed to open the %s.", - "misc.refinedstorage2.no_permission.insert": "You are not allowed to insert.", - "misc.refinedstorage2.no_permission.extract": "You are not allowed to extract.", - "misc.refinedstorage2.no_permission.build.place": "You are not allowed to place a %s here.", - "misc.refinedstorage2.no_permission.build.break": "You are not allowed to break the %s.", - "misc.refinedstorage2.no_permission.build.rotate": "You are not allowed to rotate the %s.", - "misc.refinedstorage2.no_permission.build.dismantle": "You are not allowed to dismantle the %s.", - "key.refinedstorage2.focus_search_bar": "Focus search bar", - "key.refinedstorage2.clear_crafting_grid_matrix_to_network": "Clear Crafting Grid matrix to network", - "key.refinedstorage2.clear_crafting_grid_matrix_to_inventory": "Clear Crafting Grid matrix to inventory", - "key.refinedstorage2.open_wireless_grid": "Open Wireless Grid", - "refinedstorage2.subtitle.wrench": "Wrench used", - "permission.refinedstorage2.insert": "Insert", - "permission.refinedstorage2.insert.description": "Whether the player can insert resources in a network.", - "permission.refinedstorage2.extract": "Extract", - "permission.refinedstorage2.extract.description": "Whether the player can extract resources from a network.", - "permission.refinedstorage2.autocrafting": "Autocrafting", - "permission.refinedstorage2.autocrafting.description": "Whether the player can start, cancel or view an autocrafting task.", - "permission.refinedstorage2.open": "Open", - "permission.refinedstorage2.open.description": "Whether the player can open network device GUIs.", - "permission.refinedstorage2.build": "Build", - "permission.refinedstorage2.build.description": "Whether the player can add or remove network devices.", - "permission.refinedstorage2.security": "Security", - "permission.refinedstorage2.security.description": "Whether the player can manage the security options for a network.", - "tag.item.refinedstorage2.cables": "Cables", - "tag.item.refinedstorage2.constructors": "Constructors", - "tag.item.refinedstorage2.controllers": "Controllers", - "tag.item.refinedstorage2.crafting_grids": "Crafting Grids", - "tag.item.refinedstorage2.creative_controllers": "Creative Controllers", - "tag.item.refinedstorage2.destructors": "Destructors", - "tag.item.refinedstorage2.detectors": "Detectors", - "tag.item.refinedstorage2.exporters": "Exporters", - "tag.item.refinedstorage2.external_storages": "External Storages", - "tag.item.refinedstorage2.fluid_storage_disks": "Fluid Storage Disks", - "tag.item.refinedstorage2.grids": "Grids", - "tag.item.refinedstorage2.importers": "Importers", - "tag.item.refinedstorage2.network_receivers": "Network Receivers", - "tag.item.refinedstorage2.network_transmitters": "Network Transmitters", - "tag.item.refinedstorage2.relays": "Relays", - "tag.item.refinedstorage2.security_managers": "Security Managers", - "tag.item.refinedstorage2.storage_disks": "Storage Disks", - "tag.item.refinedstorage2.wireless_transmitters": "Wireless Transmitters", - "tag.item.refinedstorage2.disk_interfaces": "Disk Interfaces", - "text.autoconfig.refinedstorage2.title": "Refined Storage 2", - "text.autoconfig.refinedstorage2.option.smoothScrolling": "Smooth scrolling", - "text.autoconfig.refinedstorage2.option.screenSize": "Screen size", - "text.autoconfig.refinedstorage2.option.maxRowsStretch": "Maximum amount of rows when screen size is stretched", - "text.autoconfig.refinedstorage2.option.grid": "Grid", - "text.autoconfig.refinedstorage2.option.grid.largeFont": "Large font", - "text.autoconfig.refinedstorage2.option.grid.preventSortingWhileShiftIsDown": "Prevent sorting while SHIFT is down", - "text.autoconfig.refinedstorage2.option.grid.detailedTooltip": "Detailed tooltip", - "text.autoconfig.refinedstorage2.option.grid.rememberSearchQuery": "Remember search query", - "text.autoconfig.refinedstorage2.option.grid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.grid.autoSelected": "Auto selected search box", - "text.autoconfig.refinedstorage2.option.grid.synchronizer": "Synchronizer", - "text.autoconfig.refinedstorage2.option.grid.resourceTypeId": "Resource type", - "text.autoconfig.refinedstorage2.option.grid.sortingDirection": "Sorting direction", - "text.autoconfig.refinedstorage2.option.grid.sortingType": "Sorting type", - "text.autoconfig.refinedstorage2.option.craftingGrid": "Crafting Grid", - "text.autoconfig.refinedstorage2.option.craftingGrid.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.craftingGrid.craftingMatrixCloseBehavior": "Crafting matrix close behavior", - "text.autoconfig.refinedstorage2.option.controller": "Controller", - "text.autoconfig.refinedstorage2.option.controller.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.cable": "Cable", - "text.autoconfig.refinedstorage2.option.cable.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive": "Disk Drive", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskDrive.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.diskInterface": "Disk Interface", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.diskInterface.energyUsagePerDisk": "Energy usage per disk", - "text.autoconfig.refinedstorage2.option.storageBlock": "Storage Block", - "text.autoconfig.refinedstorage2.option.storageBlock.oneKEnergyUsage": "1K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.fourKEnergyUsage": "4K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixteenKEnergyUsage": "16K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.sixtyFourKEnergyUsage": "64K energy usage", - "text.autoconfig.refinedstorage2.option.storageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock": "Fluid Storage Block", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.sixtyFourBEnergyUsage": "64B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.twoHundredFiftySixBEnergyUsage": "256B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.thousandTwentyFourBEnergyUsage": "1024B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.fourThousandNinetySixBEnergyUsage": "4096B energy usage", - "text.autoconfig.refinedstorage2.option.fluidStorageBlock.creativeEnergyUsage": "Creative energy usage", - "text.autoconfig.refinedstorage2.option.importer": "Importer", - "text.autoconfig.refinedstorage2.option.importer.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.exporter": "Exporter", - "text.autoconfig.refinedstorage2.option.exporter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.detector": "Detector", - "text.autoconfig.refinedstorage2.option.detector.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.constructor": "Constructor", - "text.autoconfig.refinedstorage2.option.constructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.destructor": "Destructor", - "text.autoconfig.refinedstorage2.option.destructor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.upgrade": "Upgrade", - "text.autoconfig.refinedstorage2.option.upgrade.speedUpgradeEnergyUsage": "Speed Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.stackUpgradeEnergyUsage": "Stack Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune1UpgradeEnergyUsage": "Fortune 1 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune2UpgradeEnergyUsage": "Fortune 2 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.fortune3UpgradeEnergyUsage": "Fortune 3 Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.silkTouchUpgradeEnergyUsage": "Silk Touch Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.regulatorUpgradeEnergyUsage": "Regulator Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeEnergyUsage": "Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.creativeRangeUpgradeEnergyUsage": "Creative Range Upgrade energy usage", - "text.autoconfig.refinedstorage2.option.upgrade.rangeUpgradeRange": "Range Upgrade range", - "text.autoconfig.refinedstorage2.option.iface": "Interface", - "text.autoconfig.refinedstorage2.option.iface.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.externalStorage": "External Storage", - "text.autoconfig.refinedstorage2.option.externalStorage.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid": "Wireless Grid", - "text.autoconfig.refinedstorage2.option.wirelessGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.wirelessGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.wirelessGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter": "Wireless Transmitter", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.wirelessTransmitter.baseRange": "Base range", - "text.autoconfig.refinedstorage2.option.storageMonitor": "Storage Monitor", - "text.autoconfig.refinedstorage2.option.storageMonitor.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkReceiver": "Network Receiver", - "text.autoconfig.refinedstorage2.option.networkReceiver.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.networkTransmitter": "Network Transmitter", - "text.autoconfig.refinedstorage2.option.networkTransmitter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid": "Portable Grid", - "text.autoconfig.refinedstorage2.option.portableGrid.energyCapacity": "Energy capacity", - "text.autoconfig.refinedstorage2.option.portableGrid.openEnergyUsage": "Open energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.insertEnergyUsage": "Insert energy usage", - "text.autoconfig.refinedstorage2.option.portableGrid.extractEnergyUsage": "Extract energy usage", - "text.autoconfig.refinedstorage2.option.securityCard": "Security Card", - "text.autoconfig.refinedstorage2.option.securityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard": "Fallback Security Card", - "text.autoconfig.refinedstorage2.option.fallbackSecurityCard.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.securityManager": "Security Manager", - "text.autoconfig.refinedstorage2.option.securityManager.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage2.option.relay": "Relay", - "text.autoconfig.refinedstorage2.option.relay.inputNetworkEnergyUsage": "Input network energy usage", - "text.autoconfig.refinedstorage2.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", - "advancements.refinedstorage2.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", - "advancements.refinedstorage2.connecting": "Connecting", - "advancements.refinedstorage2.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", - "advancements.refinedstorage2.drives": "Drives", - "advancements.refinedstorage2.drives.description": "Craft a Disk Drive to be able to store your storage disks", - "advancements.refinedstorage2.interfacing_with_disks": "Interfacing with disks", - "advancements.refinedstorage2.interfacing_with_disks.description": "Craft a Disk Interface to transfer resources between the storage network and storage disks", - "advancements.refinedstorage2.storing_items": "Storing items", - "advancements.refinedstorage2.storing_items.description": "Craft a Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.viewing_your_storage": "Viewing your storage", - "advancements.refinedstorage2.viewing_your_storage.description": "Craft a Grid to interact with your storage", - "advancements.refinedstorage2.upgrading_your_grid": "Upgrading your Grid", - "advancements.refinedstorage2.upgrading_your_grid.description": "Upgrade your Grid to a Crafting Grid to get crafting abilities", - "advancements.refinedstorage2.storing_fluids": "Storing fluids", - "advancements.refinedstorage2.storing_fluids.description": "Craft a Fluid Storage Disk and put it in your Disk Drive", - "advancements.refinedstorage2.importing": "Importing", - "advancements.refinedstorage2.importing.description": "Get resources into the storage network with an Importer", - "advancements.refinedstorage2.exporting": "Exporting", - "advancements.refinedstorage2.exporting.description": "Get resources out of the storage network with an Exporter", - "advancements.refinedstorage2.upgrading": "Upgrading", - "advancements.refinedstorage2.upgrading.description": "Craft an Upgrade to improve various devices", - "advancements.refinedstorage2.interface_to_the_world": "Interface to the world", - "advancements.refinedstorage2.interface_to_the_world.description": "Export and import items at the same time with an Interface", - "advancements.refinedstorage2.storing_externally": "Storing externally", - "advancements.refinedstorage2.storing_externally.description": "Use an External Storage to provide the network with storage from an external block like a chest", - "advancements.refinedstorage2.detecting": "Detecting", - "advancements.refinedstorage2.detecting.description": "Use redstone to check resources stored in the storage network", - "advancements.refinedstorage2.construction": "Construction", - "advancements.refinedstorage2.construction.description": "Get blocks from the storage network into the world with a Constructor", - "advancements.refinedstorage2.destruction": "Destruction", - "advancements.refinedstorage2.destruction.description": "Get blocks from in the world into the storage network with a Destructor", - "advancements.refinedstorage2.wireless": "Wireless", - "advancements.refinedstorage2.wireless.description": "Access your resources wirelessly with a Wireless Grid", - "advancements.refinedstorage2.better_than_a_barrel": "Better than a barrel", - "advancements.refinedstorage2.better_than_a_barrel.description": "Craft a Storage Monitor to view, insert or extract resources in a storage network", - "advancements.refinedstorage2.no_cables_required": "No cables required", - "advancements.refinedstorage2.no_cables_required.description": "Add extra components to your storage network without using cables by using a Network Transmitter, Network Receiver and Network Card", - "advancements.refinedstorage2.portable_storage": "Portable storage", - "advancements.refinedstorage2.portable_storage.description": "Craft a Portable Grid to access the content of disks without requiring a storage network", - "advancements.refinedstorage2.security": "Security", - "advancements.refinedstorage2.security.description": "Secure your storage network with a Security Manager and a Security Card", - "advancements.refinedstorage2.conditional_connecting": "Conditional connecting", - "advancements.refinedstorage2.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/1024b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/1024b_fluid_storage_block.json deleted file mode 100644 index 4bf869c08..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/1024b_fluid_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/fluid_storage_block/1024b_fluid_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/16k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/16k_storage_block.json deleted file mode 100644 index 7dc586dba..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/16k_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/storage_block/16k_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/1k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/1k_storage_block.json deleted file mode 100644 index 504c8e574..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/1k_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/storage_block/1k_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/256b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/256b_fluid_storage_block.json deleted file mode 100644 index 52d1b96aa..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/256b_fluid_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/fluid_storage_block/256b_fluid_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/4096b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/4096b_fluid_storage_block.json deleted file mode 100644 index 56d449ce2..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/4096b_fluid_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/fluid_storage_block/4096b_fluid_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/4k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/4k_storage_block.json deleted file mode 100644 index eb59a62bc..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/4k_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/storage_block/4k_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/64b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/64b_fluid_storage_block.json deleted file mode 100644 index 043b3426f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/64b_fluid_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/fluid_storage_block/64b_fluid_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/64k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/64k_storage_block.json deleted file mode 100644 index 841cf3192..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/64k_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/storage_block/64k_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor/active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor/active.json deleted file mode 100644 index e5811b6b1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor/active.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/constructor_destructor/active", - "textures": { - "border": "refinedstorage2:block/cable/part_border", - "front": "refinedstorage2:block/constructor/front", - "cutout": "refinedstorage2:block/constructor/cutouts/active" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor/inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor/inactive.json deleted file mode 100644 index d4f463b18..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor/inactive.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/constructor_destructor/inactive", - "textures": { - "border": "refinedstorage2:block/cable/part_border", - "front": "refinedstorage2:block/constructor/front", - "cutout": "refinedstorage2:block/constructor/cutouts/inactive" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor_destructor/active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor_destructor/active.json deleted file mode 100644 index f98ac8e7c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor_destructor/active.json +++ /dev/null @@ -1,165 +0,0 @@ -{ - "render_type": "cutout", - "textures": { - "border": "refinedstorage2:block/cable/part_border" - }, - "elements": [ - { - "name": "Line1", - "from": [ - 7.0, - 7.0, - 2.0 - ], - "to": [ - 9.0, - 9.0, - 6.0 - ], - "faces": { - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 14.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 16.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 2.0, - 0.0, - 14.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 2.0, - 14.0, - 14.0, - 16.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#cutout", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ], - "neoforge_data": { - "block_light": 15, - "sky_light": 15 - } - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor_destructor/inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor_destructor/inactive.json deleted file mode 100644 index 0dbc769af..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/constructor_destructor/inactive.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "render_type": "cutout", - "textures": { - "border": "refinedstorage2:block/cable/part_border" - }, - "elements": [ - { - "name": "Line1", - "from": [ - 7.0, - 7.0, - 2.0 - ], - "to": [ - 9.0, - 9.0, - 6.0 - ], - "faces": { - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 14.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 16.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 2.0, - 0.0, - 14.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 2.0, - 14.0, - 14.0, - 16.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#cutout", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly_off.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly_off.json deleted file mode 100644 index 9d1e1264f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly_off.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/nearly", - "textures": { - "particle": "refinedstorage2:block/controller/off", - "all": "refinedstorage2:block/controller/on", - "cutout_gray": "refinedstorage2:block/controller/cutouts/nearly_off", - "cutout": "refinedstorage2:block/controller/cutouts/nearly_off_gray" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly_on.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly_on.json deleted file mode 100644 index 308cf5bf2..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/nearly_on.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "refinedstorage2:block/controller/nearly", - "textures": { - "particle": "refinedstorage2:block/controller/off", - "all": "refinedstorage2:block/controller/on", - "cutout_gray": "refinedstorage2:block/controller/cutouts/nearly_on", - "cutout": "refinedstorage2:block/controller/cutouts/nearly_on_gray" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/off.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/off.json deleted file mode 100644 index 1498cd135..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/controller/off.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/all_cutout", - "textures": { - "particle": "refinedstorage2:block/controller/off", - "all": "refinedstorage2:block/controller/off", - "cutout": "refinedstorage2:block/controller/cutouts/off" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_fluid_storage_block.json deleted file mode 100644 index dbc0b72ec..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_fluid_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/fluid_storage_block/creative_fluid_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_portable_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_portable_grid.json deleted file mode 100644 index c8b32b4d1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_portable_grid.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "__comment": "Forge-only", - "loader": "refinedstorage2:portable_grid" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_storage_block.json deleted file mode 100644 index 1889acbd8..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/creative_storage_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/storage_block/creative_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/destructor/active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/destructor/active.json deleted file mode 100644 index 50442e8c6..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/destructor/active.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/constructor_destructor/active", - "textures": { - "border": "refinedstorage2:block/cable/part_border", - "front": "refinedstorage2:block/destructor/front", - "cutout": "refinedstorage2:block/destructor/cutouts/active" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/destructor/inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/destructor/inactive.json deleted file mode 100644 index 85c234671..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/destructor/inactive.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "refinedstorage2:block/constructor_destructor/inactive", - "textures": { - "border": "refinedstorage2:block/cable/part_border", - "front": "refinedstorage2:block/destructor/front", - "cutout": "refinedstorage2:block/destructor/cutouts/inactive" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk_drive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk_drive.json deleted file mode 100644 index 5a357dea5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk_drive.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "__comment": "Forge-only", - "loader": "refinedstorage2:disk_drive" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk_drive/base.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk_drive/base.json deleted file mode 100644 index fd97de0e7..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/disk_drive/base.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "particle": "refinedstorage2:block/disk_drive/front", - "front": "refinedstorage2:block/disk_drive/front", - "bottom": "refinedstorage2:block/disk_drive/bottom", - "top": "refinedstorage2:block/disk_drive/top", - "side": "refinedstorage2:block/disk_drive/side" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#bottom", - "cullface": "down" - }, - "up": { - "texture": "#top", - "cullface": "up" - }, - "north": { - "texture": "#front", - "cullface": "north" - }, - "south": { - "texture": "#side", - "cullface": "south" - }, - "west": { - "texture": "#side", - "cullface": "west" - }, - "east": { - "texture": "#side", - "cullface": "east" - } - } - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/exporter.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/exporter.json deleted file mode 100644 index 34117dbd6..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/exporter.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "render_type": "cutout", - "textures": { - "border": "refinedstorage2:block/cable/part_border" - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6, - 6, - 0 - ], - "to": [ - 10, - 10, - 2 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 4, - 4 - ], - "texture": "#border" - }, - "east": { - "uv": [ - 0, - 0, - 2, - 4 - ], - "texture": "#border" - }, - "south": { - "uv": [ - 0, - 0, - 4, - 4 - ], - "texture": "#border" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 4 - ], - "texture": "#border" - }, - "up": { - "uv": [ - 0, - 0, - 4, - 2 - ], - "texture": "#border" - }, - "down": { - "uv": [ - 0, - 0, - 4, - 2 - ], - "texture": "#border" - } - } - }, - { - "name": "Line2", - "from": [ - 5, - 5, - 2 - ], - "to": [ - 11, - 11, - 4 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 6, - 6 - ], - "texture": "#border" - }, - "east": { - "uv": [ - 0, - 0, - 2, - 6 - ], - "texture": "#border" - }, - "south": { - "uv": [ - 0, - 0, - 6, - 6 - ], - "texture": "#border" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 6 - ], - "texture": "#border" - }, - "up": { - "uv": [ - 0, - 0, - 6, - 2 - ], - "texture": "#border" - }, - "down": { - "uv": [ - 0, - 0, - 6, - 2 - ], - "texture": "#border" - } - } - }, - { - "name": "Line3", - "from": [ - 3, - 3, - 4 - ], - "to": [ - 13, - 13, - 6 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 10, - 10 - ], - "texture": "#border" - }, - "east": { - "uv": [ - 0, - 0, - 2, - 10 - ], - "texture": "#border" - }, - "south": { - "uv": [ - 0, - 0, - 10, - 10 - ], - "texture": "#border" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 10 - ], - "texture": "#border" - }, - "up": { - "uv": [ - 0, - 0, - 10, - 2 - ], - "texture": "#border" - }, - "down": { - "uv": [ - 0, - 0, - 10, - 2 - ], - "texture": "#border" - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/external_storage.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/external_storage.json deleted file mode 100644 index 261d5abd5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/external_storage.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "render_type": "cutout", - "textures": { - "border": "refinedstorage2:block/cable/part_border" - }, - "elements": [ - { - "name": "Line1", - "from": [ - 7.0, - 7.0, - 2.0 - ], - "to": [ - 9.0, - 9.0, - 6.0 - ], - "faces": { - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 3.0, - 3.0, - 0.0 - ], - "to": [ - 13.0, - 13.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/importer.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/importer.json deleted file mode 100644 index b014235e0..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/importer.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "render_type": "cutout", - "textures": { - "border": "refinedstorage2:block/cable/part_border" - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6.0, - 6.0, - 4.0 - ], - "to": [ - 10.0, - 10.0, - 6.0 - ], - "faces": { - "north": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 5.0, - 5.0, - 2.0 - ], - "to": [ - 11.0, - 11.0, - 4.0 - ], - "faces": { - "north": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 3.0, - 3.0, - 0.0 - ], - "to": [ - 13.0, - 13.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/interface_active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/interface_active.json deleted file mode 100644 index d1b902270..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/interface_active.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/interface/active" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/interface_inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/interface_inactive.json deleted file mode 100644 index 43d2d258d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/interface_inactive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/interface/inactive" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/machine_casing.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/machine_casing.json deleted file mode 100644 index 4ffbfed8a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/machine_casing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/machine_casing" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid.json deleted file mode 100644 index c8b32b4d1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "__comment": "Forge-only", - "loader": "refinedstorage2:portable_grid" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/active.json deleted file mode 100644 index f25e04be6..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/active.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/portable_grid/base", - "textures": { - "texture1": "refinedstorage2:block/portable_grid/portable_grid_2" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/base.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/base.json deleted file mode 100644 index 26581c128..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/base.json +++ /dev/null @@ -1,558 +0,0 @@ -{ - "render_type": "cutout", - "parent": "block/cube", - "textures": { - "particle": "refinedstorage2:block/portable_grid/portable_grid_1", - "texture0": "refinedstorage2:block/portable_grid/portable_grid_1", - "texture2": "refinedstorage2:block/portable_grid/portable_grid_3", - "texture3": "refinedstorage2:block/portable_grid/portable_grid_4", - "texture4": "refinedstorage2:block/portable_grid/portable_grid_5", - "texture5": "refinedstorage2:block/portable_grid/portable_grid_6", - "texture6": "refinedstorage2:block/portable_grid/portable_grid_7", - "texture7": "refinedstorage2:block/portable_grid/portable_grid_8" - }, - "display": { - "firstperson_lefthand": { - "rotation": [ - 10, - 130, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ], - "translation": [ - 2, - 3.5, - 0 - ] - }, - "firstperson_righthand": { - "rotation": [ - 10, - 130, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ], - "translation": [ - 2, - 3.5, - 0 - ] - }, - "thirdperson_lefthand": { - "rotation": [ - 10, - 180, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ], - "translation": [ - 0, - 3, - 1 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 10, - 180, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ], - "translation": [ - 0, - 3, - 1 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "ground": { - "translation": [ - 0, - 3, - 0 - ], - "scale": [ - 0.25, - 0.25, - 0.25 - ] - }, - "fixed": { - "scale": [ - 0.75, - 0.75, - 0.75 - ] - } - }, - "elements": [ - { - "name": "cube", - "from": [ - 0, - 6, - 5 - ], - "to": [ - 16, - 13, - 7 - ], - "shade": true, - "faces": { - "north": { - "uv": [ - 0, - 7, - 16, - 14 - ], - "texture": "#texture0" - }, - "east": { - "uv": [ - 0, - 7, - 2, - 14 - ], - "texture": "#texture1" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 7 - ], - "texture": "#texture0" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 7 - ], - "texture": "#texture1" - }, - "up": { - "uv": [ - 0, - 0, - 16, - 2 - ], - "texture": "#texture0", - "rotation": 180 - }, - "down": { - "uv": [ - 0, - 13, - 16, - 15 - ], - "texture": "#texture1", - "rotation": 180 - } - }, - "rotation": { - "origin": [ - 8, - 6, - 7 - ], - "axis": "x", - "angle": 22.5 - } - }, - { - "name": "cube", - "from": [ - 0, - 4, - 7 - ], - "to": [ - 16, - 6, - 16 - ], - "shade": true, - "faces": { - "north": { - "uv": [ - 0, - 14, - 16, - 16 - ], - "texture": "#texture0" - }, - "east": { - "uv": [ - 3, - 2, - 12, - 4 - ], - "texture": "#texture1" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 2 - ], - "texture": "#texture2" - }, - "west": { - "uv": [ - 3, - 0, - 12, - 2 - ], - "texture": "#texture1" - }, - "up": { - "uv": [ - 0, - 2, - 16, - 11 - ], - "texture": "#texture2", - "rotation": 180 - }, - "down": { - "uv": [ - 0, - 0, - 16, - 9 - ], - "texture": "#texture3", - "rotation": 180 - } - } - }, - { - "name": "cube", - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 4, - 16 - ], - "shade": true, - "faces": { - "north": { - "uv": [ - 0, - 9, - 16, - 13 - ], - "texture": "#texture3" - }, - "east": { - "uv": [ - 0, - 4, - 16, - 8 - ], - "texture": "#texture4" - }, - "south": { - "uv": [ - 0, - 11, - 16, - 15 - ], - "texture": "#texture2" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 4 - ], - "texture": "#texture4" - }, - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#texture5", - "rotation": 180 - }, - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#texture6", - "rotation": 180 - } - } - }, - { - "name": "cube", - "from": [ - 1, - 4, - 1 - ], - "to": [ - 15, - 5, - 7 - ], - "shade": true, - "faces": { - "north": { - "uv": [ - 0, - 15, - 14, - 16 - ], - "texture": "#texture2" - }, - "east": { - "uv": [ - 4, - 9, - 10, - 10 - ], - "texture": "#texture1" - }, - "south": { - "uv": [ - 2, - 13, - 16, - 14 - ], - "texture": "#texture1" - }, - "west": { - "uv": [ - 4, - 8, - 10, - 9 - ], - "texture": "#texture1" - }, - "up": { - "uv": [ - 0, - 8, - 14, - 14 - ], - "texture": "#texture4", - "rotation": 180 - }, - "down": { - "uv": [ - 0, - 0, - 14, - 6 - ], - "texture": "#texture7", - "rotation": 180 - } - } - }, - { - "name": "cube", - "from": [ - 3, - 4.5, - 6 - ], - "to": [ - 4, - 6.5, - 8 - ], - "shade": true, - "faces": { - "north": { - "uv": [ - 5, - 10, - 6, - 12 - ], - "texture": "#texture1" - }, - "east": { - "uv": [ - 7, - 4, - 9, - 6 - ], - "texture": "#texture1" - }, - "south": { - "uv": [ - 4, - 10, - 5, - 12 - ], - "texture": "#texture1" - }, - "west": { - "uv": [ - 6, - 10, - 8, - 12 - ], - "texture": "#texture1" - }, - "up": { - "uv": [ - 7, - 6, - 8, - 8 - ], - "texture": "#texture1", - "rotation": 180 - }, - "down": { - "uv": [ - 8, - 6, - 9, - 8 - ], - "texture": "#texture1", - "rotation": 180 - } - } - }, - { - "name": "cube", - "from": [ - 12, - 4.5, - 6 - ], - "to": [ - 13, - 6.5, - 8 - ], - "shade": true, - "faces": { - "north": { - "uv": [ - 9, - 4, - 10, - 6 - ], - "texture": "#texture1" - }, - "east": { - "uv": [ - 9, - 10, - 11, - 12 - ], - "texture": "#texture1" - }, - "south": { - "uv": [ - 8, - 10, - 9, - 12 - ], - "texture": "#texture1" - }, - "west": { - "uv": [ - 9, - 6, - 11, - 8 - ], - "texture": "#texture1" - }, - "up": { - "uv": [ - 7, - 6, - 8, - 8 - ], - "texture": "#texture1", - "rotation": 180 - }, - "down": { - "uv": [ - 8, - 6, - 9, - 8 - ], - "texture": "#texture1", - "rotation": 180 - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/inactive.json deleted file mode 100644 index c058e99c2..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/portable_grid/inactive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "refinedstorage2:block/portable_grid/base", - "textures": { - "texture1": "refinedstorage2:block/portable_grid/portable_grid_2_inactive" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_copper_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_copper_block.json deleted file mode 100644 index e5b9fcbf9..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_copper_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/quartz_enriched_copper_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_iron_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_iron_block.json deleted file mode 100644 index 1ee0816eb..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/quartz_enriched_iron_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "refinedstorage2:block/quartz_enriched_iron_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/storage_monitor.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/storage_monitor.json deleted file mode 100644 index 422b44501..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/storage_monitor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "refinedstorage2:block/side", - "north": "refinedstorage2:block/storage_monitor/front", - "east": "refinedstorage2:block/storage_monitor/left", - "south": "refinedstorage2:block/storage_monitor/back", - "west": "refinedstorage2:block/storage_monitor/right", - "up": "refinedstorage2:block/storage_monitor/top", - "down": "refinedstorage2:block/bottom" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/wireless_transmitter/active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/wireless_transmitter/active.json deleted file mode 100644 index e1d2695ea..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/wireless_transmitter/active.json +++ /dev/null @@ -1,233 +0,0 @@ -{ - "render_type": "cutout", - "parent": "block/cube", - "ambientocclusion": false, - "textures": { - "particle": "refinedstorage2:block/wireless_transmitter/base", - "torch": "refinedstorage2:block/wireless_transmitter/base" - }, - "elements": [ - { - "from": [ - 7, - 0, - 7 - ], - "to": [ - 9, - 10, - 9 - ], - "shade": false, - "faces": { - "down": { - "uv": [ - 7, - 13, - 9, - 15 - ], - "texture": "#torch" - }, - "up": { - "uv": [ - 7, - 6, - 9, - 8 - ], - "texture": "#torch" - } - } - }, - { - "from": [ - 7, - 0, - 0 - ], - "to": [ - 9, - 16, - 16 - ], - "shade": false, - "faces": { - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - } - } - }, - { - "from": [ - 0, - 0, - 7 - ], - "to": [ - 16, - 16, - 9 - ], - "shade": false, - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - } - } - }, - { - "from": [ - 7, - 0, - 7 - ], - "to": [ - 9, - 10, - 9 - ], - "shade": false, - "faces": { - "down": { - "uv": [ - 7, - 13, - 9, - 15 - ], - "texture": "#cutout", - "neoforge_data": { - "block_light": 15, - "sky_light": 15 - } - }, - "up": { - "uv": [ - 7, - 6, - 9, - 8 - ], - "texture": "#cutout", - "neoforge_data": { - "block_light": 15, - "sky_light": 15 - } - } - } - }, - { - "from": [ - 7, - 0, - 0 - ], - "to": [ - 9, - 16, - 16 - ], - "shade": false, - "faces": { - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#cutout", - "neoforge_data": { - "block_light": 15, - "sky_light": 15 - } - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#cutout", - "neoforge_data": { - "block_light": 15, - "sky_light": 15 - } - } - } - }, - { - "from": [ - 0, - 0, - 7 - ], - "to": [ - 16, - 16, - 9 - ], - "shade": false, - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#cutout", - "neoforge_data": { - "block_light": 15, - "sky_light": 15 - } - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#cutout", - "neoforge_data": { - "block_light": 15, - "sky_light": 15 - } - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/wireless_transmitter/inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/wireless_transmitter/inactive.json deleted file mode 100644 index 4e1f0ad54..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/block/wireless_transmitter/inactive.json +++ /dev/null @@ -1,210 +0,0 @@ -{ - "render_type": "cutout", - "parent": "block/cube", - "ambientocclusion": false, - "textures": { - "particle": "refinedstorage2:block/wireless_transmitter/base", - "torch": "refinedstorage2:block/wireless_transmitter/base", - "cutout": "refinedstorage2:block/wireless_transmitter/cutouts/inactive" - }, - "elements": [ - { - "from": [ - 7, - 0, - 7 - ], - "to": [ - 9, - 10, - 9 - ], - "shade": false, - "faces": { - "down": { - "uv": [ - 7, - 13, - 9, - 15 - ], - "texture": "#torch" - }, - "up": { - "uv": [ - 7, - 6, - 9, - 8 - ], - "texture": "#torch" - } - } - }, - { - "from": [ - 7, - 0, - 0 - ], - "to": [ - 9, - 16, - 16 - ], - "shade": false, - "faces": { - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - } - } - }, - { - "from": [ - 0, - 0, - 7 - ], - "to": [ - 16, - 16, - 9 - ], - "shade": false, - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#torch" - } - } - }, - { - "from": [ - 7, - 0, - 7 - ], - "to": [ - 9, - 10, - 9 - ], - "shade": false, - "faces": { - "down": { - "uv": [ - 7, - 13, - 9, - 15 - ], - "texture": "#cutout" - }, - "up": { - "uv": [ - 7, - 6, - 9, - 8 - ], - "texture": "#cutout" - } - } - }, - { - "from": [ - 7, - 0, - 0 - ], - "to": [ - 9, - 16, - 16 - ], - "shade": false, - "faces": { - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#cutout" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#cutout" - } - } - }, - { - "from": [ - 0, - 0, - 7 - ], - "to": [ - 16, - 16, - 9 - ], - "shade": false, - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#cutout" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#cutout" - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_block.json deleted file mode 100644 index f92fab2fa..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/1024b_fluid_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_disk.json deleted file mode 100644 index f20519f12..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/1024b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_part.json deleted file mode 100644 index e19842202..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1024b_fluid_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/1024b_fluid_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_block.json deleted file mode 100644 index cc089c3f4..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/16k_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_disk.json deleted file mode 100644 index 5305a032d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/16k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_part.json deleted file mode 100644 index 1450d7829..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/16k_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/16k_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_block.json deleted file mode 100644 index b233ac210..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/1k_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_disk.json deleted file mode 100644 index b547c5d21..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/1k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_part.json deleted file mode 100644 index c4e9c9a05..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/1k_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/1k_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_block.json deleted file mode 100644 index 808185c10..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/256b_fluid_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_disk.json deleted file mode 100644 index b2944d5d8..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/256b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_part.json deleted file mode 100644 index 39dd96955..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/256b_fluid_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/256b_fluid_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_block.json deleted file mode 100644 index 832da5c0e..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/4096b_fluid_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_disk.json deleted file mode 100644 index dcc685b62..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/4096b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_part.json deleted file mode 100644 index 11b557145..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4096b_fluid_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/4096b_fluid_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_block.json deleted file mode 100644 index 269f3d425..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/4k_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_disk.json deleted file mode 100644 index cc6966b3e..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/4k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_part.json deleted file mode 100644 index 6e45c68d6..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/4k_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/4k_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_block.json deleted file mode 100644 index 20e69111b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/64b_fluid_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_disk.json deleted file mode 100644 index df26cfc4f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/64b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_part.json deleted file mode 100644 index 349ef7c68..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64b_fluid_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/64b_fluid_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_block.json deleted file mode 100644 index 932571de4..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/64k_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_disk.json deleted file mode 100644 index b0666a532..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/64k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_part.json deleted file mode 100644 index 2b7848f7a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/64k_storage_part.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/64k_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/advanced_processor.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/advanced_processor.json deleted file mode 100644 index d6f776701..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/advanced_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/advanced_processor" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/basic_processor.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/basic_processor.json deleted file mode 100644 index aea62ba09..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/basic_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/basic_processor" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/book.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/book.json deleted file mode 100644 index 1bb9599d9..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/book.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/book" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card.json deleted file mode 100644 index 947338412..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parent": "item/generated", - "overrides": [ - { - "predicate": { - "refinedstorage2:configuration_card_active": 0 - }, - "model": "refinedstorage2:item/configuration_card/inactive" - }, - { - "predicate": { - "refinedstorage2:configuration_card_active": 1 - }, - "model": "refinedstorage2:item/configuration_card/active" - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card/active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card/active.json deleted file mode 100644 index d59df8a1f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card/active.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/configuration_card/active" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card/inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card/inactive.json deleted file mode 100644 index 211dd1de5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/configuration_card/inactive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/configuration_card/inactive" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/construction_core.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/construction_core.json deleted file mode 100644 index 6d629ee85..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/construction_core.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/construction_core" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/constructor/base.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/constructor/base.json deleted file mode 100644 index 757e6bc49..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/constructor/base.json +++ /dev/null @@ -1,392 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "border": "refinedstorage2:block/cable/part_border", - "front": "refinedstorage2:block/constructor/front", - "cutout": "refinedstorage2:block/constructor/cutouts/active" - }, - "elements": [ - { - "name": "Core", - "from": [ - 6, - 6, - 6 - ], - "to": [ - 10, - 10, - 10 - ], - "faces": { - "north": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part1", - "from": [ - 10, - 6, - 6 - ], - "to": [ - 16, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part2", - "from": [ - 0, - 6, - 6 - ], - "to": [ - 6, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 6, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Line1", - "from": [ - 7.0, - 7.0, - 2.0 - ], - "to": [ - 9.0, - 9.0, - 6.0 - ], - "faces": { - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 14.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 16.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 2.0, - 0.0, - 14.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 2.0, - 14.0, - 14.0, - 16.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#cutout", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ], - "neoforge_data": { - "block_light": 15, - "sky_light": 15 - } - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_fluid_storage_block.json deleted file mode 100644 index 5d55a3e50..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_fluid_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/creative_fluid_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_fluid_storage_disk.json deleted file mode 100644 index d40ea35d6..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_fluid_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/creative_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_portable_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_portable_grid.json deleted file mode 100644 index e0a8b5268..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_portable_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/creative_portable_grid" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_range_upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_range_upgrade.json deleted file mode 100644 index dbf07ee4e..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_range_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/creative_range_upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_storage_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_storage_block.json deleted file mode 100644 index a609f0f32..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_storage_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/creative_storage_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_storage_disk.json deleted file mode 100644 index 1399ef7d1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_storage_disk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/creative_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_wireless_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_wireless_grid.json deleted file mode 100644 index e1c52172c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/creative_wireless_grid.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parent": "item/generated", - "overrides": [ - { - "predicate": { - "refinedstorage2:network_bound_active": 0 - }, - "model": "refinedstorage2:item/wireless_grid/inactive" - }, - { - "predicate": { - "refinedstorage2:network_bound_active": 1 - }, - "model": "refinedstorage2:item/wireless_grid/active" - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/destruction_core.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/destruction_core.json deleted file mode 100644 index f85782c48..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/destruction_core.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/destruction_core" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/destructor/base.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/destructor/base.json deleted file mode 100644 index d381c276f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/destructor/base.json +++ /dev/null @@ -1,392 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "border": "refinedstorage2:block/cable/part_border", - "front": "refinedstorage2:block/destructor/front", - "cutout": "refinedstorage2:block/destructor/cutouts/active" - }, - "elements": [ - { - "name": "Core", - "from": [ - 6, - 6, - 6 - ], - "to": [ - 10, - 10, - 10 - ], - "faces": { - "north": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part1", - "from": [ - 10, - 6, - 6 - ], - "to": [ - 16, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part2", - "from": [ - 0, - 6, - 6 - ], - "to": [ - 6, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 6, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Line1", - "from": [ - 7.0, - 7.0, - 2.0 - ], - "to": [ - 9.0, - 9.0, - 6.0 - ], - "faces": { - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 14.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 16.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 2.0, - 0.0, - 14.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 2.0, - 14.0, - 14.0, - 16.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#cutout", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ], - "neoforge_data": { - "block_light": 15, - "sky_light": 15 - } - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/disk_drive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/disk_drive.json deleted file mode 100644 index 5a357dea5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/disk_drive.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "__comment": "Forge-only", - "loader": "refinedstorage2:disk_drive" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/exporter/base.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/exporter/base.json deleted file mode 100644 index bfab419be..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/exporter/base.json +++ /dev/null @@ -1,440 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "border": "refinedstorage2:block/cable/part_border" - }, - "elements": [ - { - "name": "Core", - "from": [ - 6, - 6, - 6 - ], - "to": [ - 10, - 10, - 10 - ], - "faces": { - "north": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part1", - "from": [ - 10, - 6, - 6 - ], - "to": [ - 16, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part2", - "from": [ - 0, - 6, - 6 - ], - "to": [ - 6, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 6, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Line1", - "from": [ - 6, - 6, - 0 - ], - "to": [ - 10, - 10, - 2 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 4, - 4 - ], - "texture": "#border" - }, - "east": { - "uv": [ - 0, - 0, - 2, - 4 - ], - "texture": "#border" - }, - "south": { - "uv": [ - 0, - 0, - 4, - 4 - ], - "texture": "#border" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 4 - ], - "texture": "#border" - }, - "up": { - "uv": [ - 0, - 0, - 4, - 2 - ], - "texture": "#border" - }, - "down": { - "uv": [ - 0, - 0, - 4, - 2 - ], - "texture": "#border" - } - } - }, - { - "name": "Line2", - "from": [ - 5, - 5, - 2 - ], - "to": [ - 11, - 11, - 4 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 6, - 6 - ], - "texture": "#border" - }, - "east": { - "uv": [ - 0, - 0, - 2, - 6 - ], - "texture": "#border" - }, - "south": { - "uv": [ - 0, - 0, - 6, - 6 - ], - "texture": "#border" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 6 - ], - "texture": "#border" - }, - "up": { - "uv": [ - 0, - 0, - 6, - 2 - ], - "texture": "#border" - }, - "down": { - "uv": [ - 0, - 0, - 6, - 2 - ], - "texture": "#border" - } - } - }, - { - "name": "Line3", - "from": [ - 3, - 3, - 4 - ], - "to": [ - 13, - 13, - 6 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 10, - 10 - ], - "texture": "#border" - }, - "east": { - "uv": [ - 0, - 0, - 2, - 10 - ], - "texture": "#border" - }, - "south": { - "uv": [ - 0, - 0, - 10, - 10 - ], - "texture": "#border" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 10 - ], - "texture": "#border" - }, - "up": { - "uv": [ - 0, - 0, - 10, - 2 - ], - "texture": "#border" - }, - "down": { - "uv": [ - 0, - 0, - 10, - 2 - ], - "texture": "#border" - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/external_storage/base.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/external_storage/base.json deleted file mode 100644 index 45c2ef11f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/external_storage/base.json +++ /dev/null @@ -1,362 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "border": "refinedstorage2:block/cable/part_border" - }, - "elements": [ - { - "name": "Core", - "from": [ - 6, - 6, - 6 - ], - "to": [ - 10, - 10, - 10 - ], - "faces": { - "north": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part1", - "from": [ - 10, - 6, - 6 - ], - "to": [ - 16, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part2", - "from": [ - 0, - 6, - 6 - ], - "to": [ - 6, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 6, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Line1", - "from": [ - 7.0, - 7.0, - 2.0 - ], - "to": [ - 9.0, - 9.0, - 6.0 - ], - "faces": { - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 3.0, - 3.0, - 0.0 - ], - "to": [ - 13.0, - 13.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fallback_security_card.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fallback_security_card.json deleted file mode 100755 index 2ec96d3b9..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fallback_security_card.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/security_card/fallback" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_1_upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_1_upgrade.json deleted file mode 100644 index c923d1847..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_1_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/fortune_upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_2_upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_2_upgrade.json deleted file mode 100644 index c923d1847..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_2_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/fortune_upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_3_upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_3_upgrade.json deleted file mode 100644 index c923d1847..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/fortune_3_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/fortune_upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/importer/base.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/importer/base.json deleted file mode 100644 index e475ba420..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/importer/base.json +++ /dev/null @@ -1,440 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "border": "refinedstorage2:block/cable/part_border" - }, - "elements": [ - { - "name": "Core", - "from": [ - 6, - 6, - 6 - ], - "to": [ - 10, - 10, - 10 - ], - "faces": { - "north": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part1", - "from": [ - 10, - 6, - 6 - ], - "to": [ - 16, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 16, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Part2", - "from": [ - 0, - 6, - 6 - ], - "to": [ - 6, - 10, - 10 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 6, - 8, - 9 - ] - }, - "faces": { - "north": { - "uv": [ - 10, - 6, - 16, - 10 - ], - "texture": "#cable" - }, - "east": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "south": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "west": { - "uv": [ - 6, - 6, - 10, - 10 - ], - "texture": "#cable" - }, - "up": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - }, - "down": { - "uv": [ - 0, - 6, - 6, - 10 - ], - "texture": "#cable" - } - } - }, - { - "name": "Line1", - "from": [ - 6.0, - 6.0, - 4.0 - ], - "to": [ - 10.0, - 10.0, - 6.0 - ], - "faces": { - "north": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 5.0, - 5.0, - 2.0 - ], - "to": [ - 11.0, - 11.0, - 4.0 - ], - "faces": { - "north": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 3.0, - 3.0, - 0.0 - ], - "to": [ - 13.0, - 13.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/improved_processor.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/improved_processor.json deleted file mode 100644 index 29015ab29..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/improved_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/improved_processor" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/interface.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/interface.json deleted file mode 100644 index 8b20bb507..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/interface_inactive" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/machine_casing.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/machine_casing.json deleted file mode 100644 index 2cc421468..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/machine_casing" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card.json deleted file mode 100644 index 3d191cb97..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parent": "item/generated", - "overrides": [ - { - "predicate": { - "refinedstorage2:network_card_active": 0 - }, - "model": "refinedstorage2:item/network_card/inactive" - }, - { - "predicate": { - "refinedstorage2:network_card_active": 1 - }, - "model": "refinedstorage2:item/network_card/active" - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card/active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card/active.json deleted file mode 100644 index b13105f56..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card/active.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/network_card/active" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card/inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card/inactive.json deleted file mode 100644 index 0468d834e..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/network_card/inactive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/network_card/inactive" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/portable_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/portable_grid.json deleted file mode 100644 index f5586dcf9..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/portable_grid.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/portable_grid" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/processor_binding.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/processor_binding.json deleted file mode 100644 index ee4018256..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/processor_binding.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/processor_binding" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper.json deleted file mode 100644 index 12e96de59..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/quartz_enriched_copper" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper_block.json deleted file mode 100644 index ecbc9afa2..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_copper_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/quartz_enriched_copper_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_iron.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_iron.json deleted file mode 100644 index c0bc1c349..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_iron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/quartz_enriched_iron" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_iron_block.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_iron_block.json deleted file mode 100644 index 0eb79421d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/quartz_enriched_iron_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/quartz_enriched_iron_block" -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/range_upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/range_upgrade.json deleted file mode 100644 index a5e8376b4..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/range_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/range_upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_advanced_processor.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_advanced_processor.json deleted file mode 100644 index cc8a951ee..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_advanced_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/raw_advanced_processor" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_basic_processor.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_basic_processor.json deleted file mode 100644 index faf4f2548..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_basic_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/raw_basic_processor" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_improved_processor.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_improved_processor.json deleted file mode 100644 index 00fbe8c9c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/raw_improved_processor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/raw_improved_processor" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/regulator_upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/regulator_upgrade.json deleted file mode 100644 index 7a2dea3ab..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/regulator_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/regulator_upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card.json deleted file mode 100755 index 99a019e65..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parent": "item/generated", - "overrides": [ - { - "predicate": { - "refinedstorage2:security_card_active": 0 - }, - "model": "refinedstorage2:item/security_card/inactive" - }, - { - "predicate": { - "refinedstorage2:security_card_active": 1 - }, - "model": "refinedstorage2:item/security_card/active" - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card/active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card/active.json deleted file mode 100644 index c007d44dc..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card/active.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/security_card/active" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card/inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card/inactive.json deleted file mode 100644 index 3753723ad..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/security_card/inactive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/security_card/inactive" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/silicon.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/silicon.json deleted file mode 100644 index 6c9624fdb..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/silicon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/silicon" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/silk_touch_upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/silk_touch_upgrade.json deleted file mode 100644 index 4c76bad8f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/silk_touch_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/silk_touch_upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/speed_upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/speed_upgrade.json deleted file mode 100644 index f88a1a127..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/speed_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/speed_upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/stack_upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/stack_upgrade.json deleted file mode 100644 index 5adf4a82d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/stack_upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/stack_upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/storage_housing.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/storage_housing.json deleted file mode 100644 index 6f950cfa1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/storage_housing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/storage_housing" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/storage_monitor.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/storage_monitor.json deleted file mode 100644 index 90256ac6c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/storage_monitor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage2:block/storage_monitor" -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/upgrade.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/upgrade.json deleted file mode 100644 index 8d9fe8284..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/upgrade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/upgrade" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid.json deleted file mode 100644 index e1c52172c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parent": "item/generated", - "overrides": [ - { - "predicate": { - "refinedstorage2:network_bound_active": 0 - }, - "model": "refinedstorage2:item/wireless_grid/inactive" - }, - { - "predicate": { - "refinedstorage2:network_bound_active": 1 - }, - "model": "refinedstorage2:item/wireless_grid/active" - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid/active.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid/active.json deleted file mode 100644 index 5f850e26c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid/active.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/wireless_grid/active" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid/inactive.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid/inactive.json deleted file mode 100644 index 2b26791e5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wireless_grid/inactive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/wireless_grid/inactive" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wrench.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wrench.json deleted file mode 100644 index e142bfbdb..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/models/item/wrench.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage2:item/wrench" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/sounds.json b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/sounds.json deleted file mode 100644 index 4b6973184..000000000 --- a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/sounds.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "wrench": { - "subtitle": "refinedstorage2.subtitle.wrench", - "sounds": [ - "refinedstorage2:wrench" - ] - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/black.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/black.png deleted file mode 100644 index 58f7b9244574ba293514af24307de57ddf5cd24a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2958 zcmcImON<^`B>@wH5rTvOK`|y?xDY&u5fkLV$%Ao?5)Q^h4kl{i1*1l*=C!l3%WhCQ=~w+< z{g1Ey|F1gK-?w>r*P5X7ojkQV zmFgPti>0Jg*kWT^Nh6m!Bwee744q1?-%tw?-b)g}AwzzU6@R&OSrmLXEAG?_un_i; zVZV1GBHJhWig;o#wp?+;^TPU?%@kBff`nS79K?1lE7tYe?3)iuqELq)8XjO-)}8^leT7-3Qkg_4|xJfu3%#cf+LmK+GC-!Nna6YnZ%+<~X+q;+ItvMH@iZzD z-*{nb2aVzuAQ-rjDfTaP%L5r%g_jLT%7<}u^i}O&%-Ki z&CgLh%9D!EZ`7AdG1Jjr4I4YifHKQ>NK^CW$P+gONjH}7Ok{$lgT}#zu)pQt#Q+9i3nMMWbGR{>|;Hzyj^~_bo z>nkhD&A}2+)$(X#&{QD1B$+>(^1(UeQ{o+g&nQ+zf#-`|x4)gWF6Mxt>#E)y@Aqq@ zT*~>3wYcGk(J2|6F5#VwSE$|V$1LZ@o4sZ`8EJl%eW6~IHo}b%FwaiHC~XY;Gc54@ zsBFxy4iiS!9kR9oi>a4XQAE0j7{hZ`g*2P$0iIP&NqgES5t$(I9YC-2_I) z!VXjwLS(ZQ`t7c(wyfET+NzAIfQ4p(OvZq~ z#G08QD5D{h%oNOw4dEUKgK02EqK?E0QH0n=N}@O`dJ(M%C=AO!u2+{d7P!s*sa=pl zLWQaJGb?E>iTsWn=(N&yLHHl-&6#oY>xQ=%%ROEsi60OeZ9w{WhiLrg8cc5DYg6BN z?U{PPd~=ZP#5QZ~b2NKbwy@!tIzX1;09ohdiF6Af)l*d6Fm&u8p3z(z{jbfQ=TM!7 zj&oCMh#kiGXZsY$e%j|q60o|B*eTH|JjYI!@Zsv=t4xats z$k7$S5&YeP{Ib)v(qr3>f3$A0dg;QE(|?^k`1z`_RBB}3pIx^;lg`{+pe~FT4j%vE z*TOre9^Wq?8z?<`;KYYZ3SaGe>a`*~FuCU9K8l{Y@!A?z8P zbe24H=%-I!y+8L#>B5R#-*oS|G0{D^`@PEbYulD1&;4=t+c)36dTr~mfm;ukzrTFn z^^dQPoci|XzVp$_Mb7HQxkaP9UOahb^B-@%^yTjleqnF9MxQ*8@Dp=>V_)w43w!qe E1H2W(BLDyZ diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/blue.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/blue.png deleted file mode 100644 index 00d6eb6f0d72f5bd66c1cebbeaae760a55bc9827..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2957 zcmcguTWl3Y7(Nh0tzsY`UZQbb3}Rr;?(BUx9Bw^8YkIILhfov)vpcgrE9dMkyW94( zQ67jS@_^B3Vl48gkU)%>_=1Az15YL;Dj^zTG@2+X2ti^bKIqK3Y)_@7ji{UKZRVT* z|L2?U|7Z4hZ`wGo?ZLK8CNrc^VxmJT>5E3LYL(Pl`O)6O|sQWNYRv%P}#(dKI^_YEc6fk|3^HDf_Wi&G9w67X4<;0?*YT$*vr~mO12l z3*B6M5D`wxiog*?iPOz2)D%S%S8$RjiGrvKPy$f1M8$$S*SL7<05C#Vavx9Ori24L*nx-I1f+PWo0P&EYpepd=B~1%?5<8I>CSKrk%p$Ub{v^lK zNb6ImgsE9SZqP&t6RIc_U{+*PssXW+;==x@Tyu^cfs{#w_(@E$FvU`q3WXFtso6>; zMaRkd0UA+bZj++p;!sG09uf!rkwexGP>)NRfyGG=8K-6j!znx+9F~G4h)cl~B&6LF zs7O3_3Wuy`0+dv}DWI$;g@#spL{Jh$#ULm*wbR{jnMPq2wM29P{T zNRDSh0-^zAu_#HF2rU&Z7wLyshZd+bF-lM?*rfQPBwC6*0U2P=9lALVJC++n6-1ZJ ztDrt2gnnPmPoZFS`f-AMhjiw1JPk7IdDtS70}Tmlz>uH_bX&23?IIHx2G%5-AVX5j z=JtI2N5NJv&P$lF76)FhWs!0GO64arq=#H&4tvwZaG`Uf^ z)hde$Q;RM!G}*y6kg-mHffWc$XtRfkO<94mZd3Ng{k8|?ASwiyvMuu*TW5=!r=cR2 zSvejy8he>Y%l-96T@vXfK=y3(Z=0rnynBo9QHmv=V@k1V{x{R2MFY@ORaP7A-CmWH zd-EP;Ev^Tmwf1bA*u!cV%T24pi>ca%8dYX9+1>amdt5CYE#%av;4obh%r~07Nfvl! zRMyQ7mIx*5CVH*I;=oM?QAF1EQHH0@2VttEE{(4nqC5o!durmO*#C?c?BRR@}3 zI<_b?t?A9F-x#`VLB*2N1o|hTH)wTA$nPU``w{qCm<&=36U!37M3Vv0X`&gnN>ffT zY+{&-rVuLK8`t5+Qt%(o#0mTX61Au*L=mFmes22d?@3o=+pRd!nfh|mJv$ZCx z0&s@vqr0y~i~2NW9z)a7Y+VJ&)NBA%mY7I20g_!wRy9p^T*S1@tOd7P=9z$MG_;(R znoaZo#y-=NAN@(sj>M-K8_|>D+3n{?>8Wz8GrzWI9Qfe1uiEymnZNJMg^_p2eG3-l zlP}L-J9e`0#)3ub=Hs76E@{tR+c;wPetqfULt|raKI(2*I49Hf!zb%TA0GJPfok{F zyTQHR7CNr$M^9f|dS(A(FLnH4YtJlwy}0jt{dV%6+tagU&*+h3=f2TrAL_jP^RkbQ zp9${i+IV*H@#ha7I`v1i^SXBB^s4RBffZdlW*4o2o$DbP>+j`=+CqKWo{OR57 Pz}&fhQ~up`JNNztzaY!8 diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/brown.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/brown.png deleted file mode 100644 index 63204a3af3edf0e1a72070136d08ff2a352fd4e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2975 zcmcImU2GIp6kg>g3RaCoKwcaNqN3iNx${30)>^v77P?s4MM@&b-8*;M3A;1Xnc41^ z2NHkyRbKFcgkZ#AFiJFFOhhFj3C0KUNn%VuNfdoR4GAPDyx_h2*R8a)L78O!?)mOH z-#Pc3bMKCxmCv@!S}-e-NVIfyrhDo8eszr(-9hKtD3O>whuwE1_U@aX zNX!~?v;A>@rrW}PA&G21N0Q}2K+%cBlGbv7@J14IIWpjSDgNT;$9c}RQ~Vk=BW8kj zGU#@03Q6Clm07%LBQ|Zm^=WQN*`f*xBt~4hkoO|1oZ>5bE&9!d1)i%w;*BZ3jTz+n zGd*0p9}-SWiU5nE#OY=dYKo$XPjQkciGrvKPy$f1M8$$SSG#y>Ewml0H@&Q8i~gnf z!8i^qK`50<$&#G(!vO)BrYVS$AW48CKs4gTs0_SlVO>L-L^yPV*!4Y*X+$}{7^is3 zwCX}3XsGp~T9|0Sgfa>Qm=u{y6`+k9xS$y3E5>askUS|6FODb{Hn22GnM?yduG&JO zfsW#iVallH+qmc`I}#9~mqdOs#H3@GT3lEs7R9|}G&EC~PT`Ho!Jr@e(V#y;5E|k! zp@>~)0)tF421?5A1W+bvKm)5iBq;X7tncURxzkhU#z`B1E1uzEV7_4feBC%@?bKx+Ky|fb3b5ubo6bDqiimG{h3mv3#*A_WNk-q69QmmDSpK zk6R}B{UOKvZ}T;NNBKblC@P>AS8O2R0`JE33TP!Qx@T&XT$*t2W< zQ==fc*yl#u&xApeH)+OAtsCB0EVp@)1a?5EwgKVa9isZ5u10bh zTbs(pYmL_nrkaCvC$?y7pQPE_(8O9!R{=7$9Dph-Po$av$&Mtenx?vw`Gl8-@egy?}=yTZ#j2L zS^drfPqZE0@W{|yeTdVC=Iz*?dF9bXuO1}v=GT%7K3Lp4``nec{<`G+)cX4Np6SyP z2j@H{&;Pjlg4*)J(k(0YA3l4w|Jtei=It%(k6iIi{kY&>F0N+TXwp8=G8Ul zKmG2$zjvKD`r@_EcCOOD4-(v+@6Wyd!^tBviWipc{_@C-)AJr$+GXrJaB@TG*utY1 z4lVy>+s>qI5NSeCUoaX?R31&_AQbu7Xyk;BsOj;2gu$>V$LFY*GuzP-v5y2T%6|n)hx&c z?PSpH91Tg|Xm`#Y-Dew^-}Df-v20QWMG_;fTr7BzSx)m6y(ax;!y?aBAo0F5-^L7b z1KA#~-46+;C4pcAAaS~pgqosg-~mno5)gqZLP>y{2^16RT~qBuM}oE(;uewY`bVHhHiL`f1TLWoAZ7?lMtT3y$WA(0)rLG1b-$220#ABxjF z^|Ts7F=(juqFS10!o)HPM3@9DqzVw*4O}o37AnTEEs_E$5-*M@7B;XnOWAA#KC9Yd zv4M`_juQ2#7Tc`oC^r%iv6n>tP-v5m61BLx?pPG}lBv`zU^<02CI^Fl>_>zC97$-1 zXQU!_ojD9L$qXndyK_L9qyY`g_K=|14|Bd>sB@>M?i(k;q{OZ3cRlP6N9$SOwFxAH zVv^<=kpz$uWRR026F^gi8vy+PRcMw{6QdYS2OAWhlYps6Ce&ttee60T^Fpz0I(}G0 zbm810$`dj0@)c{@tl8y7G4gEEl}Yo|)uiiU6UvsNTMiTmNZA6^6;-eRRs{tTVh|+- zF~Rlu8Q&gaq+;`{^@V+#>S(NnsS{ZSHc$lBz*vAlv4s@SiJ+x)MMI9P0&LW^Z4X^q z;;1lPEAt9djSfj^vW+c4#&mWHD^M_?#U3g)WChB)MRPc1x7{!JVb;eq=Q7W+)i$Ym z>MCOOmF8h>aDY*@FjO7XB|t9`vS&@ca~}DWc!%fG6iYnE_+nP<_tDlx9ne%&R%_!u zZkZGYGA_+pRCPp~F4;L#!a5nNP_xsGDCb6My{3=suYDCALq z3%syYR_6~75}K?Vu(k?|d?y}8A!*Cg49{B?;#|&0sB~l3DH|bx8W9{r)&!L(K(J(0 zr))B83&;{7P_Ku6z3Z|G6;qPyHFPts*V1YaA}>$qCM5DV9}F@qWZRA!jqBH8)`svO2V?tQiG&;b;}l4L8s|vj(Yg)kDe=;^;9YvcoaoB5Y;};v-9T71ejl6(2Vh`_^9`DxJMra>hCS)V<3R zpmqDE=J3_AqZ5m^uH19+(6@z-iSw<;F6?S)+I8X+O<#9s$DZSVUbuRcd+y0U*1Y}m zr4876W9jc>n^*pJ_VJEaF1NjuxIO&dvJStt+$=u=q08#U#YOO_G&jK+%cB+VzzHqCpaKHp#nQn!j=OJkPl}&2QJTVm9a? z18&!7NVbmlLqmo{D0G9^^*xShgtlLb(>(RG z7D6#-s`a8eO_VU90s}!xiY%lm5Thn8D20Wpaf}2~AVuQE5yeVPEM+O1ZNev2TP!xw zQQSF9J*vkxDLTrH1Vrc~kzWcC=^UmOmp2@X;yyA)%?zefcyn?v;KzP6;7>t9Q#^r+ z*mb5b$Rrb>q~cBiWs)W|usT8lV?WIKexZ>&y$#s_m|a{c_aC0ljcQhZJpEm^lTZ35WGt}`+%6eG*=!y=>$ z=N4g}2!WTcTFYjwZZC?Vhe&rO%~MyCu8S=wV+2J*1|oDcU=tMr({vPou_}K|XnQ(zX^F$a zc&*GUOf@Zz-c z)mNIA>Vy3(RSTuspdpL&5+wGl%Xds89}{o$TuQObb1Yx1s{O6Bbx{X&O;fb`c&}R_ zh5n37S&M3p(D17>s*)WOC9IRN3bnf2i00f#z1M6dL-ntM%TTybSyNjcAe5{-WNi%=`A%GhA!*N3hNrCxVJhb%IDBWJo-MT;HFX z1+tu$TW{zrS$X57rW;lDHP9xsx>4hXe2ApEmK)c!LyCO5LR zscyX1WW8XfIY@V6i?;S@nmv|Gq}zr@TfA-qNn_;+H4{L^krhqXHRM26o=ltnUzZyZK{}Z$ES2lSjze z4GTJ#>|OTpC5}H#+D;Arx^{QVx_1sgQrh`Z@iKRO=dH`LH*LANV&9Ly%{hJX{aNSd zzw7={TG0L4O@5b?dKs;GwJ&U)eSP-18|cma4_7Y?WiFrk;B9yDL!SqWzCUvA#*3Fm z7v{E+D}QciTlv_h3;$Xj>^z$O_KEDZn{5|{zCJ?QH}5}j{miNZul&B^#Pio4SbwzV VnYVsAKElq<-JLy|6B~Bz`5UA`%&hEeZ}viF@^oobfy9 zsM9?e(80;RES?<0CK0zkBy6i#OhJ)GNT?JGZfI3fVpXrjzWJ~u3ROrnmJ&O-L18G< zFLZhV6^ytHuq-P=!i+;h(+s&?P-I1xWL<&^fQBV&7EB2BOJvpplCuWVU3FXRFC~sf zk#9*-xm=Ey)wmbrC1{$aBrB4l0EPhJgd3p>aKpBShBOUv;P{c_xdPXSY;QbDiOkbl z2t~iC)(z`vVhNKf$d_PT<{?#q1UGU1cu=SsCs?8dTBL3iGAwLjS(Y-HCVWA)#bOg3 zM!QPPqk3!$qQmTjPo)7GdgB46yGqPrTf?z18lbbOS;lk*Z%+0{y~qnky+xAH6wgaV zkrgA}`2#UZKIA{)TUY0^^Es|6a!>UO9Y#2VS2*(F`0BeaJOvhEbEC2+akX44+kGOVcb_nFscWlbcu)O0bplf+AuI z=M+(%O1_(~TFYdt9yg4Ti)l|fB{EmzjzcU(Mo6VL1sWn0B(bIglbQ%Xl+%*7tR^u@ zH0Gy0JkCkQ=hy0sc$n#Eu7;(n2qra!vXU}2peDFBf^A^Sx{P%bF^xt;+n&H-C5{Sn zwQ{cr)0m@4L&d}fDoHS}hz5ZPZT`@SscKM7*er*$c00X-7i2uba;}O3Uu}!2XRab% zUnvpR2ZuOS3*)uHgd(#`g8W&R4=*8~6+h}aEX9f_aK2bo`-7}?F$WA?SM~aMzf+-w zp|r!Y7Shndq#fhyfIWbwH@50uv<& zQ0$y(+PaOPX)hGaf(_v&2ZKGgM1wiR@=<`;MoNP)CFTOJC?MZ2IJjC}QpqLt{i#`y zLgWdv?Pt-X5gIsiI55{r(*@yww6`SVme&pc&A6MqND@CF)Y^db&kj-hPuDWp#n+~~ z@mdS@g5`3M?Zg&q?MpO!0!?h#2^}EQumRM0c_Q5eNX;p#ZWubwAB)n~-+QXRC1AI(p1r&r&9=451V8adK8GdOeT)#o-&A-M9Mjz7No^P?^8*IwH^ Y6Yu@x@`X2c@>6uruD0#LT=By}Z;C1rt33 zJtM=93Yk-ZifTMv978PpmrlIM)u6!R`d3W!%K!fdu6BwkPA~dekR^BX!0wc^{S$<| zG_O@}zcwrI{P(^oe&>E}lw8uIkjkQ|EHi(5xfaLt|D_!~E4SW~NY+2kxTgEa%J2jR z+biuqKC!%?I9(8;RQ6EQ&HEFDI69X^PJbVx_|$5eS$gjEy}cXdnt<+L@O1TaS?83{ F1OQ&3VJ!dv diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/light_blue.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/light_blue.png deleted file mode 100644 index a6b017a448d929aeef6bdaa460b18898cd60d3cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwr2>%=KS^iVk_YIEGmGC;#~W-`-VXwE~Cx{J)>-&;5P>|FwSo|M`WFlmj?+Tdip_ z$l3PnRsHs@<_$h?J}LBsP7r}%9<`$Lb<9CGL?0Y_nXXWEV9p!k`2V}t>|+yCU}MkU z_qG1r-}??~R~lA+um8LKZUwiF15a60{p0$Br7Fyi^lI3PJq{*{*D+~ku_~zo9iR!s zJl6TU{@$;?TdE+u+lC`ql;vTE_x}IKV}E_!|N7bb|1+Q0F|=-2eOSxG=HGb+2Ag&N VvzjXwDFc1O;OXk;vd$@?2>>j9g(3g| diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/light_gray.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/light_gray.png deleted file mode 100644 index fca72ba2ef01f6cb84d45a9d2456ef5790cde5fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2956 zcmcImTWl0n7+w+~wMZhO1`Nh=@S!MY=RUJDVS(B$bk!}TEMZF^a^{>f-AQ+6rZdy- zwu%OVMDg}uGz1JWk@yA=MvO=d-i^d~eZa&Jq9z)H#tUygi0ACBTWx8BGRfS|`Og3U z=R4p3pYy~(|E49Kw{<2Gi6z;-%piT=$nK6s^m)gn%aFdV5Bi3pL}KwWb}vXAesOss z(K+ho3vnU$fQ9^W5@O#b$!a;E=tN@e`f32t2#GnH47*;M|Mm14o^x@U->&7vT+l;` zZr@}`wodlv(c}m+F~5Etx3+3g17#9Ju39d6kyTCeHM+wUv=}8eFQIt8uOiH?{>f#zs7G+ToH9?Yrq+6nDNe0)rciw$kWAAQL|Kq!KoKCC@M2g6UbL!dAwwb*x**~+aHV5JdLzI zg>uj`>qQNkC}Bbs27;6n*_3KPj9R#0EG*TWVz2ns5s%BtOJV>Ufna6MnZw(HLe(Xm@e-;v2-P5Ru zU1t`DtY;dORNYyitfvJHte%j-*bno*UutS+pcxw{OG%mQ+U|PTuSBca#2W)h2F4`K zGa&&n1r#wa%a$lvnskpyKg2pTN2Q5j4BNpb#ph+wl66bbrh$FzIumn3F|r&#EJM0* zZW#^}A@GK4-f}rB>qRm25XolJJPkGJy4ccf!06j*eBM zIX>f~F(xWDzMfy$N7P1ZH7tlEU6TwENVcv5l2RRD8nz8&TZfvVI?%*+)7s|Hr6~?e z?N(V-m|Ap5N>>oJfr1SJQdpIMDcS6yVN+2h#jq)dQ+|8=k{{-LOgUG0j;*#u&C^gJ z%da#qH5v;{s->}dqalm*5+wF)^bgI^Kh?d>b1B6#&oRANHUC>_>7oJXnx<%t_5rs_ zN`;I|S&Qm{=l;JtELYOW12##MlbjeU9QPK%;OhpG8QAJ=YngR5b ziEL4k36ZEaXA51iB-N6YW)59V=ndPb2)$uKHz9$)`pKja)diy4fuU+9a5U8bP&HLx z=$cJL?8qqyXPV561>qV`2KnAN3EPAfz!1`nl!Q^5cS66+!5}EPsFq#AxQ842Q!634 z*ypCo&#a_j61r^~X!p_zf%_l*&8fKgRl|QP?iw$WzzzuYG9di3Le&2=btX5mwW)2q z)=afvz8a)Eu|-S!9K{|>Cem#~1JKlMAZaW;A=Nfi99hwHT|-Vy(af6vUyD7{P>qJR zb5pa49>&;b>l8?TTIWdO(Yy`mDY4^&Eicd$<~!L;cRuy>$>*}2`#0Rs`{=RT-`>&H z_1);&Q|Fd~>$=}B?B1y!e{I>p^Zt>utDfJRxo&fH!G@zh9@%hn?@b5pJhWoZg_qad zzvIluul@|a?itCA?Rv8O&F&v^e{5g4>8bDgK6&`hg%{Pyy%##ZRNqP;yeo@ueY|7k zN2k{OzURSxT;cA4`@a2j-E#E#>%Z{D!;3yV^xl@^D-OV;&n!%A+qSF!ua{1~GW6U2 z%bh#V-SXL`{?iY=advd&;-%fIA3JgJSl7Yx>%RCZI+~bxxBtyYetLEjJ1=K@`!gr* H-M#N`M6$y7 diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/lime.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/lime.png deleted file mode 100644 index d2dc60135013ec9e10526454befabbc1c13093f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2974 zcmcguduSX*7{5ZReb9O}P=f!s-T0)P+ns&g?$B#(bEygS(vX}qMbymh%-t=y+uiPN zl577FB8YMo>!;X|)O}h(!<-^bes>|4@WlXYQ3mlP1*1!oKGF z&G-1t_kA;u_4VGpeCbU~6N$v~p6+Zvdnft5_&WBy`Ijr0y_N*s+oMEcSsT9>B%a^j zo=7a+;pPY9!Q4H_@hd4ze4D1Km4KlWiFF&Q0d|IIEZDT@dKvNJ#QUP)l8m@b&&j!< zla}1>T_GLV)th&A4LcSQH>?-dRS{EAp)nS!m9iJ1YDTQ-MeLgoOQKMN#KReJBR41v z=K6$AKcs?@l7S=3ijcNa(9kqPUMncFB1^I^K?Ohq$r^%bp>c`KT1X10KfAeMi~VK9 zQXB_JlE%iyQe$e$4~r7CEK8CVNl^epfM}-|<0|l?j;4kzjhxU8V%PTst`Xb*NSqOw zr}YpjK})R{HE3dlNmU$3FeUSlYCz(&aKT7et{EqeM9Z{7y*Of6*upZFa=8|KMzxhn z3mwH>qs*g5Y%`*x{LX+%{WS7NLWg#ZGK(Ee$D+8OPEs?E=?vbQ9F+Xnk4pY5B(%iS zsEFOdEC#t`8kAPuS)g3ff(EEFq&W7&yziHrxzpG5O;BJ;5$@RLdc+@#?&N_tCeSR7 zX-4FU1Y{Gaa$Zr843Q4k$m~O|Lvt)O36Akpu*L9sMMj#5G<_P_CvIWqoKWJRf*)2e zTR69Zi&P4{V$E7EhkCpy#-2lavKf)NnsQx&2vN;+fhquNjs{o(6o6@C9hfR6R4tgQ zNz={wS>GAqNyX>a>x=jf)6rTDLfT8QE-Wcz5 ztF%0rbs1|>-4SD|Wczdp?_|6}QMVhhoZH#xH3M`<2GFS{16$S8 zz%VVxmQ{sP$Z~Tw*Hr{Hq^Qjrx)#?Px}6gCij-|al6dXGXqE{HrUoDsL!hae1~AoF zY_?@!*^;42S(g4im>Cd}u>i}DZ4WQ1;6YCbhYC%zT!_b`qYxZ?-{D0c)c@EWR zm~w7v4za@+|7@KC*-z^nNj+A#Av+}=_@wtNJ7Ip&liip%cc0udv10tLWLI(F!X-Dj z$4(quecMN8B<+ubi{QcI$KQgNk{{mRzO3!h_s$%6<;8FJOsFTiv+}}~iJ>3S$??O( zZ-1U&+wD3}g;Qs@bapIQS?+pd%kKv+>!qLDR$M;6bvr6?A9iL~Mc1&czUP`p4Nl;A@iD*E7yT7{}b1Rt$b&=Rx=E%lteWn+^j)XTu! z&i|eN@}2+x&zTw?dU{RwBi*rBY)xh`Jwo3-?C!dkJ~zzWLiDxT9~=u~vHRAt`<~dD zx7NjC-G`i9KFViz8Q3ewk>!~rUMu?)9gA(X2wW#cyW@ zxqNn*>-Pe}X>lN6039_L!zN9XFtLVw5yk-vsSdPo8|PPoQr)fV` z+vqSFn4lgtV_Os*<|ch2j*!r+1egp=P>UN|j)l<(nWtt2(%ZNKt$gy)U9Q+M#c>zS(WqkpL=$nyv~2TB-oCA_>W)f&|T!G$140mUPn6wmWcW ziK9}dR_2vOHQFSp$=EUl*-8*0X(>?9p~)VqrOOJG6DH+w-fq8F@`9{qQO;$aW2MO;==3t(sYN^r~Oh|xUB4p2|d~6x{ym+tcP>Lm%7B(EwIwfNZC9IRN3N;3ukmlTEv)7E0L(Q*}!_|w@K)4YCX4y$BzB%kH zvcM~&vZ1zGB$TW>WNiZ$dUjMr0oh)l3@=+1;!@6sXyVSU!-N6>)QDi~vL>iR0fH&3 z2|-Kh*aWgf2u!p>zuk427LXyyts1%;*PFEBB616aZbBk|_rchbj3t=Rgap)WTI4Jk zQ<4S6l#rH$60sAs&~9IcMH|9@91Ql{2@-T9mX88NH&POWDc%meGKYM>T}$X#A%eOzvQ7 zQ{Q-vMSH;tbCB-D25s%jG z4%KPsI5)M1=wXa~woifdr+tnjF0I>uo)W+O^yUCPVSbTGZ_g!9&%Cy$`{jp>)R7G4a$sU16jXI5Q!aLfMd zSNCptZ0&Qa*WKTn9-rE@Y4$97*_o=xb@vKN=+x%T}>_QR3yJ z_a+h@d)?efJd)jRV!xC`wr`PSwG>cvBC)Bf8X&xf#GFO)u9xO7PMzX8*G}`h)U1>Z zdPu?Tp9sm$iNPG6*neS=E+G zEp!z3mZ?XL*k(mXx$%IA!zA*@LQHzg)Z)6PV^KUzrc<+k=@j0Y92ET6j|%=ANoa{@ zq#|~mISew%3@E9(b3mD-1r5xekf7KPbG~0}a%ZUN8wWuWau4ltJ=?ED8(83t2_%DJ zlI9ta1SuuRQVv2>0;UQcmgt96hh`}?Z4{$+utD)TD4DWuLS+Wnw_Rs^UZ{;t#}7-0 zE}UCJc_Id0zGf|(H3z&XMjj>unKVybO}egaLQT>%TXF=bAXTt{0)>=rK>;Jnu}O*m zqFK%P86S@^QnC5<`m%jYb+lH)bR1;svf>B?KwD6WVhbq=(+bmprRh)s$f(Coz1b1E zw8T-dT`Tj-rWzfR(qwE~f^6$VNZASy3}CT`Y8$cwWZj~ArtS9lML*2?HqE)rb8NMl zdg>}-^_Av9V{n8~wK!HE)S*N#5wK@NK01$lTKt&j(iB6UV|+1d_IJ|OMIF#oRaP70 zLvEE6M=~zWT2yyLYnP19l(0_5D%9+EBg(n)Mz7gP_BOtXE>|l`6XALYn6Z=Cd}G+1 zWq}u#%DUQ0fzV{#gtc{86cftL8oCwN8)?M_?a*|Qt_ zQ>!4k*ypC(&zwoKN$9q5pxsK#1@2$8H!tHB)(!vnMH1Noq230>zjuiGf2N+vKDIWs zjn|yD7c7v2bSE}xYoDjt+rYq@rK%P_KZWd zG_;+YnnUz3#y(r8K>E`zygKvMg#({* zYfjv=`plL~KVDzkHMp{~x8uHLos*L0{5G+4{yJD|PIXA zxszY7Ub=Yuhf|Zkbsiesa3Foh=TjG7eKY8Kak=;4XGbm^|KS|iwsrlXU(P>q{ejEN z&c61|`KOJ(w+8lYJiO!E(atXxe}CxLgJ=Huec$l@Q&(>Pa+~qpQ&zN_9hV1s2QzPP H*?sUYR2aqb diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/pink.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/pink.png deleted file mode 100644 index 7991ef0d9f8fd47e53bb38013906c25abc8d0818..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2930 zcmcImUu+ab7(Y!QSRpFbM2N=CLX1TAc4qe9?aD!Fuh<%|)bI5BynOtN_`p%TqCyWL|PP? zr_B(8C{r6IEt(i%aveu9%mW@$1L!&#E}Dp|4dbpOlPU>Fm?jJhGc04NT+ZMNsttk+ zouqw}%%fIp3!;Q<&q2q4Fpq>McKM-8Ysn@acxwVF;gl3b zo=6fXND8PRWC3Vt@JYZvKoeSKsp;YrcY;lZuOMJ)21~qoVCwqb)RIuwu{;_Fm@S+i z;4vac;aJ03xoi!DNs2><43vr@b2ab#u0>SSaSZ|_L>wYPsOpjpU_ml94D5ogW3QmJ z=a;B6!IO&5Z`PMf9i}5&4a-HU0X^4cI=q4e995OD=DCt$BV?#bff%OO*0v+|S&8Fn zr&jKj%QSkVpev4ROA7N%D!3|?Olb3m=9-EM6~ks6&e`pyRT`J6%Q$D=^3}GOdgdzT z^;HyMYjBjOYIUMHXdu8Y8S-aKzIzGzoOoyGGm4QY@O-fv_D5LjVh-q9bS3Cp>uR<9W$ds|;sUuYDig`H*y4$n^FimhRPfdyV3 zl})v^al**DMbn&QHaU6~jwh77N?FWNx+dxo7lE<@IK`NFoFxd`6 zSgAm}U?9z2D3}Es!W|CAq2VNnI}$6xF=iVniIbw}#WWCb6jgnvQC;$6=(hH!tRRJy z3UlpeQPNxz`yDyZX(e+(_#f>pnQ_bOhBp_>9bP1v9}t>tK>l}!X#SU)Om63E)7W^e zg?hnqbCB)C7HjQGHG60}x@~9@Hg#Kq8ZS?*nG#k!q-eUXIUeR2&9%}0+U$7_HE8HK zH?@b@VT^xfr$F|Tog+!e>NaMl#Qr}n?`J2>V*{n0O5v^Zvprp3fbPZhYyjvQP2&diV7U+-S=RDPyA7}@mc)!>yYzn$Co$$4XS?s)M1;msdinOXbD>X)zY z-}r<3{I}1(w(r!syFXaB|Dtg2(Fd#@Z%-W9c5TDiLpOGwupjSQ{pNIkeB$6QYt)BM zsRu8wJpAE`t?N$ye0=@8U!6VuYVU!ov!Zw7=$GBj*GJC0e|_Xd8x7_6eSGosrPmD!FZdUIdk0^SrEG|t+-Ij8j9h;GiT21j_l41Gt=%a zA(SeYm|%D?Mgu6CnE0lV2Q*@6qsGJ=^+iL14`M%-sZBQne+xfrq zU%vDI|2fa~u3x*T{f_onEVihpJJm#5KCck@g7>nI}8@=bn4jx__ zi?wfaGW}71`Y{7}g*dc46UR#hpP*y0m8(lWL|bvhm^kaWN%q&{BP`=sNp_Qx7SetP z&N73mhcdKI&>WDo@f96_d3$h)CYO0reG2KlDLJj+xe(bgoph8kr0 z)4fcG7hpz>3mg&zkX5M%>rO#NbswZO8CzEoG;7WqrE zxhV1to-Y=Q@uC#>f-DboUFQXn7e$UBxUlR-u*A9H@`i>K4pHFvk>j}x)d)>*AWE{t z(^?1xzp2&@>ogI<_!9Ja5Ep1jRiK5MIDa6>SB+bU$9Y`9ZWIzMXkrOV>2wo5t=dAN zi4LRALE=$8wrSB}rtD+B4~O1BfNzSI3dAFLPit~0T>E+Kp-DN4VosYX~77#f^~w=h=QSr1`wuzJlEvk2!B%h1&} zh@8?Sv%f%Jp8e5pS!1{HLPw?`i5LT|5&D&`O9qe)QEJrCwYXlV73H9t#bguW*=r95o1%sVlE^aFMNTJW z!9h)wIa`txo0N+xn0UHirfmqtrlxRES4|Emv^=3g(ps`bNl{e=*`(Rmyz%~P zv!^*!rJ?2A)EFX%G5Xm&1(KiUITE|1ZUb^kJo)nIhvbBLrYE%~lXxCYR4S|Iuh_L` zczF2rwP^9)-R%d?4VB|}?;RW3DeU;;;vbMNAj nk;=%0^S6KFn{UVu&5s>FvF_MO?duomdAg@_ed?`8o_gjVq1)ux diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/red.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/red.png deleted file mode 100644 index d4b83ce383d473d470eacd5dc95d67ece9a5d8b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2961 zcmcguYlsz99KT8USd~QW!4fr$D=0O0&Y9<((d%okx*J|ycW<~W6rDM9W_R-5IpfUi z-n&wXl2Cz?L>l(^R-a4)S%r#P2qXGp1z{hOB*CB$y`&-#>YV$S-OXKhvB$u?&i{A* zkKg(K|K~j4vvd2>w)VD6CbP7=tI*5d%lN%;K6^fR{ZGVRi^8sfIFnhtg5P&!PQ7+t zCeyaxFZCz=#T_=Ll`L|pL$b9>$k3V0`i->^;e8|#95Uz!dGW{hJ`@Gt&5L{VA}EHP zWXSJ25RtwEJ4^V$K5V(-#tp*yn#~kcNP>h~r5wa|Eicyf+U%PT%c4++B>VE>W^PdE zFZKwXG$MkL1ri285lkx!4NWt^!-4`7AOl^7iUbWCXf`y3<|Q&~k?YyLg>6k+>@P14 zB}r(@aMH7ST!wKNn+j3Ylxd>RN`BXa0)k{6k$ zjSwnfsy2w5G%>>D8VY5Y1w5oW(8Vb(9FEF$<1Us-nN&!S#0(2lEMuuyOySe2tyEHU zoNOIo9yMc|79E#HLn8N*m<~snY#m`1SG63AlU_1G%^apPcse;8q6v+M=nN#J;we-l zzBhwGE|~%)HGc*um!#0p?u-aZXjG!K+{&GvmT!Urvx=~0j~}?S8n5MnHz$w+N=RPh zi6nuXq=J&7*Z|r(dJJnUct!A9)Nn_ZF5N*t9Z zYvo?K+$)kZRO~vE>Y7B#xf+x#=~_*Jjf&J|oU5Y1SDUM6t|DGv zc@Z`T`+2IChZ}>Y0@x)({%pzzW|2>b9}Rp)u_6jQU+lX5KGwRJ1BR}vdUL$TuaR

v`_nD( zoTzN5tqu`J)-AHO0gI`ZR8d4W4>E>ltqOT2=VLT-YuBNvK>!URd6sHOI?;gSsJbZ` zISV^LRS1D*EA*RPS8b@-irOl;+i|@~D;`3@AYq%3EZ%-FhKCd_r@N8^ks>)cO_g${ z;jnT?gq513VVz~u&Fe62L->z_!88~l(WJx*QH0n=N}@O~dJ(M%C=AO!u2+{l61dI% zDJ@7Lp~6J_nUOS?ME;~4m~16=LHHN#&6;s@>xTdPBFX%K&}akl-#bL(ztCWE8(*9H z#%oX43+9@GY$vu^YoDdryU@ahW3s)%VtEX8UYQ&Q^>`aluU*NEuU)wJ$lLIJIRC`L zb8Eux<)1$lFZt-?rhAW%eS6}q({Dbz`bquZj?Wgr#bW!7!}p&)cEy~x;Nq+03m<%c zJTsm-@yOA8ejdB_tFwF8J72W-{qo|;)enq5zWD32O9lph+xun5>gDI6?eoURR&{*y z-08dNA?wDT@iiCDTwM~JH$Po>i7Xnw)V_cBPu8(@zjs`FlCm&>i{?{kLe`%d;>b{l=JyK)uM*Yc=uB+2DgtYQCKa)%Dz zo6B|JpfsEg7az3|spg?aT%500BZ|)Dx;ED%h{kZrxp*`P3;gAGKj68*EATtDA}B^Z zxE%EDj`8;010}S33|St(`C+cBZc_zSoI?tabgaO4GlSf4 zagggFG3N9<5D)+|XIObjS5+N!ax##C2sBZW1xdGoYD)%}{dj6E_I!KD>CJ4>uL56A z)5sRZTCJ9^DR~l)ijrknB9KK{7AQhUCc_lgg)mv)(%|3(#X*z?B;=Sz=#ufYz*A3~ zAylKb+Azt|L=z^~VI)dO)DCJGxL(udU3%1rf z1dTH~vGvW$@(7|j+WTPpGO`TMf`TO@NzisS zuRN;J$EL0z&lMEUz=G+il3+c*{15LtB_Sz zftRw$VMfx*cyrQ_0sV;*duH;HMdUN$9brIIEb|;=iruikoi;7%fUaqZmdy_abzB*C z0-Cj?=?D$Kv7#XvnJZyEjMb*y7bKKzlUbM9j-Sj%m4IuMqYY6r1jKlWJwBTb=Gow- zrLw8ER>m}0*WqgumJmO!!5DXs(hM(J58^`3Cvf8Wu1kh00ZGS#Zz;N$5!bV{qB0CeF+F}n{>Fn*B-2o20}8tC0YP?ES8#!$ z3aW{ajuc=3W!_+}Z3Q%&w?5Aa2(7cz-%jR7r6h?-lB9{S}VM^Qf}rBiR@C)YyjfFdqeZvX{NE4ZA{~^ zwdd;sOJyHDeQny*7isgJWFg%(Gyz(=D@YnEOsH7`RD4;{bX`L}Jv5r$kpJ4|8G#yU zm~~fbP0$2$sKYrAC_Q=$_moC`mp5xojf4;#xael?0y`QR|T-tc?^iMpueC!hLfBEOmv+<=P z8#})F^4WuTy9eIbb?Cw42Uj2a>gZIj^Z4|4FFd_|@2-2M*ZjTd)EA#wHT&B$J5EmR o|M2kOf#;vOaQWQFU4NYuJMS2{vaI9vGP@M_Zy9h-KC)}iKTfs1W&i*H diff --git a/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/yellow.png b/refinedstorage2-platform-common/src/main/resources/assets/refinedstorage2/textures/block/relay/cutouts/out/yellow.png deleted file mode 100644 index b6fcecf4b17229ac8d7617a79e9b1e19396e6395..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2955 zcmcImZD<@t7(Su2n%G*jN-3i27W}}@?aY4OF1?nRYnl|Vrs+v9DA?KAx!iJhyPMrj z?h@*c)>14Qu(m(M5Be)0Es8~2!J@4QrJyLbRFLWqp=y6rDk?=pj5GI@#3oIsc45Ef zedhgm=6&Cp{ry`vFYj2>kw_$#_w{B5*n1_vZ(quu5B@fV+3Sv=cQ8sMI`854ZHd?4 zT%AaC47<5}oXiIzfgql%OUd86e$)s)Y=pd5O$g=oGAhOi$Am`%8<( zI1VgHs#dGXs*?1>AqknLDM4A1Wxx<18uMaY175VYr6EHj61qX``kufwV%r~y(<1Y< z5ke(stM#HLO^h(9h64#DArGkzbVwT)jD+R7afe8>Oe@rjBZft7EMqB~ZNukOTdB0s zQM_rCdDM(;PIQzT3#c?eBYz|$bkiuaxVGh36c5m8Y8Ek_!P}FAq96NF(VvHews;m5 zv0IqOAeYR7(waLDluO#s!0HYuj{Pv_`{h>d^tXHyWR#SJM|ZfM<5#1{c;L+mG=pQB z7I`88m;wsS$+88JrJ=_m`+yB-mZheHV>}aVGJH;kmXfj*Wfs_X+``y`P={CrKdfN3 zaBc+;Q7Q0->ejMZtIvyK>=D|RNsG+Yr0Y5sLWmLtQXtDR0j8o7fQ^&}4Ba+tRdrADY8_M2cZE4yWyQ`(;1O`VQk<5e2^57E{k$ z#k{`KB5Drid8(F28iR%m*(D+VY{~~0kWY)B_FP7>EDAhdth)W}taUL5bWKyV=6Jtb zqvd?YWvoRFM_Bmv8Fk6vYzgmVyh5#BH)1(A*6cOg>2UL_>ptHgP`n^dUZ*op3~f) z+65`ZzA)W><|WOcp*tf7W?E^xApDQ^7S6aub;Ik6^GbmdYL#}8gyu?OC{@0su9 zSB7hyWY^SYbmoJVuPwRU^AQ|AaB$`CCx5;+S(%K3P49iVxh|d2E@u=Gnh5@9g+-#r_Y!dE`prXy+dj!e{3$9PK^7_xWX? z3w!hHwrv?+weRB>g#Py)zUvF~?KjSJ9yzk~r*AJE`7>WSaCW?F+luaAC(fEF_I@x-n#U;4`Y{_CrMEt$BIy>#u^hU5IW+_!0K=G`ZD G?)e8~62-Fs diff --git a/refinedstorage2-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json b/refinedstorage2-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json deleted file mode 100644 index fb58fc806..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/c/tags/item/tools/wrench.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "refinedstorage2:wrench" - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json deleted file mode 100644 index 2f8996f9e..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/better_than_a_barrel.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:storage_monitor" - }, - "title": { - "translate": "advancements.refinedstorage2.better_than_a_barrel" - }, - "description": { - "translate": "advancements.refinedstorage2.better_than_a_barrel.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "storage_monitor_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "refinedstorage2:storage_monitor" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json deleted file mode 100644 index ec124a069..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/conditional_connecting.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:relay" - }, - "title": { - "translate": "advancements.refinedstorage2.conditional_connecting" - }, - "description": { - "translate": "advancements.refinedstorage2.conditional_connecting.description" - } - }, - "parent": "refinedstorage2:connecting", - "criteria": { - "relay_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:relays" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json deleted file mode 100644 index bb3f46ade..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/connecting.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:cable" - }, - "title": { - "translate": "advancements.refinedstorage2.connecting" - }, - "description": { - "translate": "advancements.refinedstorage2.connecting.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "cable_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:cables" - } - ] - } - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json deleted file mode 100644 index d6a402d5a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/construction.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:constructor" - }, - "title": { - "translate": "advancements.refinedstorage2.construction" - }, - "description": { - "translate": "advancements.refinedstorage2.construction.description" - } - }, - "parent": "refinedstorage2:exporting", - "criteria": { - "constructor_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:constructors" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json deleted file mode 100644 index d9fd6ce6d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/destruction.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:destructor" - }, - "title": { - "translate": "advancements.refinedstorage2.destruction" - }, - "description": { - "translate": "advancements.refinedstorage2.destruction.description" - } - }, - "parent": "refinedstorage2:importing", - "criteria": { - "destructor_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:destructors" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json deleted file mode 100644 index 96196ca44..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/detecting.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:detector" - }, - "title": { - "translate": "advancements.refinedstorage2.detecting" - }, - "description": { - "translate": "advancements.refinedstorage2.detecting.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "detector_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:detectors" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json deleted file mode 100644 index a1743d3ce..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/drives.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:disk_drive" - }, - "title": { - "translate": "advancements.refinedstorage2.drives" - }, - "description": { - "translate": "advancements.refinedstorage2.drives.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "disk_drive_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "refinedstorage2:disk_drive" - } - ] - } - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json deleted file mode 100644 index 7bb7965f1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/exporting.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:exporter" - }, - "title": { - "translate": "advancements.refinedstorage2.exporting" - }, - "description": { - "translate": "advancements.refinedstorage2.exporting.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "exporter_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:exporters" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json deleted file mode 100644 index 9389a400a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/importing.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:importer" - }, - "title": { - "translate": "advancements.refinedstorage2.importing" - }, - "description": { - "translate": "advancements.refinedstorage2.importing.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "importer_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:importers" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json deleted file mode 100644 index e5664bd7c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interface_to_the_world.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:interface" - }, - "title": { - "translate": "advancements.refinedstorage2.interface_to_the_world" - }, - "description": { - "translate": "advancements.refinedstorage2.interface_to_the_world.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "interface_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "refinedstorage2:interface" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json deleted file mode 100644 index 7d722236f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/interfacing_with_disks.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:disk_interface" - }, - "title": { - "translate": "advancements.refinedstorage2.interfacing_with_disks" - }, - "description": { - "translate": "advancements.refinedstorage2.interfacing_with_disks.description" - } - }, - "parent": "refinedstorage2:drives", - "criteria": { - "disk_interface_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:disk_interfaces" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json deleted file mode 100644 index dabb94af8..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/no_cables_required.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:network_transmitter" - }, - "title": { - "translate": "advancements.refinedstorage2.no_cables_required" - }, - "description": { - "translate": "advancements.refinedstorage2.no_cables_required.description" - } - }, - "parent": "refinedstorage2:wireless", - "criteria": { - "network_transmitter_receiver_card_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:network_transmitters" - }, - { - "items": "#refinedstorage2:network_receivers" - }, - { - "items": [ - "refinedstorage2:network_card" - ] - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json deleted file mode 100644 index 617582b73..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/portable_storage.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:portable_grid" - }, - "title": { - "translate": "advancements.refinedstorage2.portable_storage" - }, - "description": { - "translate": "advancements.refinedstorage2.portable_storage.description" - } - }, - "parent": "refinedstorage2:viewing_your_storage", - "criteria": { - "portable_grid_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "refinedstorage2:portable_grid" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json deleted file mode 100644 index 26b21795c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/root.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:creative_controller" - }, - "title": { - "translate": "mod.refinedstorage2" - }, - "description": { - "translate": "advancements.refinedstorage2.root.description" - }, - "background": "refinedstorage2:textures/gui/advancements.png" - }, - "criteria": { - "controller_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:controllers" - } - ] - } - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json deleted file mode 100644 index 27df538be..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/security.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:security_manager" - }, - "title": { - "translate": "advancements.refinedstorage2.security" - }, - "description": { - "translate": "advancements.refinedstorage2.security.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "security_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:security_managers" - }, - { - "items": [ - "refinedstorage2:security_card", - "refinedstorage2:fallback_security_card" - ] - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json deleted file mode 100644 index 2cc72ae10..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_externally.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:external_storage" - }, - "title": { - "translate": "advancements.refinedstorage2.storing_externally" - }, - "description": { - "translate": "advancements.refinedstorage2.storing_externally.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "external_storage_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:external_storages" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json deleted file mode 100644 index 9f41b83dd..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_fluids.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:64b_fluid_storage_disk" - }, - "title": { - "translate": "advancements.refinedstorage2.storing_fluids" - }, - "description": { - "translate": "advancements.refinedstorage2.storing_fluids.description" - } - }, - "parent": "refinedstorage2:drives", - "criteria": { - "fluid_storage_disk_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:fluid_storage_disks" - } - ] - } - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json deleted file mode 100644 index 9f62b0e61..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/storing_items.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:1k_storage_disk" - }, - "title": { - "translate": "advancements.refinedstorage2.storing_items" - }, - "description": { - "translate": "advancements.refinedstorage2.storing_items.description" - } - }, - "parent": "refinedstorage2:drives", - "criteria": { - "storage_disk_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:storage_disks" - } - ] - } - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json deleted file mode 100644 index 9b27f995d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:upgrade" - }, - "title": { - "translate": "advancements.refinedstorage2.upgrading" - }, - "description": { - "translate": "advancements.refinedstorage2.upgrading.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "upgrade_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "refinedstorage2:upgrade" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json deleted file mode 100644 index 0126fde2d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/upgrading_your_grid.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:crafting_grid" - }, - "title": { - "translate": "advancements.refinedstorage2.upgrading_your_grid" - }, - "description": { - "translate": "advancements.refinedstorage2.upgrading_your_grid.description" - } - }, - "parent": "refinedstorage2:viewing_your_storage", - "criteria": { - "crafting_grid_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:crafting_grids" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json deleted file mode 100644 index a1726a4c4..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/viewing_your_storage.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:grid" - }, - "title": { - "translate": "advancements.refinedstorage2.viewing_your_storage" - }, - "description": { - "translate": "advancements.refinedstorage2.viewing_your_storage.description" - } - }, - "parent": "refinedstorage2:storing_items", - "criteria": { - "grid_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#refinedstorage2:grids" - } - ] - } - } - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json deleted file mode 100644 index 5d2536dc1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/advancement/wireless.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "display": { - "icon": { - "id": "refinedstorage2:wireless_grid" - }, - "title": { - "translate": "advancements.refinedstorage2.wireless" - }, - "description": { - "translate": "advancements.refinedstorage2.wireless.description" - } - }, - "parent": "refinedstorage2:root", - "criteria": { - "wireless_grid_in_inventory": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "refinedstorage2:wireless_grid" - ] - }, - { - "items": "#refinedstorage2:wireless_transmitters" - } - ] - } - } - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1024b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1024b_fluid_storage_block.json deleted file mode 100644 index 43562e298..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1024b_fluid_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:1024b_fluid_storage_block", - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/16k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/16k_storage_block.json deleted file mode 100644 index 25025c8c7..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/16k_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:16k_storage_block" - } - ], - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1k_storage_block.json deleted file mode 100644 index 6d65eee84..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/1k_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:1k_storage_block" - } - ], - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/256b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/256b_fluid_storage_block.json deleted file mode 100644 index d97b9a56b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/256b_fluid_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:256b_fluid_storage_block", - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4096b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4096b_fluid_storage_block.json deleted file mode 100644 index 5d1a318e0..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4096b_fluid_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:4096b_fluid_storage_block", - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4k_storage_block.json deleted file mode 100644 index 51604a4b6..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/4k_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:4k_storage_block" - } - ], - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64b_fluid_storage_block.json deleted file mode 100644 index 14f43bbb1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64b_fluid_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:64b_fluid_storage_block", - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64k_storage_block.json deleted file mode 100644 index cc06e1686..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/64k_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:64k_storage_block" - } - ], - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_fluid_storage_block.json deleted file mode 100644 index 6f087071c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_fluid_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:creative_fluid_storage_block", - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_portable_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_portable_grid.json deleted file mode 100644 index ca74fa8fe..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_portable_grid.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:creative_portable_grid", - "functions": [ - { - "function": "refinedstorage2:portable_grid" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_storage_block.json deleted file mode 100644 index a5f090b04..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/creative_storage_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:creative_storage_block" - } - ], - "functions": [ - { - "function": "refinedstorage2:storage_block" - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/disk_drive.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/disk_drive.json deleted file mode 100644 index e0a10ebe9..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/disk_drive.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:disk_drive" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/exporter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/exporter.json deleted file mode 100644 index 4600998ab..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/exporter.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:exporter" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/external_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/external_storage.json deleted file mode 100644 index 321e5a069..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/external_storage.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:external_storage" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/importer.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/importer.json deleted file mode 100644 index bf2303807..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/importer.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:importer" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/interface.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/interface.json deleted file mode 100644 index 29b1a0263..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/interface.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:interface" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/machine_casing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/machine_casing.json deleted file mode 100644 index 5eb98d00b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/machine_casing.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:machine_casing" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/portable_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/portable_grid.json deleted file mode 100644 index a23f17f2a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/portable_grid.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:portable_grid", - "functions": [ - { - "function": "refinedstorage2:portable_grid" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/quartz_enriched_iron_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/quartz_enriched_iron_block.json deleted file mode 100644 index 1e105fada..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/quartz_enriched_iron_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:quartz_enriched_iron_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/storage_monitor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/storage_monitor.json deleted file mode 100644 index f097506cd..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/loot_table/blocks/storage_monitor.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage2:storage_monitor" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json deleted file mode 100644 index bfafc5385..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EME", - "ERE" - ], - "key": { - "M": { - "item": "refinedstorage2:machine_casing" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:1024b_fluid_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:1024b_fluid_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json deleted file mode 100644 index 43e0e27cc..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RPR", - "EEE" - ], - "key": { - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:1024b_fluid_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:1024b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk_from_storage_housing.json deleted file mode 100644 index 015954141..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_disk_from_storage_housing.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:storage_housing" - }, - { - "item": "refinedstorage2:1024b_fluid_storage_part" - } - ], - "result": { - "id": "refinedstorage2:1024b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json deleted file mode 100644 index 0e2e281a5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1024b_fluid_storage_part.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PEP", - "SRS", - "PSP" - ], - "key": { - "P": { - "item": "refinedstorage2:improved_processor" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "S": { - "item": "refinedstorage2:256b_fluid_storage_part" - }, - "R": { - "tag": "c:buckets/empty" - } - }, - "result": { - "id": "refinedstorage2:1024b_fluid_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json deleted file mode 100644 index cfb778753..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EME", - "ERE" - ], - "key": { - "M": { - "item": "refinedstorage2:machine_casing" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:16k_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:16k_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json deleted file mode 100644 index a08cf0f9b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RPR", - "EEE" - ], - "key": { - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:16k_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:16k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk_from_storage_housing.json deleted file mode 100644 index 14e50a6a5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_disk_from_storage_housing.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:storage_housing" - }, - { - "item": "refinedstorage2:16k_storage_part" - } - ], - "result": { - "id": "refinedstorage2:16k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json deleted file mode 100644 index bc2135419..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/16k_storage_part.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PEP", - "SRS", - "PSP" - ], - "key": { - "P": { - "item": "refinedstorage2:improved_processor" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "S": { - "item": "refinedstorage2:4k_storage_part" - }, - "R": { - "tag": "c:dusts/redstone" - } - }, - "result": { - "id": "refinedstorage2:16k_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json deleted file mode 100644 index 7b642b87f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EME", - "ERE" - ], - "key": { - "M": { - "item": "refinedstorage2:machine_casing" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:1k_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:1k_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json deleted file mode 100644 index 208c7fdcc..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RPR", - "EEE" - ], - "key": { - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:1k_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:1k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk_from_storage_housing.json deleted file mode 100644 index c38566098..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_disk_from_storage_housing.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:storage_housing" - }, - { - "item": "refinedstorage2:1k_storage_part" - } - ], - "result": { - "id": "refinedstorage2:1k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json deleted file mode 100644 index ca4ab2bec..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/1k_storage_part.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "SES", - "GRG", - "SGS" - ], - "key": { - "S": { - "item": "refinedstorage2:silicon" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - } - }, - "result": { - "id": "refinedstorage2:1k_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json deleted file mode 100644 index e92b7a468..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EME", - "ERE" - ], - "key": { - "M": { - "item": "refinedstorage2:machine_casing" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:256b_fluid_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:256b_fluid_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json deleted file mode 100644 index 73e9922a3..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RPR", - "EEE" - ], - "key": { - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:256b_fluid_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:256b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk_from_storage_housing.json deleted file mode 100644 index 8c3ffebb0..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_disk_from_storage_housing.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:storage_housing" - }, - { - "item": "refinedstorage2:256b_fluid_storage_part" - } - ], - "result": { - "id": "refinedstorage2:256b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json deleted file mode 100644 index 424fab265..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/256b_fluid_storage_part.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PEP", - "SRS", - "PSP" - ], - "key": { - "P": { - "item": "refinedstorage2:basic_processor" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "S": { - "item": "refinedstorage2:64b_fluid_storage_part" - }, - "R": { - "tag": "c:buckets/empty" - } - }, - "result": { - "id": "refinedstorage2:256b_fluid_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json deleted file mode 100644 index 25929f72a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EME", - "ERE" - ], - "key": { - "M": { - "item": "refinedstorage2:machine_casing" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:4096b_fluid_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:4096b_fluid_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json deleted file mode 100644 index 9eb76c566..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RPR", - "EEE" - ], - "key": { - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:4096b_fluid_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:4096b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk_from_storage_housing.json deleted file mode 100644 index 4f691f6c2..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_disk_from_storage_housing.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:storage_housing" - }, - { - "item": "refinedstorage2:4096b_fluid_storage_part" - } - ], - "result": { - "id": "refinedstorage2:4096b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json deleted file mode 100644 index d846efb17..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4096b_fluid_storage_part.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PEP", - "SRS", - "PSP" - ], - "key": { - "P": { - "item": "refinedstorage2:advanced_processor" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "S": { - "item": "refinedstorage2:1024b_fluid_storage_part" - }, - "R": { - "tag": "c:buckets/empty" - } - }, - "result": { - "id": "refinedstorage2:4096b_fluid_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json deleted file mode 100644 index 70e208606..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EME", - "ERE" - ], - "key": { - "M": { - "item": "refinedstorage2:machine_casing" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:4k_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:4k_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json deleted file mode 100644 index 86de1904f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RPR", - "EEE" - ], - "key": { - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:4k_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:4k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk_from_storage_housing.json deleted file mode 100644 index 20d5584b1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_disk_from_storage_housing.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:storage_housing" - }, - { - "item": "refinedstorage2:4k_storage_part" - } - ], - "result": { - "id": "refinedstorage2:4k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json deleted file mode 100644 index e6ebf2356..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/4k_storage_part.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PEP", - "SRS", - "PSP" - ], - "key": { - "P": { - "item": "refinedstorage2:basic_processor" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "S": { - "item": "refinedstorage2:1k_storage_part" - }, - "R": { - "tag": "c:dusts/redstone" - } - }, - "result": { - "id": "refinedstorage2:4k_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json deleted file mode 100644 index 355ac3b75..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EME", - "ERE" - ], - "key": { - "M": { - "item": "refinedstorage2:machine_casing" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:64b_fluid_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:64b_fluid_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json deleted file mode 100644 index 90632dd7f..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RPR", - "EEE" - ], - "key": { - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:64b_fluid_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:64b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk_from_storage_housing.json deleted file mode 100644 index 2507aa062..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_disk_from_storage_housing.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:storage_housing" - }, - { - "item": "refinedstorage2:64b_fluid_storage_part" - } - ], - "result": { - "id": "refinedstorage2:64b_fluid_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json deleted file mode 100644 index 6b65d2f22..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64b_fluid_storage_part.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "SES", - "GRG", - "SGS" - ], - "key": { - "S": { - "item": "refinedstorage2:silicon" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:buckets/empty" - } - }, - "result": { - "id": "refinedstorage2:64b_fluid_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json deleted file mode 100644 index dbb9b5984..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EME", - "ERE" - ], - "key": { - "M": { - "item": "refinedstorage2:machine_casing" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:64k_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:64k_storage_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json deleted file mode 100644 index 9b80bc34d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "RPR", - "EEE" - ], - "key": { - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "P": { - "item": "refinedstorage2:64k_storage_part" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:64k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk_from_storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk_from_storage_housing.json deleted file mode 100644 index 94f4e1e46..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_disk_from_storage_housing.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:storage_housing" - }, - { - "item": "refinedstorage2:64k_storage_part" - } - ], - "result": { - "id": "refinedstorage2:64k_storage_disk" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json deleted file mode 100644 index 1a3c5bc58..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/64k_storage_part.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PEP", - "SRS", - "PSP" - ], - "key": { - "P": { - "item": "refinedstorage2:advanced_processor" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "S": { - "item": "refinedstorage2:16k_storage_part" - }, - "R": { - "tag": "c:dusts/redstone" - } - }, - "result": { - "id": "refinedstorage2:64k_storage_part" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/advanced_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/advanced_processor.json deleted file mode 100644 index 1275224e1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/advanced_processor.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "refinedstorage2:raw_advanced_processor" - }, - "result": { - "id": "refinedstorage2:advanced_processor" - }, - "experience": 0.5 -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/basic_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/basic_processor.json deleted file mode 100644 index 0febc9ec3..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/basic_processor.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "refinedstorage2:raw_basic_processor" - }, - "result": { - "id": "refinedstorage2:basic_processor" - }, - "experience": 0.5 -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json deleted file mode 100644 index 8f2291abb..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/cable.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EEE", - "GRG", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_copper" - }, - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - } - }, - "result": { - "id": "refinedstorage2:cable", - "count": 12 - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/configuration_card.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/configuration_card.json deleted file mode 100644 index 2ca724164..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/configuration_card.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EEE", - "PAP", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "P": { - "item": "minecraft:paper" - }, - "A": { - "item": "refinedstorage2:improved_processor" - } - }, - "result": { - "id": "refinedstorage2:configuration_card" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json deleted file mode 100644 index adde926d3..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/construction_core.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:basic_processor" - }, - { - "tag": "c:dusts/glowstone" - } - ], - "result": { - "id": "refinedstorage2:construction_core" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json deleted file mode 100644 index 63c906d9d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/constructor.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ECE", - "RMR", - "EIE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "C": { - "item": "refinedstorage2:construction_core" - }, - "R": { - "tag": "c:gems/diamond" - }, - "M": { - "item": "refinedstorage2:cable" - }, - "I": { - "item": "refinedstorage2:improved_processor" - } - }, - "result": { - "id": "refinedstorage2:constructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/controller.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/controller.json deleted file mode 100644 index dff6830fe..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/controller.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "SMS", - "ESE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "P": { - "item": "refinedstorage2:advanced_processor" - }, - "S": { - "item": "refinedstorage2:silicon" - }, - "M": { - "item": "refinedstorage2:machine_casing" - } - }, - "result": { - "id": "refinedstorage2:controller" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json deleted file mode 100644 index 423aa277c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/crafting_grid.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:grid" - }, - { - "item": "refinedstorage2:advanced_processor" - }, - { - "tag": "c:player_workstations/crafting_tables" - } - ], - "result": { - "id": "refinedstorage2:crafting_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json deleted file mode 100644 index 12cc19936..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destruction_core.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:basic_processor" - }, - { - "tag": "c:gems/quartz" - } - ], - "result": { - "id": "refinedstorage2:destruction_core" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json deleted file mode 100644 index 23a0c7f12..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/destructor.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EDE", - "ICI", - "EPE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "D": { - "item": "refinedstorage2:destruction_core" - }, - "I": { - "tag": "c:gems/diamond" - }, - "C": { - "item": "refinedstorage2:cable" - }, - "P": { - "item": "refinedstorage2:improved_processor" - } - }, - "result": { - "id": "refinedstorage2:destructor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/detector.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/detector.json deleted file mode 100644 index 8f11ecacf..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/detector.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ERE", - "CMC", - "EPE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "C": { - "item": "minecraft:comparator" - }, - "R": { - "item": "minecraft:redstone_torch" - }, - "M": { - "item": "refinedstorage2:machine_casing" - }, - "P": { - "item": "refinedstorage2:improved_processor" - } - }, - "result": { - "id": "refinedstorage2:detector" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json deleted file mode 100644 index b4208945d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_drive.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ECE", - "EME", - "EPE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "C": { - "tag": "c:chests" - }, - "M": { - "item": "refinedstorage2:machine_casing" - }, - "P": { - "item": "refinedstorage2:advanced_processor" - } - }, - "result": { - "id": "refinedstorage2:disk_drive" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_interface.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_interface.json deleted file mode 100644 index dd3a8bedf..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/disk_interface.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ESE", - "CMD", - "ESE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "S": { - "item": "refinedstorage2:storage_housing" - }, - "C": { - "item": "refinedstorage2:construction_core" - }, - "M": { - "item": "refinedstorage2:machine_casing" - }, - "D": { - "item": "refinedstorage2:destruction_core" - } - }, - "result": { - "id": "refinedstorage2:disk_interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/exporter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/exporter.json deleted file mode 100644 index 317288d1c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/exporter.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:cable" - }, - { - "item": "refinedstorage2:construction_core" - }, - { - "item": "refinedstorage2:improved_processor" - } - ], - "result": { - "id": "refinedstorage2:exporter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json deleted file mode 100644 index b8f39a71b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/external_storage.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "CED", - "HMH", - "EPE" - ], - "key": { - "C": { - "item": "refinedstorage2:construction_core" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "D": { - "item": "refinedstorage2:destruction_core" - }, - "H": { - "tag": "c:chests" - }, - "M": { - "item": "refinedstorage2:cable" - }, - "P": { - "item": "refinedstorage2:improved_processor" - } - }, - "result": { - "id": "refinedstorage2:external_storage" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fallback_security_card.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fallback_security_card.json deleted file mode 100644 index 28dff3f31..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fallback_security_card.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:security_card" - }, - { - "item": "minecraft:paper" - } - ], - "result": { - "id": "refinedstorage2:fallback_security_card" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_1_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_1_upgrade.json deleted file mode 100644 index 4fa74cd62..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_1_upgrade.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "refinedstorage2:upgrade_with_enchanted_book", - "enchantment": "minecraft:fortune", - "level": 1, - "result": { - "id": "refinedstorage2:fortune_1_upgrade" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_2_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_2_upgrade.json deleted file mode 100644 index e2d3b258b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_2_upgrade.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "refinedstorage2:upgrade_with_enchanted_book", - "enchantment": "minecraft:fortune", - "level": 2, - "result": { - "id": "refinedstorage2:fortune_2_upgrade" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_3_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_3_upgrade.json deleted file mode 100644 index 083ea2c4b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/fortune_3_upgrade.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "refinedstorage2:upgrade_with_enchanted_book", - "enchantment": "minecraft:fortune", - "level": 3, - "result": { - "id": "refinedstorage2:fortune_3_upgrade" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json deleted file mode 100644 index 182efc170..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/grid.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PCG", - "EMG", - "PDG" - ], - "key": { - "P": { - "item": "refinedstorage2:improved_processor" - }, - "C": { - "item": "refinedstorage2:construction_core" - }, - "G": { - "tag": "c:glass_blocks" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "M": { - "item": "refinedstorage2:machine_casing" - }, - "D": { - "item": "refinedstorage2:destruction_core" - } - }, - "result": { - "id": "refinedstorage2:grid" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/importer.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/importer.json deleted file mode 100644 index 42d7961df..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/importer.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:cable" - }, - { - "item": "refinedstorage2:destruction_core" - }, - { - "item": "refinedstorage2:improved_processor" - } - ], - "result": { - "id": "refinedstorage2:importer" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/improved_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/improved_processor.json deleted file mode 100644 index 32d851fc7..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/improved_processor.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "refinedstorage2:raw_improved_processor" - }, - "result": { - "id": "refinedstorage2:improved_processor" - }, - "experience": 0.5 -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json deleted file mode 100644 index 5645b8120..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/interface.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "UIU", - "RMR", - "UEU" - ], - "key": { - "I": { - "item": "refinedstorage2:importer" - }, - "E": { - "item": "refinedstorage2:exporter" - }, - "M": { - "item": "refinedstorage2:machine_casing" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "U": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:interface" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json deleted file mode 100644 index 4d3408f7d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/machine_casing.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EEE", - "ESE", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "S": { - "tag": "c:stones" - } - }, - "result": { - "id": "refinedstorage2:machine_casing" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_card.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_card.json deleted file mode 100644 index 51d61404e..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_card.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EEE", - "PAP", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "P": { - "item": "minecraft:paper" - }, - "A": { - "item": "refinedstorage2:advanced_processor" - } - }, - "result": { - "id": "refinedstorage2:network_card" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json deleted file mode 100644 index 316046bb5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_receiver.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ANA", - "CMD", - "EEE" - ], - "key": { - "E": { - "tag": "c:ender_pearls" - }, - "C": { - "item": "refinedstorage2:construction_core" - }, - "M": { - "item": "refinedstorage2:machine_casing" - }, - "D": { - "item": "refinedstorage2:destruction_core" - }, - "A": { - "item": "refinedstorage2:advanced_processor" - }, - "N": { - "tag": "c:ingots/netherite" - } - }, - "result": { - "id": "refinedstorage2:network_receiver" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json deleted file mode 100644 index 5bf2b0afa..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/network_transmitter.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EEE", - "CMD", - "ANA" - ], - "key": { - "E": { - "tag": "c:ender_pearls" - }, - "C": { - "item": "refinedstorage2:construction_core" - }, - "M": { - "item": "refinedstorage2:machine_casing" - }, - "D": { - "item": "refinedstorage2:destruction_core" - }, - "A": { - "item": "refinedstorage2:advanced_processor" - }, - "N": { - "tag": "c:ingots/netherite" - } - }, - "result": { - "id": "refinedstorage2:network_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/portable_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/portable_grid.json deleted file mode 100644 index c2dad6ad4..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/portable_grid.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EGE", - "ECE", - "EGE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "G": { - "tag": "refinedstorage2:grids" - }, - "C": { - "tag": "refinedstorage2:controllers" - } - }, - "result": { - "id": "refinedstorage2:portable_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json deleted file mode 100644 index 1479ce7c6..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/processor_binding.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " ", - "SLS", - " " - ], - "key": { - "S": { - "tag": "c:strings" - }, - "L": { - "tag": "c:slimeballs" - } - }, - "result": { - "id": "refinedstorage2:processor_binding", - "count": 8 - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper.json deleted file mode 100644 index cc94e8000..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "CC", - "CQ" - ], - "key": { - "C": { - "tag": "c:ingots/copper" - }, - "Q": { - "tag": "c:gems/quartz" - } - }, - "result": { - "id": "refinedstorage2:quartz_enriched_copper", - "count": 4 - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_block.json deleted file mode 100644 index 40c65961d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_block.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EEE", - "EEE", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_copper" - } - }, - "result": { - "id": "refinedstorage2:quartz_enriched_copper_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_from_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_from_block.json deleted file mode 100644 index 1a972eec9..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_copper_from_block.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:quartz_enriched_copper_block" - } - ], - "result": { - "id": "refinedstorage2:quartz_enriched_copper", - "count": 9 - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json deleted file mode 100644 index 2517595d6..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "II", - "IQ" - ], - "key": { - "I": { - "tag": "c:ingots/iron" - }, - "Q": { - "tag": "c:gems/quartz" - } - }, - "result": { - "id": "refinedstorage2:quartz_enriched_iron", - "count": 4 - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_block.json deleted file mode 100644 index 8968bef9a..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_block.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EEE", - "EEE", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:quartz_enriched_iron_block" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_from_block.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_from_block.json deleted file mode 100644 index dcf8cf4af..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/quartz_enriched_iron_from_block.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:quartz_enriched_iron_block" - } - ], - "result": { - "id": "refinedstorage2:quartz_enriched_iron", - "count": 9 - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json deleted file mode 100644 index 918b3f77d..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/range_upgrade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "PUP", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "P": { - "tag": "c:ender_pearls" - }, - "U": { - "item": "refinedstorage2:upgrade" - } - }, - "result": { - "id": "refinedstorage2:range_upgrade" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json deleted file mode 100644 index c4d68f7c2..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_advanced_processor.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:processor_binding" - }, - { - "tag": "c:gems/diamond" - }, - { - "item": "refinedstorage2:silicon" - }, - { - "tag": "c:dusts/redstone" - } - ], - "result": { - "id": "refinedstorage2:raw_advanced_processor" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json deleted file mode 100644 index 74ef94451..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_basic_processor.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:processor_binding" - }, - { - "tag": "c:ingots/iron" - }, - { - "item": "refinedstorage2:silicon" - }, - { - "tag": "c:dusts/redstone" - } - ], - "result": { - "id": "refinedstorage2:raw_basic_processor" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json deleted file mode 100644 index 7b5e17ec1..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/raw_improved_processor.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:processor_binding" - }, - { - "tag": "c:ingots/gold" - }, - { - "item": "refinedstorage2:silicon" - }, - { - "tag": "c:dusts/redstone" - } - ], - "result": { - "id": "refinedstorage2:raw_improved_processor" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json deleted file mode 100644 index 960bd9476..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/regulator_upgrade.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ECE", - "RUR", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "C": { - "item": "minecraft:comparator" - }, - "U": { - "item": "refinedstorage2:upgrade" - } - }, - "result": { - "id": "refinedstorage2:regulator_upgrade" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/relay.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/relay.json deleted file mode 100644 index 7d2789e6b..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/relay.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "refinedstorage2:machine_casing" - }, - { - "item": "refinedstorage2:cable" - }, - { - "item": "refinedstorage2:advanced_processor" - }, - { - "item": "minecraft:redstone_torch" - } - ], - "result": { - "id": "refinedstorage2:relay" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_card.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_card.json deleted file mode 100644 index 6872ddc56..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_card.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EEE", - "CAC", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "C": { - "item": "refinedstorage2:network_card" - }, - "A": { - "item": "refinedstorage2:advanced_processor" - } - }, - "result": { - "id": "refinedstorage2:security_card" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json deleted file mode 100644 index db245cec5..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/security_manager.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ECE", - "SMS", - "EFE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "C": { - "tag": "c:chests" - }, - "S": { - "item": "refinedstorage2:security_card" - }, - "F": { - "item": "refinedstorage2:fallback_security_card" - }, - "M": { - "item": "refinedstorage2:machine_casing" - } - }, - "result": { - "id": "refinedstorage2:security_manager" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json deleted file mode 100644 index a7c3be756..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silicon.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "c:gems/quartz" - }, - "result": { - "id": "refinedstorage2:silicon" - }, - "experience": 0.5 -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silk_touch_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silk_touch_upgrade.json deleted file mode 100644 index 651923a27..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/silk_touch_upgrade.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "refinedstorage2:upgrade_with_enchanted_book", - "enchantment": "minecraft:silk_touch", - "result": { - "id": "refinedstorage2:silk_touch_upgrade" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/speed_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/speed_upgrade.json deleted file mode 100644 index 517239eb9..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/speed_upgrade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ESE", - "SUS", - "EEE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "S": { - "item": "minecraft:sugar" - }, - "U": { - "item": "refinedstorage2:upgrade" - } - }, - "result": { - "id": "refinedstorage2:speed_upgrade" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/stack_upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/stack_upgrade.json deleted file mode 100644 index cff02da76..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/stack_upgrade.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "USU", - "SUS", - "USU" - ], - "key": { - "U": { - "item": "minecraft:sugar" - }, - "S": { - "item": "refinedstorage2:speed_upgrade" - } - }, - "result": { - "id": "refinedstorage2:stack_upgrade" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json deleted file mode 100644 index 9c6abb7c7..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_housing.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRG", - "R R", - "EEE" - ], - "key": { - "G": { - "tag": "c:glass_blocks" - }, - "R": { - "tag": "c:dusts/redstone" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - } - }, - "result": { - "id": "refinedstorage2:storage_housing" - } -} diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json deleted file mode 100644 index a5cfdfc50..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/storage_monitor.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PCG", - "EMG", - "PDG" - ], - "key": { - "P": { - "item": "refinedstorage2:basic_processor" - }, - "C": { - "item": "refinedstorage2:construction_core" - }, - "G": { - "tag": "c:glass_blocks" - }, - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "M": { - "item": "refinedstorage2:machine_casing" - }, - "D": { - "item": "refinedstorage2:destruction_core" - } - }, - "result": { - "id": "refinedstorage2:storage_monitor" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json deleted file mode 100644 index 31e0a41ea..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/upgrade.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EGE", - "EPE", - "EGE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "G": { - "tag": "c:glass_blocks" - }, - "P": { - "item": "refinedstorage2:improved_processor" - } - }, - "result": { - "id": "refinedstorage2:upgrade" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json deleted file mode 100644 index 2debdf366..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_grid.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EGE", - "EAE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "P": { - "tag": "c:ender_pearls" - }, - "G": { - "tag": "refinedstorage2:grids" - }, - "A": { - "item": "refinedstorage2:advanced_processor" - } - }, - "result": { - "id": "refinedstorage2:wireless_grid" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json deleted file mode 100644 index 6b14b0a3c..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wireless_transmitter.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EME", - "EAE" - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "A": { - "item": "refinedstorage2:advanced_processor" - }, - "M": { - "item": "refinedstorage2:machine_casing" - }, - "P": { - "tag": "c:ender_pearls" - } - }, - "result": { - "id": "refinedstorage2:wireless_transmitter" - } -} \ No newline at end of file diff --git a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wrench.json b/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wrench.json deleted file mode 100644 index d2a7f1121..000000000 --- a/refinedstorage2-platform-common/src/main/resources/data/refinedstorage2/recipe/wrench.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "EPE", - "EEE", - " E " - ], - "key": { - "E": { - "item": "refinedstorage2:quartz_enriched_iron" - }, - "P": { - "item": "refinedstorage2:basic_processor" - } - }, - "result": { - "id": "refinedstorage2:wrench" - } -} diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/LimitedPlatformStorageTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/LimitedPlatformStorageTest.java deleted file mode 100644 index a50f08e15..000000000 --- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/storage/LimitedPlatformStorageTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.common.storage; - -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorage; -import com.refinedmods.refinedstorage2.api.storage.limited.LimitedStorageImpl; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -class LimitedPlatformStorageTest { - LimitedPlatformStorage sut; - - @BeforeEach - @SuppressWarnings("ConstantConditions") - void setUp() { - final LimitedStorageImpl delegate = new LimitedStorageImpl(new InMemoryStorageImpl(), 100); - sut = new LimitedPlatformStorage(delegate, StorageTypes.ITEM, null, null); - } - - @Test - void testSetup() { - // Assert - assertThat(sut.getType()).isEqualTo(StorageTypes.ITEM); - assertThat(sut).isInstanceOf(LimitedStorage.class); - assertThat(sut.getCapacity()).isEqualTo(100); - } -} diff --git a/refinedstorage2-platform-fabric/build.gradle b/refinedstorage2-platform-fabric/build.gradle deleted file mode 100644 index c26d8b907..000000000 --- a/refinedstorage2-platform-fabric/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -archivesBaseName = 'refinedstorage2-platform-fabric' - -repositories { - maven { - name = 'ModMenu' - url 'https://maven.terraformersmc.com/' - } - maven { - name = 'Cloth Config' - url 'https://maven.shedaniel.me/' - } -} - -fabricProject("refinedstorage2", project(":refinedstorage2-platform-common"), apis, compileApis) - -dependencies { - modApi(libs.cloth.config) { - exclude(group: 'net.fabricmc.fabric-api') - } - include libs.cloth.config - - modApi(libs.teamreborn.energy) { - exclude(group: 'net.fabricmc.fabric-api') - } - include libs.teamreborn.energy - - modApi libs.modmenu -} - -enablePublishing() - diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java deleted file mode 100644 index 01eb51949..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/ConfigImpl.java +++ /dev/null @@ -1,695 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric; - -import com.refinedmods.refinedstorage2.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage2.platform.common.content.DefaultEnergyUsage; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridMatrixCloseBehavior; -import com.refinedmods.refinedstorage2.platform.common.grid.GridSortingTypes; -import com.refinedmods.refinedstorage2.platform.common.support.stretching.ScreenSize; -import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil; - -import java.util.Optional; - -import me.shedaniel.autoconfig.AutoConfig; -import me.shedaniel.autoconfig.ConfigData; -import me.shedaniel.autoconfig.annotation.Config; -import me.shedaniel.autoconfig.annotation.ConfigEntry; -import net.minecraft.resources.ResourceLocation; - -@Config(name = IdentifierUtil.MOD_ID) -public class ConfigImpl implements ConfigData, com.refinedmods.refinedstorage2.platform.common.Config { - private ScreenSize screenSize = ScreenSize.STRETCH; - - private boolean smoothScrolling = true; - - @ConfigEntry.BoundedDiscrete(min = 3L, max = 256) - private int maxRowsStretch = 256; - - @ConfigEntry.Gui.CollapsibleObject - private GridEntryImpl grid = new GridEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private CraftingGridEntryImpl craftingGrid = new CraftingGridEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private ControllerEntryImpl controller = new ControllerEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private DiskDriveEntryImpl diskDrive = new DiskDriveEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private DiskInterfaceEntryImpl diskInterface = new DiskInterfaceEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl cable = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.CABLE); - - @ConfigEntry.Gui.CollapsibleObject - private StorageBlockEntryImpl storageBlock = new StorageBlockEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private FluidStorageBlockEntryImpl fluidStorageBlock = new FluidStorageBlockEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl importer = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.IMPORTER); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl exporter = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.EXPORTER); - - @ConfigEntry.Gui.CollapsibleObject - private UpgradeEntryImpl upgrade = new UpgradeEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl iface = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.INTERFACE); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl externalStorage = new SimpleEnergyUsageEntryImpl( - DefaultEnergyUsage.EXTERNAL_STORAGE - ); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl detector = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.DETECTOR); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl destructor = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.DESTRUCTOR); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl constructor = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.CONSTRUCTOR); - - @ConfigEntry.Gui.CollapsibleObject - private WirelessGridEntryImpl wirelessGrid = new WirelessGridEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private WirelessTransmitterEntryImpl wirelessTransmitter = new WirelessTransmitterEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl storageMonitor = new SimpleEnergyUsageEntryImpl( - DefaultEnergyUsage.STORAGE_MONITOR - ); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl networkReceiver = new SimpleEnergyUsageEntryImpl( - DefaultEnergyUsage.NETWORK_RECEIVER - ); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl networkTransmitter = new SimpleEnergyUsageEntryImpl( - DefaultEnergyUsage.NETWORK_TRANSMITTER - ); - - @ConfigEntry.Gui.CollapsibleObject - private PortableGridEntryImpl portableGrid = new PortableGridEntryImpl(); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl securityCard = new SimpleEnergyUsageEntryImpl(DefaultEnergyUsage.SECURITY_CARD); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl fallbackSecurityCard = new SimpleEnergyUsageEntryImpl( - DefaultEnergyUsage.FALLBACK_SECURITY_CARD - ); - - @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl securityManager = new SimpleEnergyUsageEntryImpl( - DefaultEnergyUsage.SECURITY_MANAGER - ); - - @ConfigEntry.Gui.CollapsibleObject - private RelayEntryImpl relay = new RelayEntryImpl(); - - public static ConfigImpl get() { - return AutoConfig.getConfigHolder(ConfigImpl.class).getConfig(); - } - - @Override - public ScreenSize getScreenSize() { - return screenSize; - } - - @Override - public void setScreenSize(final ScreenSize screenSize) { - this.screenSize = screenSize; - AutoConfig.getConfigHolder(ConfigImpl.class).save(); - } - - @Override - public boolean isSmoothScrolling() { - return smoothScrolling; - } - - @Override - public int getMaxRowsStretch() { - return maxRowsStretch; - } - - @Override - public GridEntry getGrid() { - return grid; - } - - @Override - public CraftingGridEntry getCraftingGrid() { - return craftingGrid; - } - - @Override - public ControllerEntry getController() { - return controller; - } - - @Override - public DiskDriveEntry getDiskDrive() { - return diskDrive; - } - - @Override - public DiskInterfaceEntry getDiskInterface() { - return diskInterface; - } - - @Override - public SimpleEnergyUsageEntry getCable() { - return cable; - } - - @Override - public StorageBlockEntry getStorageBlock() { - return storageBlock; - } - - @Override - public FluidStorageBlockEntry getFluidStorageBlock() { - return fluidStorageBlock; - } - - @Override - public SimpleEnergyUsageEntry getImporter() { - return importer; - } - - @Override - public SimpleEnergyUsageEntry getExporter() { - return exporter; - } - - @Override - public UpgradeEntry getUpgrade() { - return upgrade; - } - - @Override - public SimpleEnergyUsageEntry getInterface() { - return iface; - } - - @Override - public SimpleEnergyUsageEntry getExternalStorage() { - return externalStorage; - } - - @Override - public SimpleEnergyUsageEntry getDetector() { - return detector; - } - - @Override - public SimpleEnergyUsageEntry getDestructor() { - return destructor; - } - - @Override - public SimpleEnergyUsageEntry getConstructor() { - return constructor; - } - - @Override - public WirelessGridEntry getWirelessGrid() { - return wirelessGrid; - } - - @Override - public WirelessTransmitterEntry getWirelessTransmitter() { - return wirelessTransmitter; - } - - @Override - public SimpleEnergyUsageEntry getStorageMonitor() { - return storageMonitor; - } - - @Override - public SimpleEnergyUsageEntry getNetworkReceiver() { - return networkReceiver; - } - - @Override - public SimpleEnergyUsageEntry getNetworkTransmitter() { - return networkTransmitter; - } - - @Override - public PortableGridEntry getPortableGrid() { - return portableGrid; - } - - @Override - public SimpleEnergyUsageEntry getSecurityCard() { - return securityCard; - } - - @Override - public SimpleEnergyUsageEntry getFallbackSecurityCard() { - return fallbackSecurityCard; - } - - @Override - public SimpleEnergyUsageEntry getSecurityManager() { - return securityManager; - } - - @Override - public RelayEntry getRelay() { - return relay; - } - - private static class GridEntryImpl implements GridEntry { - private boolean largeFont = false; - - private long energyUsage = DefaultEnergyUsage.GRID; - - private boolean preventSortingWhileShiftIsDown = true; - - private boolean detailedTooltip = true; - - private boolean rememberSearchQuery = false; - - private boolean autoSelected = false; - - private String synchronizer = ""; - - private String resourceTypeId = ""; - - private GridSortingDirection sortingDirection = GridSortingDirection.ASCENDING; - - private GridSortingTypes sortingType = GridSortingTypes.QUANTITY; - - @Override - public boolean isLargeFont() { - return largeFont; - } - - @Override - public boolean isPreventSortingWhileShiftIsDown() { - return preventSortingWhileShiftIsDown; - } - - @Override - public boolean isDetailedTooltip() { - return detailedTooltip; - } - - @Override - public boolean isRememberSearchQuery() { - return rememberSearchQuery; - } - - @Override - public long getEnergyUsage() { - return energyUsage; - } - - @Override - public boolean isAutoSelected() { - return autoSelected; - } - - @Override - public void setAutoSelected(final boolean autoSelected) { - this.autoSelected = autoSelected; - save(); - } - - @Override - public Optional getSynchronizer() { - if (synchronizer == null || synchronizer.trim().isBlank()) { - return Optional.empty(); - } - return Optional.of(synchronizer).map(ResourceLocation::tryParse); - } - - @Override - public void setSynchronizer(final ResourceLocation synchronizerId) { - this.synchronizer = synchronizerId.toString(); - save(); - } - - @Override - public void clearSynchronizer() { - this.synchronizer = ""; - save(); - } - - @Override - public GridSortingDirection getSortingDirection() { - return sortingDirection; - } - - @Override - public void setSortingDirection(final GridSortingDirection sortingDirection) { - this.sortingDirection = sortingDirection; - save(); - } - - @Override - public GridSortingTypes getSortingType() { - return sortingType; - } - - @Override - public void setSortingType(final GridSortingTypes sortingType) { - this.sortingType = sortingType; - save(); - } - - @Override - public Optional getResourceTypeId() { - if (resourceTypeId == null || resourceTypeId.trim().isBlank()) { - return Optional.empty(); - } - return Optional.of(resourceTypeId).map(ResourceLocation::tryParse); - } - - @Override - public void setResourceTypeId(final ResourceLocation resourceTypeId) { - this.resourceTypeId = resourceTypeId.toString(); - save(); - } - - @Override - public void clearResourceType() { - this.resourceTypeId = ""; - save(); - } - - private static void save() { - AutoConfig.getConfigHolder(ConfigImpl.class).save(); - } - } - - private static class CraftingGridEntryImpl implements CraftingGridEntry { - private long energyUsage = DefaultEnergyUsage.CRAFTING_GRID; - - private CraftingGridMatrixCloseBehavior craftingMatrixCloseBehavior = CraftingGridMatrixCloseBehavior.NONE; - - @Override - public long getEnergyUsage() { - return energyUsage; - } - - @Override - public CraftingGridMatrixCloseBehavior getCraftingMatrixCloseBehavior() { - return craftingMatrixCloseBehavior; - } - } - - private static class DiskDriveEntryImpl implements DiskDriveEntry { - private long energyUsage = DefaultEnergyUsage.DISK_DRIVE; - - private long energyUsagePerDisk = DefaultEnergyUsage.DISK_DRIVE_PER_DISK; - - @Override - public long getEnergyUsage() { - return energyUsage; - } - - @Override - public long getEnergyUsagePerDisk() { - return energyUsagePerDisk; - } - } - - private static class DiskInterfaceEntryImpl implements DiskInterfaceEntry { - private long energyUsage = DefaultEnergyUsage.DISK_INTERFACE; - - private long energyUsagePerDisk = DefaultEnergyUsage.DISK_INTERFACE_PER_DISK; - - @Override - public long getEnergyUsage() { - return energyUsage; - } - - @Override - public long getEnergyUsagePerDisk() { - return energyUsagePerDisk; - } - } - - private static class SimpleEnergyUsageEntryImpl implements SimpleEnergyUsageEntry { - private long energyUsage; - - SimpleEnergyUsageEntryImpl(final long energyUsage) { - this.energyUsage = energyUsage; - } - - @Override - public long getEnergyUsage() { - return energyUsage; - } - } - - private static class ControllerEntryImpl implements ControllerEntry { - private long energyCapacity = DefaultEnergyUsage.CONTROLLER_CAPACITY; - - public long getEnergyCapacity() { - return energyCapacity; - } - } - - private static class StorageBlockEntryImpl implements StorageBlockEntry { - private long oneKEnergyUsage = DefaultEnergyUsage.ONE_K_STORAGE_BLOCK; - private long fourKEnergyUsage = DefaultEnergyUsage.FOUR_K_STORAGE_BLOCK; - private long sixteenKEnergyUsage = DefaultEnergyUsage.SIXTEEN_K_STORAGE_BLOCK; - private long sixtyFourKEnergyUsage = DefaultEnergyUsage.SIXTY_FOUR_K_STORAGE_BLOCK; - private long creativeEnergyUsage = DefaultEnergyUsage.CREATIVE_STORAGE_BLOCK; - - @Override - public long get1kEnergyUsage() { - return oneKEnergyUsage; - } - - @Override - public long get4kEnergyUsage() { - return fourKEnergyUsage; - } - - @Override - public long get16kEnergyUsage() { - return sixteenKEnergyUsage; - } - - @Override - public long get64kEnergyUsage() { - return sixtyFourKEnergyUsage; - } - - @Override - public long getCreativeEnergyUsage() { - return creativeEnergyUsage; - } - } - - private static class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { - private long sixtyFourBEnergyUsage = DefaultEnergyUsage.SIXTY_FOUR_B_FLUID_STORAGE_BLOCK; - private long twoHundredFiftySixBEnergyUsage = DefaultEnergyUsage.TWO_HUNDRED_FIFTY_SIX_B_FLUID_STORAGE_BLOCK; - private long thousandTwentyFourBEnergyUsage = DefaultEnergyUsage.THOUSAND_TWENTY_FOUR_B_FLUID_STORAGE_BLOCK; - private long fourThousandNinetySixBEnergyUsage = - DefaultEnergyUsage.FOUR_THOUSAND_NINETY_SIX_B_FLUID_STORAGE_BLOCK; - private long creativeEnergyUsage = DefaultEnergyUsage.CREATIVE_FLUID_STORAGE_BLOCK; - - @Override - public long get64bEnergyUsage() { - return sixtyFourBEnergyUsage; - } - - @Override - public long get256bEnergyUsage() { - return twoHundredFiftySixBEnergyUsage; - } - - @Override - public long get1024bEnergyUsage() { - return thousandTwentyFourBEnergyUsage; - } - - @Override - public long get4096bEnergyUsage() { - return fourThousandNinetySixBEnergyUsage; - } - - @Override - public long getCreativeEnergyUsage() { - return creativeEnergyUsage; - } - } - - private static class UpgradeEntryImpl implements UpgradeEntry { - private long speedUpgradeEnergyUsage = DefaultEnergyUsage.SPEED_UPGRADE; - - private long stackUpgradeEnergyUsage = DefaultEnergyUsage.STACK_UPGRADE; - - private long fortune1UpgradeEnergyUsage = DefaultEnergyUsage.FORTUNE_1_UPGRADE; - - private long fortune2UpgradeEnergyUsage = DefaultEnergyUsage.FORTUNE_2_UPGRADE; - - private long fortune3UpgradeEnergyUsage = DefaultEnergyUsage.FORTUNE_3_UPGRADE; - - private long silkTouchUpgradeEnergyUsage = DefaultEnergyUsage.SILK_TOUCH_UPGRADE; - - private long regulatorUpgradeEnergyUsage = DefaultEnergyUsage.REGULATOR_UPGRADE; - - private long rangeUpgradeEnergyUsage = DefaultEnergyUsage.RANGE_UPGRADE; - - private long creativeRangeUpgradeEnergyUsage = DefaultEnergyUsage.CREATIVE_RANGE_UPGRADE; - - private int rangeUpgradeRange = DefaultEnergyUsage.RANGE_UPGRADE_RANGE; - - @Override - public long getSpeedUpgradeEnergyUsage() { - return speedUpgradeEnergyUsage; - } - - @Override - public long getStackUpgradeEnergyUsage() { - return stackUpgradeEnergyUsage; - } - - @Override - public long getFortune1UpgradeEnergyUsage() { - return fortune1UpgradeEnergyUsage; - } - - @Override - public long getFortune2UpgradeEnergyUsage() { - return fortune2UpgradeEnergyUsage; - } - - @Override - public long getFortune3UpgradeEnergyUsage() { - return fortune3UpgradeEnergyUsage; - } - - @Override - public long getSilkTouchUpgradeEnergyUsage() { - return silkTouchUpgradeEnergyUsage; - } - - @Override - public long getRegulatorUpgradeEnergyUsage() { - return regulatorUpgradeEnergyUsage; - } - - @Override - public long getRangeUpgradeEnergyUsage() { - return rangeUpgradeEnergyUsage; - } - - @Override - public long getCreativeRangeUpgradeEnergyUsage() { - return creativeRangeUpgradeEnergyUsage; - } - - @Override - public int getRangeUpgradeRange() { - return rangeUpgradeRange; - } - } - - private static class WirelessGridEntryImpl implements WirelessGridEntry { - private long energyCapacity = DefaultEnergyUsage.WIRELESS_GRID_CAPACITY; - - private long openEnergyUsage = DefaultEnergyUsage.WIRELESS_GRID_OPEN; - - private long insertEnergyUsage = DefaultEnergyUsage.WIRELESS_GRID_INSERT; - - private long extractEnergyUsage = DefaultEnergyUsage.WIRELESS_GRID_EXTRACT; - - @Override - public long getEnergyCapacity() { - return energyCapacity; - } - - @Override - public long getOpenEnergyUsage() { - return openEnergyUsage; - } - - @Override - public long getInsertEnergyUsage() { - return insertEnergyUsage; - } - - @Override - public long getExtractEnergyUsage() { - return extractEnergyUsage; - } - } - - private static class WirelessTransmitterEntryImpl implements WirelessTransmitterEntry { - private long energyUsage = DefaultEnergyUsage.WIRELESS_TRANSMITTER; - - private int baseRange = DefaultEnergyUsage.WIRELESS_TRANSMITTER_BASE_RANGE; - - @Override - public long getEnergyUsage() { - return energyUsage; - } - - @Override - public int getBaseRange() { - return baseRange; - } - } - - private static class PortableGridEntryImpl implements PortableGridEntry { - private long energyCapacity = DefaultEnergyUsage.PORTABLE_GRID_CAPACITY; - - private long openEnergyUsage = DefaultEnergyUsage.PORTABLE_GRID_OPEN; - - private long insertEnergyUsage = DefaultEnergyUsage.PORTABLE_GRID_INSERT; - - private long extractEnergyUsage = DefaultEnergyUsage.PORTABLE_GRID_EXTRACT; - - @Override - public long getEnergyCapacity() { - return energyCapacity; - } - - @Override - public long getOpenEnergyUsage() { - return openEnergyUsage; - } - - @Override - public long getInsertEnergyUsage() { - return insertEnergyUsage; - } - - @Override - public long getExtractEnergyUsage() { - return extractEnergyUsage; - } - } - - private static class RelayEntryImpl implements RelayEntry { - private long inputNetworkEnergyUsage = DefaultEnergyUsage.RELAY_INPUT_NETWORK; - - private long outputNetworkEnergyUsage = DefaultEnergyUsage.RELAY_OUTPUT_NETWORK; - - @Override - public long getInputNetworkEnergyUsage() { - return inputNetworkEnergyUsage; - } - - @Override - public long getOutputNetworkEnergyUsage() { - return outputNetworkEnergyUsage; - } - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/PlatformImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/PlatformImpl.java deleted file mode 100644 index 8cca663e8..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/PlatformImpl.java +++ /dev/null @@ -1,369 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.AbstractPlatform; -import com.refinedmods.refinedstorage2.platform.common.Config; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.util.CustomBlockPlaceContext; -import com.refinedmods.refinedstorage2.platform.fabric.grid.strategy.ItemGridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.fabric.grid.view.FabricFluidGridResourceFactory; -import com.refinedmods.refinedstorage2.platform.fabric.grid.view.FabricItemGridResourceFactory; -import com.refinedmods.refinedstorage2.platform.fabric.mixin.EditBoxAccessor; -import com.refinedmods.refinedstorage2.platform.fabric.mixin.KeyMappingAccessor; -import com.refinedmods.refinedstorage2.platform.fabric.support.containermenu.ContainerTransferDestination; -import com.refinedmods.refinedstorage2.platform.fabric.support.containermenu.MenuOpenerImpl; -import com.refinedmods.refinedstorage2.platform.fabric.support.energy.EnergyStorageAdapter; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.FluidVariantFluidRenderer; -import com.refinedmods.refinedstorage2.platform.fabric.util.SimpleSingleStackStorage; - -import java.util.List; -import java.util.Optional; -import java.util.UUID; -import java.util.stream.Collectors; -import javax.annotation.Nullable; - -import com.mojang.blaze3d.platform.InputConstants; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.entity.FakePlayer; -import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; -import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; -import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; -import net.fabricmc.fabric.impl.transfer.context.ConstantContainerItemContext; -import net.minecraft.client.KeyMapping; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.NonNullList; -import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundEvents; -import net.minecraft.sounds.SoundSource; -import net.minecraft.tags.FluidTags; -import net.minecraft.world.Container; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.CraftingContainer; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.item.crafting.CraftingInput; -import net.minecraft.world.item.crafting.CraftingRecipe; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.block.LiquidBlockContainer; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraft.world.level.material.FlowingFluid; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.Vec3; - -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.ofFluidVariant; -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toFluidVariant; -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toItemVariant; - -public final class PlatformImpl extends AbstractPlatform { - public PlatformImpl() { - super(new MenuOpenerImpl(), new FluidVariantFluidRenderer(), ItemGridInsertionStrategy::new); - } - - @Override - public long getBucketAmount() { - return FluidConstants.BUCKET; - } - - @Override - public Config getConfig() { - return ConfigImpl.get(); - } - - @Override - public boolean canEditBoxLoseFocus(final EditBox editBox) { - return ((EditBoxAccessor) editBox).getCanLoseFocus(); - } - - @Override - public boolean isKeyDown(final KeyMapping keyMapping) { - return !keyMapping.isUnbound() && InputConstants.isKeyDown( - Minecraft.getInstance().getWindow().getWindow(), - ((KeyMappingAccessor) keyMapping).getKey().getValue() - ); - } - - @Override - public GridResourceFactory getItemGridResourceFactory() { - return new FabricItemGridResourceFactory(); - } - - @Override - public GridResourceFactory getFluidGridResourceFactory() { - return new FabricFluidGridResourceFactory(); - } - - @Override - public Optional getContainedFluid(final ItemStack stack) { - if (stack.isEmpty()) { - return Optional.empty(); - } - final SimpleSingleStackStorage interceptingStorage = new SimpleSingleStackStorage(stack); - final Storage storage = FluidStorage.ITEM.find(stack, ContainerItemContext.ofSingleSlot( - interceptingStorage - )); - try (Transaction tx = Transaction.openOuter()) { - final var extracted = StorageUtil.extractAny(storage, Long.MAX_VALUE, tx); - if (extracted == null) { - return Optional.empty(); - } - return Optional.of(new ContainedFluid( - interceptingStorage.getStack(), - ofFluidVariant(extracted.resource()), - extracted.amount() - )); - } - } - - @Override - public Optional convertToBucket(final FluidResource fluidResource) { - final SimpleSingleStackStorage interceptingStorage = SimpleSingleStackStorage.forEmptyBucket(); - final Storage destination = FluidStorage.ITEM.find( - interceptingStorage.getStack(), - ContainerItemContext.ofSingleSlot(interceptingStorage) - ); - if (destination == null) { - return Optional.empty(); - } - try (Transaction tx = Transaction.openOuter()) { - destination.insert(toFluidVariant(fluidResource), FluidConstants.BUCKET, tx); - return Optional.of(interceptingStorage.getStack()); - } - } - - @Override - public TransferManager createTransferManager(final AbstractContainerMenu containerMenu) { - return new TransferManager(containerMenu, ContainerTransferDestination::new); - } - - @Override - public long insertIntoContainer(final Container container, - final ItemResource itemResource, - final long amount, - final Action action) { - try (Transaction tx = Transaction.openOuter()) { - final long inserted = InventoryStorage - .of(container, null) - .insert(toItemVariant(itemResource), amount, tx); - if (action == Action.EXECUTE) { - tx.commit(); - } - return inserted; - } - } - - @Override - public ItemStack getCloneItemStack(final BlockState state, - final Level level, - final BlockHitResult hitResult, - final Player player) { - return state.getBlock().getCloneItemStack(level, hitResult.getBlockPos(), state); - } - - - @Override - public NonNullList getRemainingCraftingItems(final Player player, - final CraftingRecipe craftingRecipe, - final CraftingInput input) { - return craftingRecipe.getRemainingItems(input); - } - - @Override - public void onItemCrafted(final Player player, final ItemStack craftedStack, final CraftingContainer container) { - // no op - } - - @Override - public Player getFakePlayer(final ServerLevel level, @Nullable final UUID playerId) { - return Optional.ofNullable(playerId) - .flatMap(id -> level.getServer().getProfileCache().get(id)) - .map(profile -> FakePlayer.get(level, profile)) - .orElseGet(() -> FakePlayer.get(level)); - } - - @Override - public boolean canBreakBlock(final Level level, final BlockPos pos, final BlockState state, final Player player) { - return PlayerBlockBreakEvents.BEFORE.invoker().beforeBlockBreak( - level, - player, - pos, - state, - level.getBlockEntity(pos) - ); - } - - @Override - public boolean placeBlock( - final Level level, - final BlockPos pos, - final Direction direction, - final Player player, - final ItemStack stack - ) { - final BlockPlaceContext ctx = new CustomBlockPlaceContext( - level, - player, - InteractionHand.MAIN_HAND, - stack, - new BlockHitResult(Vec3.ZERO, direction, pos, false) - ); - final InteractionResult result = stack.useOn(ctx); - return result.consumesAction(); - } - - @Override - public boolean placeFluid( - final Level level, - final BlockPos pos, - final Direction direction, - final Player player, - final FluidResource fluidResource - ) { - // Stolen from BucketItem#emptyContents - final Fluid content = fluidResource.fluid(); - if (!(content instanceof FlowingFluid)) { - return false; - } - final BlockState blockState = level.getBlockState(pos); - final Block block = blockState.getBlock(); - final boolean replaceable = blockState.canBeReplaced(content); - final boolean canPlace = blockState.isAir() - || replaceable - || (block instanceof LiquidBlockContainer lbc - && lbc.canPlaceLiquid(player, level, pos, blockState, content)); - if (!canPlace || blockState.getFluidState().isSource()) { - return false; - } else if (block instanceof LiquidBlockContainer lbc && content == Fluids.WATER) { - lbc.placeLiquid(level, pos, blockState, ((FlowingFluid) content).getSource(false)); - playEmptySound(content, player, level, pos); - return true; - } - return doPlaceFluid(level, pos, player, content, blockState, replaceable); - } - - @SuppressWarnings("deprecation") - private boolean doPlaceFluid(final Level level, - final BlockPos pos, - final Player player, - final Fluid content, - final BlockState blockState, - final boolean replaceable) { - if (replaceable && !blockState.liquid()) { - level.destroyBlock(pos, true); - } - if (!level.setBlock(pos, content.defaultFluidState().createLegacyBlock(), 11) - && !blockState.getFluidState().isSource()) { - return false; - } - playEmptySound(content, player, level, pos); - return true; - } - - @SuppressWarnings("deprecation") - private void playEmptySound(final Fluid content, final Player player, final LevelAccessor level, - final BlockPos pos) { - final SoundEvent soundEvent = content.is(FluidTags.LAVA) - ? SoundEvents.BUCKET_EMPTY_LAVA - : SoundEvents.BUCKET_EMPTY; - level.playSound(player, pos, soundEvent, SoundSource.BLOCKS, 1.0F, 1.0F); - level.gameEvent(player, GameEvent.FLUID_PLACE, pos); - } - - @Override - public ItemStack getBlockAsItemStack(final Block block, - final BlockState state, - final Direction direction, - final LevelReader level, - final BlockPos position, - final Player player) { - return block.getCloneItemStack(level, position, state); - } - - @Override - public Optional getBucketPickupSound(final LiquidBlock liquidBlock, final BlockState state) { - return liquidBlock.getPickupSound(); - } - - @Override - public List processTooltipComponents(final ItemStack stack, - final GuiGraphics graphics, - final int mouseX, - final Optional imageComponent, - final List components) { - final List processedComponents = components - .stream() - .map(Component::getVisualOrderText) - .map(ClientTooltipComponent::create) - .collect(Collectors.toList()); - imageComponent.ifPresent(image -> processedComponents.add(1, ClientTooltipComponent.create(image))); - return processedComponents; - } - - @Override - public void renderTooltip(final GuiGraphics graphics, - final List components, - final int x, - final int y) { - graphics.renderTooltipInternal( - Minecraft.getInstance().font, - components, - x, - y, - DefaultTooltipPositioner.INSTANCE - ); - } - - @Override - public Optional getEnergyStorage(final ItemStack stack) { - final ConstantContainerItemContext ctx = new ConstantContainerItemContext( - ItemVariant.of(stack), - stack.getCount() - ); - return Optional.ofNullable(team.reborn.energy.api.EnergyStorage.ITEM.find(stack, ctx)) - .filter(EnergyStorageAdapter.class::isInstance) - .map(EnergyStorageAdapter.class::cast) - .map(EnergyStorageAdapter::getEnergyStorage); - } - - @Override - public void sendPacketToServer(final T packet) { - ClientPlayNetworking.send(packet); - } - - @Override - public void sendPacketToClient(final ServerPlayer player, final T packet) { - ServerPlayNetworking.send(player, packet); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java deleted file mode 100644 index 1e07454d2..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/exporter/FabricStorageExporterTransferStrategyFactory.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.exporter; - -import com.refinedmods.refinedstorage2.api.network.impl.node.exporter.ExporterTransferStrategyImpl; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.exporter.FuzzyExporterTransferStrategy; -import com.refinedmods.refinedstorage2.platform.fabric.storage.FabricStorageInsertableStorage; - -import java.util.function.Function; - -import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class FabricStorageExporterTransferStrategyFactory implements ExporterTransferStrategyFactory { - private final BlockApiLookup, Direction> lookup; - private final Function toPlatformMapper; - private final long singleAmount; - - public FabricStorageExporterTransferStrategyFactory(final BlockApiLookup, Direction> lookup, - final Function toPlatformMapper, - final long singleAmount) { - this.lookup = lookup; - this.toPlatformMapper = toPlatformMapper; - this.singleAmount = singleAmount; - } - - @Override - public ExporterTransferStrategy create(final ServerLevel level, - final BlockPos pos, - final Direction direction, - final UpgradeState upgradeState, - final AmountOverride amountOverride, - final boolean fuzzyMode) { - final FabricStorageInsertableStorage insertTarget = new FabricStorageInsertableStorage<>( - lookup, - toPlatformMapper, - level, - pos, - direction, - amountOverride - ); - final long transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) - ? singleAmount * 64 - : singleAmount; - return create(fuzzyMode, insertTarget, transferQuota); - } - - private ExporterTransferStrategyImpl create(final boolean fuzzyMode, - final FabricStorageInsertableStorage insertTarget, - final long transferQuota) { - if (fuzzyMode) { - return new FuzzyExporterTransferStrategy(insertTarget, transferQuota); - } - return new ExporterTransferStrategyImpl(insertTarget, transferQuota); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/exporter/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/exporter/package-info.java deleted file mode 100644 index 8137ac483..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/exporter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.exporter; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java deleted file mode 100644 index bfca9f72b..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridExtractionStrategy.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage2.platform.fabric.util.SimpleSingleStackStorage; - -import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.Items; - -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toFluidVariant; - -public class FluidGridExtractionStrategy implements GridExtractionStrategy { - private static final ItemVariant BUCKET_ITEM_VARIANT = ItemVariant.of(Items.BUCKET); - private static final ItemResource BUCKET_ITEM_RESOURCE = new ItemResource(Items.BUCKET); - - private final GridOperations gridOperations; - private final PlayerInventoryStorage playerInventoryStorage; - private final net.fabricmc.fabric.api.transfer.v1.storage.Storage playerCursorStorage; - private final Storage itemStorage; - - public FluidGridExtractionStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - this.gridOperations = grid.createOperations(ResourceTypes.FLUID, player); - this.playerInventoryStorage = PlayerInventoryStorage.of(player.getInventory()); - this.playerCursorStorage = PlayerInventoryStorage.getCursorStorage(containerMenu); - this.itemStorage = grid.getItemStorage(); - } - - @Override - public boolean onExtract(final PlatformResourceKey resource, - final GridExtractMode extractMode, - final boolean cursor) { - if (resource instanceof FluidResource fluidResource) { - final boolean bucketInInventory = hasBucketInInventory(); - final boolean bucketInStorageChannel = hasBucketInStorage(); - if (bucketInInventory) { - extractWithBucketInInventory(fluidResource, extractMode, cursor); - } else if (bucketInStorageChannel) { - extractWithBucketInStorage(fluidResource, extractMode, cursor); - } - return true; - } - return false; - } - - private void extractWithBucketInStorage(final FluidResource fluidResource, - final GridExtractMode mode, - final boolean cursor) { - final SimpleSingleStackStorage interceptingStorage = SimpleSingleStackStorage.forEmptyBucket(); - final net.fabricmc.fabric.api.transfer.v1.storage.Storage destination = FluidStorage.ITEM.find( - interceptingStorage.getStack(), - ContainerItemContext.ofSingleSlot(interceptingStorage) - ); - if (destination == null) { - return; - } - gridOperations.extract(fluidResource, mode, (resource, amount, action, source) -> { - if (!(resource instanceof FluidResource fluidResource2)) { - return 0; - } - try (Transaction tx = Transaction.openOuter()) { - final long inserted = destination.insert(toFluidVariant(fluidResource2), amount, tx); - final boolean couldInsertBucket = insertResultingBucketIntoInventory(interceptingStorage, cursor, tx); - if (!couldInsertBucket) { - return 0; - } - if (action == Action.EXECUTE) { - itemStorage.extract(BUCKET_ITEM_RESOURCE, 1, Action.EXECUTE, source); - tx.commit(); - } - return inserted; - } - }); - } - - private void extractWithBucketInInventory(final FluidResource fluidResource, - final GridExtractMode mode, - final boolean cursor) { - try (Transaction tx = Transaction.openOuter()) { - playerInventoryStorage.extract(BUCKET_ITEM_VARIANT, 1, tx); - final SimpleSingleStackStorage interceptingStorage = SimpleSingleStackStorage.forEmptyBucket(); - final net.fabricmc.fabric.api.transfer.v1.storage.Storage dest = FluidStorage.ITEM.find( - interceptingStorage.getStack(), - ContainerItemContext.ofSingleSlot(interceptingStorage) - ); - if (dest == null) { - return; - } - gridOperations.extract(fluidResource, mode, (resource, amount, action, source) -> { - if (!(resource instanceof FluidResource fluidResource2)) { - return 0; - } - try (Transaction innerTx = tx.openNested()) { - final long inserted = dest.insert(toFluidVariant(fluidResource2), amount, innerTx); - final boolean couldInsertBucket = insertResultingBucketIntoInventory( - interceptingStorage, - cursor, - innerTx - ); - if (!couldInsertBucket) { - return 0; - } - if (action == Action.EXECUTE) { - innerTx.commit(); - tx.commit(); - } - return inserted; - } - }); - } - } - - private boolean insertResultingBucketIntoInventory(final SimpleSingleStackStorage interceptingStorage, - final boolean cursor, - final Transaction innerTx) { - final net.fabricmc.fabric.api.transfer.v1.storage.Storage relevantStorage = cursor - ? playerCursorStorage - : playerInventoryStorage; - final ItemVariant itemVariant = ItemVariant.of(interceptingStorage.getStack()); - return relevantStorage.insert(itemVariant, 1, innerTx) != 0; - } - - private boolean hasBucketInInventory() { - try (Transaction tx = Transaction.openOuter()) { - return playerInventoryStorage.extract(BUCKET_ITEM_VARIANT, 1, tx) == 1; - } - } - - private boolean hasBucketInStorage() { - return itemStorage.extract(BUCKET_ITEM_RESOURCE, 1, Action.SIMULATE, EmptyActor.INSTANCE) == 1; - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java deleted file mode 100644 index cb2f79d4e..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/FluidGridInsertionStrategy.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; - -import javax.annotation.Nullable; - -import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; -import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; -import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; - -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.ofFluidVariant; -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toFluidVariant; - -public class FluidGridInsertionStrategy implements GridInsertionStrategy { - private final AbstractContainerMenu containerMenu; - private final GridOperations gridOperations; - private final Player player; - private final PlayerInventoryStorage playerInventoryStorage; - - public FluidGridInsertionStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - this.containerMenu = containerMenu; - this.gridOperations = grid.createOperations(ResourceTypes.FLUID, player); - this.player = player; - this.playerInventoryStorage = PlayerInventoryStorage.of(player.getInventory()); - } - - @Override - public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { - final Storage cursorStorage = getFluidCursorStorage(); - if (cursorStorage == null) { - return false; - } - final FluidVariant extractableResource = StorageUtil.findExtractableResource(cursorStorage, null); - if (extractableResource == null) { - return false; - } - final FluidResource fluidResource = ofFluidVariant(extractableResource); - gridOperations.insert(fluidResource, insertMode, (resource, amount, action, source) -> { - if (!(resource instanceof FluidResource fluidResource2)) { - return 0; - } - final FluidVariant fluidVariant = toFluidVariant(fluidResource2); - try (Transaction tx = Transaction.openOuter()) { - final long extracted = cursorStorage.extract(fluidVariant, amount, tx); - if (action == Action.EXECUTE) { - tx.commit(); - } - return extracted; - } - }); - return true; - } - - @Nullable - private Storage getFluidCursorStorage() { - return FluidStorage.ITEM.find( - containerMenu.getCarried(), - ContainerItemContext.ofPlayerCursor(player, containerMenu) - ); - } - - @Override - public boolean onTransfer(final int slotIndex) { - final SingleSlotStorage itemSlotStorage = playerInventoryStorage.getSlot(slotIndex); - if (itemSlotStorage == null) { - return false; - } - final Storage fluidSlotStorage = FluidStorage.ITEM.find( - itemSlotStorage.getResource().toStack(), - ContainerItemContext.ofPlayerSlot(player, itemSlotStorage) - ); - if (fluidSlotStorage == null) { - return false; - } - final FluidVariant extractableResource = StorageUtil.findExtractableResource(fluidSlotStorage, null); - if (extractableResource == null) { - return false; - } - final FluidResource fluidResource = ofFluidVariant(extractableResource); - gridOperations.insert(fluidResource, GridInsertMode.ENTIRE_RESOURCE, (resource, amount, action, source) -> { - if (!(resource instanceof FluidResource fluidResource2)) { - return 0; - } - final FluidVariant fluidVariant = toFluidVariant(fluidResource2); - try (Transaction tx = Transaction.openOuter()) { - final long extracted = fluidSlotStorage.extract(fluidVariant, amount, tx); - if (action == Action.EXECUTE) { - tx.commit(); - } - return extracted; - } - }); - return true; - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java deleted file mode 100644 index 2582951e6..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridExtractionStrategy.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; - -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; -import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; - -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toItemVariant; - -public class ItemGridExtractionStrategy implements GridExtractionStrategy { - private final GridOperations gridOperations; - private final PlayerInventoryStorage playerInventoryStorage; - private final SingleSlotStorage playerCursorStorage; - - public ItemGridExtractionStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); - this.playerInventoryStorage = PlayerInventoryStorage.of(player.getInventory()); - this.playerCursorStorage = PlayerInventoryStorage.getCursorStorage(containerMenu); - } - - @Override - public boolean onExtract(final PlatformResourceKey resource, - final GridExtractMode extractMode, - final boolean cursor) { - if (resource instanceof ItemResource itemResource) { - gridOperations.extract(itemResource, extractMode, (r, amount, action, source) -> { - if (!(r instanceof ItemResource itemResource2)) { - return 0; - } - final ItemVariant itemVariant = toItemVariant(itemResource2); - try (Transaction tx = Transaction.openOuter()) { - final long inserted = insert(itemVariant, amount, tx, cursor); - if (action == Action.EXECUTE) { - tx.commit(); - } - return inserted; - } - }); - return true; - } - return false; - } - - private long insert(final ItemVariant itemVariant, final long amount, final Transaction tx, final boolean cursor) { - final Storage relevantStorage = cursor ? playerCursorStorage : playerInventoryStorage; - return relevantStorage.insert(itemVariant, amount, tx); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java deleted file mode 100644 index 67e400ac8..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridInsertionStrategy.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; - -import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil; -import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; -import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.ItemStack; - -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.ofItemVariant; -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toItemVariant; - -public class ItemGridInsertionStrategy implements GridInsertionStrategy { - private final AbstractContainerMenu containerMenu; - private final GridOperations gridOperations; - private final SingleSlotStorage playerCursorStorage; - - public ItemGridInsertionStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - this.containerMenu = containerMenu; - this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); - this.playerCursorStorage = PlayerInventoryStorage.getCursorStorage(containerMenu); - } - - @Override - public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { - final ItemStack carried = containerMenu.getCarried(); - if (carried.isEmpty()) { - return false; - } - final ItemResource itemResource = ItemResource.ofItemStack(carried); - gridOperations.insert(itemResource, insertMode, (resource, amount, action, source) -> { - if (!(resource instanceof ItemResource itemResource2)) { - return 0; - } - try (Transaction tx = Transaction.openOuter()) { - final ItemVariant itemVariant = toItemVariant(itemResource2); - final long extracted = playerCursorStorage.extract(itemVariant, amount, tx); - if (action == Action.EXECUTE) { - tx.commit(); - } - return extracted; - } - }); - return true; - } - - @Override - public boolean onTransfer(final int slotIndex) { - final Slot slot = containerMenu.getSlot(slotIndex); - final InventoryStorage inventoryStorage = InventoryStorage.of(slot.container, null); - final SingleSlotStorage storage = inventoryStorage.getSlot(slot.getContainerSlot()); - final ItemVariant itemVariantInSlot = StorageUtil.findExtractableResource(storage, null); - if (itemVariantInSlot == null) { - return false; - } - final ItemResource itemResource = ofItemVariant(itemVariantInSlot); - gridOperations.insert(itemResource, GridInsertMode.ENTIRE_RESOURCE, (resource, amount, action, source) -> { - if (!(resource instanceof ItemResource itemResource2)) { - return 0; - } - try (Transaction tx = Transaction.openOuter()) { - final ItemVariant itemVariant = toItemVariant(itemResource2); - final long extracted = storage.extract(itemVariant, amount, tx); - if (action == Action.EXECUTE) { - tx.commit(); - } - return extracted; - } - }); - return true; - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java deleted file mode 100644 index fd82958dd..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/ItemGridScrollingStrategy.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; - -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; -import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; - -import static com.refinedmods.refinedstorage2.platform.fabric.support.resource.VariantUtil.toItemVariant; - -public class ItemGridScrollingStrategy implements GridScrollingStrategy { - private final GridOperations gridOperations; - private final PlayerInventoryStorage playerInventoryStorage; - private final SingleSlotStorage playerCursorStorage; - - public ItemGridScrollingStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); - this.playerInventoryStorage = PlayerInventoryStorage.of(player.getInventory()); - this.playerCursorStorage = PlayerInventoryStorage.getCursorStorage(containerMenu); - } - - @Override - public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { - if (resource instanceof ItemResource itemResource) { - final Storage playerStorage = slotIndex >= 0 - ? playerInventoryStorage.getSlot(slotIndex) - : playerInventoryStorage; - switch (scrollMode) { - case GRID_TO_INVENTORY -> handleGridToInventoryScroll(itemResource, playerStorage); - case INVENTORY_TO_GRID -> handleInventoryToGridScroll(itemResource, playerStorage); - case GRID_TO_CURSOR -> handleGridToInventoryScroll(itemResource, playerCursorStorage); - } - return true; - } - return false; - } - - private void handleInventoryToGridScroll(final ItemResource itemResource, - final Storage sourceStorage) { - gridOperations.insert(itemResource, GridInsertMode.SINGLE_RESOURCE, (resource, amount, action, source) -> { - if (!(resource instanceof ItemResource itemResource2)) { - return 0; - } - try (Transaction tx = Transaction.openOuter()) { - final ItemVariant itemVariant = toItemVariant(itemResource2); - final long extracted = sourceStorage.extract(itemVariant, amount, tx); - if (action == Action.EXECUTE) { - tx.commit(); - } - return extracted; - } - }); - } - - private void handleGridToInventoryScroll(final ItemResource itemResource, - final Storage destinationStorage) { - gridOperations.extract(itemResource, GridExtractMode.SINGLE_RESOURCE, (resource, amount, action, source) -> { - if (!(resource instanceof ItemResource itemResource2)) { - return 0; - } - final ItemVariant itemVariant = toItemVariant(itemResource2); - try (Transaction tx = Transaction.openOuter()) { - final long inserted = destinationStorage.insert(itemVariant, amount, tx); - if (action == Action.EXECUTE) { - tx.commit(); - } - return inserted; - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/package-info.java deleted file mode 100644 index 1721763e7..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/strategy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/package-info.java deleted file mode 100644 index 130aa66e0..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/grid/view/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.grid.view; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java deleted file mode 100644 index f5dabaa07..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/FabricStorageImporterTransferStrategyFactory.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.importer; - -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterSource; -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterTransferStrategyImpl; -import com.refinedmods.refinedstorage2.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.common.content.Items; - -import java.util.function.Function; - -import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class FabricStorageImporterTransferStrategyFactory

implements ImporterTransferStrategyFactory { - private final BlockApiLookup, Direction> lookup; - private final Function fromPlatformMapper; - private final Function toPlatformMapper; - private final long singleAmount; - - public FabricStorageImporterTransferStrategyFactory(final BlockApiLookup, Direction> lookup, - final Function fromPlatformMapper, - final Function toPlatformMapper, - final long singleAmount) { - this.lookup = lookup; - this.fromPlatformMapper = fromPlatformMapper; - this.toPlatformMapper = toPlatformMapper; - this.singleAmount = singleAmount; - } - - @Override - public ImporterTransferStrategy create(final ServerLevel level, - final BlockPos pos, - final Direction direction, - final UpgradeState upgradeState, - final AmountOverride amountOverride) { - final ImporterSource source = new FabricStorageImporterSource<>( - lookup, - fromPlatformMapper, - toPlatformMapper, - level, - pos, - direction, - amountOverride - ); - final long transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) - ? singleAmount * 64 - : singleAmount; - return new ImporterTransferStrategyImpl(source, transferQuota); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/package-info.java deleted file mode 100644 index 35e4bc8c8..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/importer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.importer; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/package-info.java deleted file mode 100644 index 1cdc6a9d1..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.mixin; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/modmenu/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/modmenu/package-info.java deleted file mode 100644 index 657a0c060..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/modmenu/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.modmenu; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/package-info.java deleted file mode 100644 index f6b2c5a33..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/security/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/security/package-info.java deleted file mode 100644 index 2d9c25b8b..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/security/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.security; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java deleted file mode 100644 index 9b4765a14..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBakedModel.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive; - -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveBlock; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.fabric.storage.AbstractDiskContainerBakedModel; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadRotators; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadTranslator; - -import java.util.Map; -import java.util.function.Supplier; - -import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.state.BlockState; - -class DiskDriveBakedModel extends AbstractDiskContainerBakedModel { - private final QuadRotators quadRotators; - - DiskDriveBakedModel(final BakedModel baseModel, - final Map diskModels, - final BakedModel inactiveLedModel, - final QuadRotators quadRotators) { - super(diskModels, inactiveLedModel, getDiskTranslations()); - this.wrapped = baseModel; - this.quadRotators = quadRotators; - } - - private static QuadTranslator[] getDiskTranslations() { - final QuadTranslator[] translations = new QuadTranslator[8]; - int i = 0; - for (int y = 0; y < 4; ++y) { - for (int x = 0; x < 2; ++x) { - translations[i++] = new QuadTranslator( - x == 0 ? -(2F / 16F) : -(9F / 16F), - -((y * 3F) / 16F) - (2F / 16F), - 0 - ); - } - } - return translations; - } - - @Override - public void emitItemQuads(final ItemStack stack, - final Supplier randomSupplier, - final RenderContext context) { - wrapped.emitItemQuads(stack, randomSupplier, context); - super.emitItemQuads(stack, randomSupplier, context); - } - - @Override - public void emitBlockQuads(final BlockAndTintGetter blockView, - final BlockState state, - final BlockPos pos, - final Supplier randomSupplier, - final RenderContext context) { - if (!(state.getBlock() instanceof DiskDriveBlock diskDriveBlock)) { - return; - } - final BiDirection direction = diskDriveBlock.getDirection(state); - if (direction == null) { - return; - } - context.pushTransform(quadRotators.forDirection(direction)); - wrapped.emitBlockQuads(blockView, state, pos, randomSupplier, context); - super.emitBlockQuads(blockView, state, pos, randomSupplier, context); - context.popTransform(); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java deleted file mode 100644 index 0050dc78f..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive; - -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntityRenderer; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.RenderTypes; - -public class DiskDriveBlockEntityRendererImpl - extends AbstractDiskDriveBlockEntityRenderer { - public DiskDriveBlockEntityRendererImpl() { - super(RenderTypes.DISK_LED); - } - - @Override - protected Disk[] getDisks(final AbstractDiskDriveBlockEntity blockEntity) { - if (!(blockEntity instanceof FabricDiskDriveBlockEntity fabricBlockEntity)) { - return null; - } - if (fabricBlockEntity.getRenderData() instanceof Disk[] disks) { - return disks; - } - return null; - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java deleted file mode 100644 index 2cce4ceff..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/FabricDiskDriveBlockEntity.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive; - -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; - -public class FabricDiskDriveBlockEntity extends AbstractDiskDriveBlockEntity { - public FabricDiskDriveBlockEntity(final BlockPos pos, final BlockState state) { - super(pos, state); - } - - @Override - @Nullable - public Object getRenderData() { - return disks; - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/package-info.java deleted file mode 100644 index a2af34b2c..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskdrive/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskdrive; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java deleted file mode 100644 index a1bc278a1..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceBakedModel.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface; - -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceBlock; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.fabric.storage.AbstractDiskContainerBakedModel; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.EmissiveTransform; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadRotators; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadTranslator; - -import java.util.Map; -import java.util.Set; -import java.util.function.Supplier; - -import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.RandomSource; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.state.BlockState; - -class DiskInterfaceBakedModel extends AbstractDiskContainerBakedModel { - private final BakedModel inactiveModel; - private final QuadRotators quadRotators; - private final EmissiveTransform emissiveTransform; - - DiskInterfaceBakedModel(final BakedModel baseModel, - final BakedModel inactiveModel, - final Map diskModels, - final BakedModel inactiveLedModel, - final QuadRotators quadRotators, - final ResourceLocation emissiveSprite) { - super(diskModels, inactiveLedModel, getDiskTranslations()); - this.wrapped = baseModel; - this.inactiveModel = inactiveModel; - this.quadRotators = quadRotators; - this.emissiveTransform = new EmissiveTransform(Set.of(emissiveSprite)); - } - - private static QuadTranslator[] getDiskTranslations() { - final QuadTranslator[] translations = new QuadTranslator[6]; - for (int i = 0; i < translations.length; ++i) { - final int x = i < 3 ? 0 : 1; - final int y = i % 3; - translations[i] = new QuadTranslator( - x == 0 ? -(2F / 16F) : -(9F / 16F), - -((y * 3F) / 16F) - (6F / 16F), - 0 - ); - } - return translations; - } - - @Override - public void emitItemQuads(final ItemStack stack, - final Supplier randomSupplier, - final RenderContext context) { - context.pushTransform(emissiveTransform); - wrapped.emitItemQuads(stack, randomSupplier, context); - context.popTransform(); - super.emitItemQuads(stack, randomSupplier, context); - } - - @Override - public void emitBlockQuads(final BlockAndTintGetter blockView, - final BlockState state, - final BlockPos pos, - final Supplier randomSupplier, - final RenderContext context) { - if (!(state.getBlock() instanceof DiskInterfaceBlock diskInterfaceBlock)) { - return; - } - final BiDirection direction = diskInterfaceBlock.getDirection(state); - if (direction == null) { - return; - } - context.pushTransform(quadRotators.forDirection(direction)); - final boolean active = state.getValue(AbstractActiveColoredDirectionalBlock.ACTIVE); - if (active) { - context.pushTransform(emissiveTransform); - } - (active ? wrapped : inactiveModel).emitBlockQuads(blockView, state, pos, randomSupplier, context); - super.emitBlockQuads(blockView, state, pos, randomSupplier, context); - if (active) { - context.popTransform(); - } - context.popTransform(); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java deleted file mode 100644 index 4a62ebca9..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface; - -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntityRenderer; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.RenderTypes; - -public class DiskInterfaceBlockEntityRendererImpl - extends AbstractDiskInterfaceBlockEntityRenderer { - public DiskInterfaceBlockEntityRendererImpl() { - super(RenderTypes.DISK_LED); - } - - @Override - protected Disk[] getDisks(final AbstractDiskInterfaceBlockEntity blockEntity) { - if (!(blockEntity instanceof FabricDiskInterfaceBlockEntity fabricBlockEntity)) { - return null; - } - if (fabricBlockEntity.getRenderData() instanceof Disk[] disks) { - return disks; - } - return null; - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java deleted file mode 100644 index 30370e0be..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/FabricDiskInterfaceBlockEntity.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface; - -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; - -public class FabricDiskInterfaceBlockEntity extends AbstractDiskInterfaceBlockEntity { - public FabricDiskInterfaceBlockEntity(final BlockPos pos, final BlockState state) { - super(pos, state); - } - - @Override - @Nullable - public Object getRenderData() { - return disks; - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/package-info.java deleted file mode 100644 index 2e7c72336..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/diskinterface/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.storage.diskinterface; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/package-info.java deleted file mode 100644 index 45aebfffc..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/package-info.java deleted file mode 100644 index a7a6f90d6..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.storage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java deleted file mode 100644 index ece20d700..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/FabricPortableGridBlockEntity.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid; - -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType; - -import javax.annotation.Nullable; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; - -public class FabricPortableGridBlockEntity extends AbstractPortableGridBlockEntity { - public FabricPortableGridBlockEntity(final PortableGridType type, final BlockPos pos, final BlockState state) { - super(type, pos, state); - } - - @Override - @Nullable - public Object getRenderData() { - return disk; - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBakedModel.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBakedModel.java deleted file mode 100644 index 68a79b3d2..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBakedModel.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItemRenderInfo; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadRotators; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.QuadTranslator; - -import java.util.Map; -import java.util.function.Supplier; - -import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; -import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.BlockPos; -import net.minecraft.util.RandomSource; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.state.BlockState; - -public class PortableGridBakedModel extends ForwardingBakedModel { - private static final QuadTranslator MOVE_TO_DISK_LOCATION = new QuadTranslator(0, -12 / 16F, 9 / 16F); - private static final QuadTranslator MOVE_TO_DISK_LED_LOCATION = new QuadTranslator(0, -12 / 16F, 9 / 16F); - - private final BakedModel activeModel; - private final BakedModel inactiveModel; - private final Map diskModels; - private final QuadRotators quadRotators; - private final DiskLeds diskLeds; - - PortableGridBakedModel(final BakedModel activeModel, - final BakedModel inactiveModel, - final Map diskModels, - final QuadRotators quadRotators, - final DiskLeds diskLeds) { - this.wrapped = inactiveModel; - this.activeModel = activeModel; - this.inactiveModel = inactiveModel; - this.diskModels = diskModels; - this.quadRotators = quadRotators; - this.diskLeds = diskLeds; - } - - @Override - public boolean isVanillaAdapter() { - return false; - } - - @Override - public void emitItemQuads(final ItemStack stack, - final Supplier randomSupplier, - final RenderContext context) { - final ClientLevel level = Minecraft.getInstance().level; - if (level == null) { - return; - } - final PortableGridBlockItemRenderInfo renderInfo = PortableGridBlockItem.getRenderInfo(stack, level); - (renderInfo.active() ? activeModel : inactiveModel).emitItemQuads(stack, randomSupplier, context); - if (renderInfo.disk().state() != StorageState.NONE) { - final BakedModel diskModel = diskModels.get(renderInfo.disk().item()); - if (diskModel == null) { - return; - } - context.pushTransform(MOVE_TO_DISK_LOCATION); - context.pushTransform(quadRotators.forDirection(BiDirection.WEST)); - diskModel.emitItemQuads(stack, randomSupplier, context); - context.popTransform(); - context.popTransform(); - - context.pushTransform(MOVE_TO_DISK_LED_LOCATION); - context.pushTransform(quadRotators.forDirection(BiDirection.WEST)); - diskLeds.forState(renderInfo.disk().state()).emitItemQuads(stack, randomSupplier, context); - context.popTransform(); - context.popTransform(); - } - } - - @Override - public void emitBlockQuads(final BlockAndTintGetter blockView, - final BlockState state, - final BlockPos pos, - final Supplier randomSupplier, - final RenderContext context) { - if (!(state.getBlock() instanceof PortableGridBlock portableGridBlock)) { - return; - } - final BiDirection direction = portableGridBlock.getDirection(state); - if (direction == null) { - return; - } - context.pushTransform(quadRotators.forDirection(direction)); - final Object renderAttachment = blockView.getBlockEntityRenderData(pos); - if (renderAttachment instanceof Disk disk) { - emitDiskQuads(blockView, state, pos, randomSupplier, context, disk); - } - final boolean active = state.getValue(PortableGridBlock.ACTIVE); - (active ? activeModel : inactiveModel).emitBlockQuads(blockView, state, pos, randomSupplier, context); - context.popTransform(); - } - - private void emitDiskQuads( - final BlockAndTintGetter blockView, - final BlockState state, - final BlockPos pos, - final Supplier randomSupplier, - final RenderContext context, - final Disk disk - ) { - final BakedModel diskModel = diskModels.get(disk.item()); - if (diskModel == null) { - return; - } - context.pushTransform(MOVE_TO_DISK_LOCATION); - context.pushTransform(quadRotators.forDirection(BiDirection.WEST)); - diskModel.emitBlockQuads(blockView, state, pos, randomSupplier, context); - context.popTransform(); - context.popTransform(); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java deleted file mode 100644 index 5908fd04a..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/PortableGridBlockEntityRendererImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid; - -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntityRenderer; -import com.refinedmods.refinedstorage2.platform.fabric.support.render.RenderTypes; - -import javax.annotation.Nullable; - -public class PortableGridBlockEntityRendererImpl - extends AbstractPortableGridBlockEntityRenderer { - public PortableGridBlockEntityRendererImpl() { - super(RenderTypes.DISK_LED); - } - - @Override - @Nullable - protected Disk getDisk(final T blockEntity) { - if (!(blockEntity instanceof FabricPortableGridBlockEntity fabricDiskDriveBlockEntity)) { - return null; - } - if (fabricDiskDriveBlockEntity.getRenderData() instanceof Disk disk) { - return disk; - } - return null; - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/package-info.java deleted file mode 100644 index 3ada379be..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/storage/portablegrid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/ContainerTransferDestination.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/ContainerTransferDestination.java deleted file mode 100644 index 2baa0cc84..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/ContainerTransferDestination.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.containermenu; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferDestination; - -import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; -import net.minecraft.world.Container; -import net.minecraft.world.item.ItemStack; - -public record ContainerTransferDestination(Container destination) implements TransferDestination { - @Override - public ItemStack transfer(final ItemStack stack) { - final Storage storage = InventoryStorage.of(destination, null); - try (Transaction tx = Transaction.openOuter()) { - final long inserted = storage.insert( - ItemVariant.of(stack), - stack.getCount(), - tx - ); - tx.commit(); - final long remainder = stack.getCount() - inserted; - final ItemStack remainderStack = stack.copy(); - remainderStack.setCount((int) remainder); - return remainderStack; - } - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/MenuOpenerImpl.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/MenuOpenerImpl.java deleted file mode 100644 index be74c51d1..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/MenuOpenerImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.containermenu; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; - -import javax.annotation.Nullable; - -import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.MenuProvider; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; - -public class MenuOpenerImpl implements MenuOpener { - @Override - public void openMenu(final ServerPlayer player, final MenuProvider menuProvider) { - if (menuProvider instanceof ExtendedMenuProvider extendedMenuProvider) { - openExtendedMenu(player, extendedMenuProvider); - } else { - player.openMenu(menuProvider); - } - } - - private void openExtendedMenu(final ServerPlayer player, final ExtendedMenuProvider extendedMenuProvider) { - player.openMenu(new ExtendedScreenHandlerFactory() { - @Nullable - @Override - public AbstractContainerMenu createMenu(final int syncId, final Inventory inventory, final Player player) { - return extendedMenuProvider.createMenu(syncId, inventory, player); - } - - @Override - public Component getDisplayName() { - return extendedMenuProvider.getDisplayName(); - } - - @Override - public T getScreenOpeningData(final ServerPlayer player) { - return extendedMenuProvider.getMenuData(); - } - }); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/package-info.java deleted file mode 100644 index eb5ed88eb..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/containermenu/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.support.containermenu; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/energy/EnergyStorageAdapter.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/energy/EnergyStorageAdapter.java deleted file mode 100644 index 2d51867f3..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/energy/EnergyStorageAdapter.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.energy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; - -import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; -import net.fabricmc.fabric.api.transfer.v1.transaction.base.SnapshotParticipant; - -public class EnergyStorageAdapter extends SnapshotParticipant implements team.reborn.energy.api.EnergyStorage { - private final EnergyStorage energyStorage; - - public EnergyStorageAdapter(final EnergyStorage energyStorage) { - this.energyStorage = energyStorage; - } - - public EnergyStorage getEnergyStorage() { - return energyStorage; - } - - @Override - public long insert(final long maxAmount, final TransactionContext transaction) { - final long insertedSimulated = energyStorage.receive(maxAmount, Action.SIMULATE); - if (insertedSimulated > 0) { - updateSnapshots(transaction); - } - return energyStorage.receive(maxAmount, Action.EXECUTE); - } - - @Override - public long extract(final long maxAmount, final TransactionContext transaction) { - final long extractedSimulated = energyStorage.extract(maxAmount, Action.SIMULATE); - if (extractedSimulated > 0) { - updateSnapshots(transaction); - } - return energyStorage.extract(maxAmount, Action.EXECUTE); - } - - @Override - public long getAmount() { - return energyStorage.getStored(); - } - - @Override - public long getCapacity() { - return energyStorage.getCapacity(); - } - - @Override - protected Long createSnapshot() { - return energyStorage.getStored(); - } - - @Override - protected void readSnapshot(final Long snapshot) { - energyStorage.extract(Long.MAX_VALUE, Action.EXECUTE); - energyStorage.receive(snapshot, Action.EXECUTE); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/energy/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/energy/package-info.java deleted file mode 100644 index 0daf46400..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.support.energy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadRotators.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadRotators.java deleted file mode 100644 index 4b2927cbf..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/QuadRotators.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.render; - -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; - -import java.util.EnumMap; -import java.util.Map; - -public class QuadRotators { - private final Map rotators = new EnumMap<>(BiDirection.class); - - public QuadRotators() { - for (final BiDirection direction : BiDirection.values()) { - rotators.put(direction, new QuadRotator(direction)); - } - } - - public QuadRotator forDirection(final BiDirection direction) { - return rotators.get(direction); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/RenderTypes.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/RenderTypes.java deleted file mode 100644 index 1233eb05e..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/RenderTypes.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.render; - -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.VertexFormat; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.RenderStateShard; -import net.minecraft.client.renderer.RenderType; - -public final class RenderTypes { - public static final RenderType DISK_LED = RenderType.create( - "disk_led", - DefaultVertexFormat.POSITION_COLOR, - VertexFormat.Mode.QUADS, - 32565, - false, - true, - RenderType.CompositeState.builder() - .setShaderState(new RenderStateShard.ShaderStateShard(GameRenderer::getPositionColorShader)) - .createCompositeState(false) - ); - - private RenderTypes() { - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/package-info.java deleted file mode 100644 index ce917d398..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/render/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.support.render; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/VariantUtil.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/VariantUtil.java deleted file mode 100644 index 5e241963c..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/VariantUtil.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.fabric.support.resource; - -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; - -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; - -public final class VariantUtil { - private VariantUtil() { - } - - public static ItemVariant toItemVariant(final ItemResource itemResource) { - return ItemVariant.of(itemResource.item(), itemResource.components()); - } - - public static ItemResource ofItemVariant(final ItemVariant itemVariant) { - return new ItemResource(itemVariant.getItem(), itemVariant.getComponents()); - } - - public static FluidVariant toFluidVariant(final FluidResource fluidResource) { - return FluidVariant.of(fluidResource.fluid(), fluidResource.components()); - } - - public static FluidResource ofFluidVariant(final FluidVariant fluidVariant) { - return new FluidResource(fluidVariant.getFluid(), fluidVariant.getComponents()); - } -} diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/package-info.java deleted file mode 100644 index 5aef742c2..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/support/resource/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.support.resource; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/util/package-info.java b/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/util/package-info.java deleted file mode 100644 index 12b4210e0..000000000 --- a/refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/util/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.fabric.util; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-fabric/src/main/resources/fabric.mod.json b/refinedstorage2-platform-fabric/src/main/resources/fabric.mod.json deleted file mode 100644 index 8605de5cc..000000000 --- a/refinedstorage2-platform-fabric/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage2", - "version": "${version}", - "name": "Refined Storage 2", - "description": "Refined Storage is a mass storage mod for Minecraft that offers the player a network-based storage system, allowing them to store items and fluids on a massively expandable device network.", - "authors": [ - "Refined Mods" - ], - "contact": { - "sources": "https://github.com/refinedmods/refinedstorage2", - "issues": "https://github.com/refinedmods/refinedstorage2/issues" - }, - "accessWidener": "refinedstorage2.accesswidener", - "icon": "assets/refinedstorage2/icon.png", - "license": "MIT", - "environment": "*", - "entrypoints": { - "main": [ - "com.refinedmods.refinedstorage2.platform.fabric.ModInitializerImpl" - ], - "client": [ - "com.refinedmods.refinedstorage2.platform.fabric.ClientModInitializerImpl" - ], - "modmenu": [ - "com.refinedmods.refinedstorage2.platform.fabric.modmenu.ModMenuApiImpl" - ] - }, - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://discordapp.com/invite/VYzsydb" - } - } - }, - "mixins": [ - "refinedstorage2.mixins.json" - ], - "depends": { - "fabricloader": ">=0.14.6", - "fabric-api": "*", - "minecraft": "1.21", - "java": ">=21", - "cloth-config2": "*", - "team_reborn_energy": "*" - }, - "suggests": { - "roughlyenoughitems": "*", - "modmenu": "*" - } -} diff --git a/refinedstorage2-platform-fabric/src/main/resources/refinedstorage2.mixins.json b/refinedstorage2-platform-fabric/src/main/resources/refinedstorage2.mixins.json deleted file mode 100644 index 01d3b5861..000000000 --- a/refinedstorage2-platform-fabric/src/main/resources/refinedstorage2.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "com.refinedmods.refinedstorage2.platform.fabric.mixin", - "compatibilityLevel": "JAVA_17", - "client": [ - "EditBoxAccessor", - "ItemPropertiesAccessor", - "KeyMappingAccessor", - "ModelBakeryAccessor", - "AbstractModelBakerImplMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/refinedstorage2-platform-forge/build.gradle b/refinedstorage2-platform-forge/build.gradle deleted file mode 100644 index 957d6e3f9..000000000 --- a/refinedstorage2-platform-forge/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -forgeProject("refinedstorage2", project(":refinedstorage2-platform-common"), apis, compileApis) - -archivesBaseName = 'refinedstorage2-platform-forge' - -enablePublishing() - -// This avoids a build failure when running the "test" task, because there is no JUnit engine -// in this subproject. -// The test source set in this subproject is used for Minecraft game tests, not for JUnit tests. -test.onlyIf { false } diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java deleted file mode 100644 index c19b1bc47..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ClientModInitializer.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.platform.api.support.HelpTooltipComponent; -import com.refinedmods.refinedstorage2.platform.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.AbstractClientModInitializer; -import com.refinedmods.refinedstorage2.platform.common.configurationcard.ConfigurationCardItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities; -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.ContentNames; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.content.KeyMappings; -import com.refinedmods.refinedstorage2.platform.common.controller.ControllerItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.networking.NetworkCardItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.security.SecurityCardItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntityRenderer; -import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.NetworkBoundItemItemPropertyFunction; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.CompositeClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.HelpClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.support.tooltip.ResourceClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.common.upgrade.RegulatorUpgradeItem; -import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinationClientTooltipComponent; -import com.refinedmods.refinedstorage2.platform.forge.storage.diskdrive.DiskDriveBlockEntityRendererImpl; -import com.refinedmods.refinedstorage2.platform.forge.storage.diskdrive.DiskDriveGeometryLoader; -import com.refinedmods.refinedstorage2.platform.forge.storage.diskinterface.DiskInterfaceBlockEntityRendererImpl; -import com.refinedmods.refinedstorage2.platform.forge.storage.diskinterface.DiskInterfaceGeometryLoader; -import com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid.PortableGridBlockEntityRendererImpl; -import com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid.PortableGridGeometryLoader; - -import java.util.List; - -import com.mojang.blaze3d.platform.InputConstants; -import net.minecraft.client.KeyMapping; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.MenuAccess; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; -import net.minecraft.client.renderer.item.ItemProperties; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.MenuType; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; -import net.neoforged.neoforge.client.event.InputEvent; -import net.neoforged.neoforge.client.event.ModelEvent; -import net.neoforged.neoforge.client.event.RegisterClientTooltipComponentFactoriesEvent; -import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent; -import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; -import net.neoforged.neoforge.client.settings.KeyConflictContext; -import net.neoforged.neoforge.client.settings.KeyModifier; -import net.neoforged.neoforge.common.NeoForge; -import org.lwjgl.glfw.GLFW; - -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DISK_DRIVE; -import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PORTABLE_GRID; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createIdentifier; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.createTranslationKey; - -public final class ClientModInitializer extends AbstractClientModInitializer { - private ClientModInitializer() { - } - - @SubscribeEvent - public static void onClientSetup(final FMLClientSetupEvent e) { - NeoForge.EVENT_BUS.addListener(ClientModInitializer::onKeyInput); - e.enqueueWork(ClientModInitializer::registerModelPredicates); - e.enqueueWork(ClientModInitializer::registerItemProperties); - registerBlockEntityRenderer(); - registerResourceRendering(); - registerAlternativeGridHints(); - registerDiskModels(); - } - - @SubscribeEvent - public static void onKeyInput(final InputEvent.Key e) { - handleInputEvents(); - } - - private static void registerModelPredicates() { - Items.INSTANCE.getControllers().forEach(controllerBlockItem -> ItemProperties.register( - controllerBlockItem.get(), - createIdentifier("stored_in_controller"), - new ControllerItemPropertyFunction() - )); - } - - @SubscribeEvent - public static void onRegisterModelGeometry(final ModelEvent.RegisterGeometryLoaders e) { - registerDiskModels(); - e.register(DISK_DRIVE, new DiskDriveGeometryLoader()); - e.register(PORTABLE_GRID, new PortableGridGeometryLoader()); - Blocks.INSTANCE.getDiskInterface().forEach( - (color, id, supplier) -> e.register(id, new DiskInterfaceGeometryLoader(color)) - ); - } - - @SubscribeEvent - public static void onRegisterMenuScreens(final RegisterMenuScreensEvent e) { - registerScreens(new ScreenRegistration() { - @Override - public > void register( - final MenuType type, - final ScreenConstructor factory - ) { - e.register(type, factory::create); - } - }); - } - - @SubscribeEvent - public static void onRegisterKeyMappings(final RegisterKeyMappingsEvent e) { - final KeyMapping focusSearchBarKeyBinding = new KeyMapping( - createTranslationKey("key", "focus_search_bar"), - InputConstants.Type.KEYSYM, - GLFW.GLFW_KEY_TAB, - ContentNames.MOD_TRANSLATION_KEY - ); - e.register(focusSearchBarKeyBinding); - KeyMappings.INSTANCE.setFocusSearchBar(focusSearchBarKeyBinding); - - final KeyMapping clearCraftingGridMatrixToNetwork = new KeyMapping( - createTranslationKey("key", "clear_crafting_grid_matrix_to_network"), - KeyConflictContext.GUI, - KeyModifier.CONTROL, - InputConstants.Type.KEYSYM, - GLFW.GLFW_KEY_X, - ContentNames.MOD_TRANSLATION_KEY - ); - e.register(clearCraftingGridMatrixToNetwork); - KeyMappings.INSTANCE.setClearCraftingGridMatrixToNetwork(clearCraftingGridMatrixToNetwork); - - final KeyMapping clearCraftingGridMatrixToInventory = new KeyMapping( - createTranslationKey("key", "clear_crafting_grid_matrix_to_inventory"), - InputConstants.UNKNOWN.getValue(), - ContentNames.MOD_TRANSLATION_KEY - ); - e.register(clearCraftingGridMatrixToInventory); - KeyMappings.INSTANCE.setClearCraftingGridMatrixToInventory(clearCraftingGridMatrixToInventory); - - final KeyMapping openWirelessGrid = new KeyMapping( - createTranslationKey("key", "open_wireless_grid"), - KeyConflictContext.IN_GAME, - InputConstants.UNKNOWN, - ContentNames.MOD_TRANSLATION_KEY - ); - e.register(openWirelessGrid); - KeyMappings.INSTANCE.setOpenWirelessGrid(openWirelessGrid); - } - - private static void registerBlockEntityRenderer() { - BlockEntityRenderers.register( - BlockEntities.INSTANCE.getDiskDrive(), - ctx -> new DiskDriveBlockEntityRendererImpl<>() - ); - BlockEntityRenderers.register( - BlockEntities.INSTANCE.getStorageMonitor(), - ctx -> new StorageMonitorBlockEntityRenderer() - ); - BlockEntityRenderers.register( - BlockEntities.INSTANCE.getPortableGrid(), - ctx -> new PortableGridBlockEntityRendererImpl<>() - ); - BlockEntityRenderers.register( - BlockEntities.INSTANCE.getCreativePortableGrid(), - ctx -> new PortableGridBlockEntityRendererImpl<>() - ); - BlockEntityRenderers.register( - BlockEntities.INSTANCE.getDiskInterface(), - ctx -> new DiskInterfaceBlockEntityRendererImpl<>() - ); - } - - @SubscribeEvent - public static void onRegisterTooltipFactories(final RegisterClientTooltipComponentFactoriesEvent e) { - e.register( - AbstractUpgradeItem.UpgradeDestinationTooltipComponent.class, - component -> new UpgradeDestinationClientTooltipComponent(component.destinations()) - ); - e.register( - HelpTooltipComponent.class, - component -> HelpClientTooltipComponent.create(component.text()) - ); - e.register( - RegulatorUpgradeItem.RegulatorTooltipComponent.class, - component -> { - final ClientTooltipComponent help = HelpClientTooltipComponent.create(component.helpText()); - return component.configuredResource() == null - ? help - : createRegulatorUpgradeClientTooltipComponent(component.configuredResource(), help); - } - ); - } - - private static CompositeClientTooltipComponent createRegulatorUpgradeClientTooltipComponent( - final ResourceAmount configuredResource, - final ClientTooltipComponent help - ) { - return new CompositeClientTooltipComponent(List.of( - new ResourceClientTooltipComponent(configuredResource), - help - )); - } - - private static void registerItemProperties() { - ItemProperties.register( - Items.INSTANCE.getWirelessGrid(), - NetworkBoundItemItemPropertyFunction.NAME, - new NetworkBoundItemItemPropertyFunction() - ); - ItemProperties.register( - Items.INSTANCE.getCreativeWirelessGrid(), - NetworkBoundItemItemPropertyFunction.NAME, - new NetworkBoundItemItemPropertyFunction() - ); - ItemProperties.register( - Items.INSTANCE.getConfigurationCard(), - ConfigurationCardItemPropertyFunction.NAME, - new ConfigurationCardItemPropertyFunction() - ); - ItemProperties.register( - Items.INSTANCE.getNetworkCard(), - NetworkCardItemPropertyFunction.NAME, - new NetworkCardItemPropertyFunction() - ); - ItemProperties.register( - Items.INSTANCE.getSecurityCard(), - SecurityCardItemPropertyFunction.NAME, - new SecurityCardItemPropertyFunction() - ); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java deleted file mode 100644 index d0d02ebba..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/ConfigImpl.java +++ /dev/null @@ -1,873 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge; - -import com.refinedmods.refinedstorage2.api.grid.view.GridSortingDirection; -import com.refinedmods.refinedstorage2.platform.common.Config; -import com.refinedmods.refinedstorage2.platform.common.content.DefaultEnergyUsage; -import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridMatrixCloseBehavior; -import com.refinedmods.refinedstorage2.platform.common.grid.GridSortingTypes; -import com.refinedmods.refinedstorage2.platform.common.support.stretching.ScreenSize; - -import java.util.Optional; - -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.common.ModConfigSpec; - -public class ConfigImpl implements Config { - private static final String ENERGY_USAGE = "energyUsage"; - private static final String ENERGY_CAPACITY = "energyCapacity"; - - private final ModConfigSpec.Builder builder = new ModConfigSpec.Builder(); - private final ModConfigSpec spec; - - private final ModConfigSpec.EnumValue screenSize; - private final ModConfigSpec.BooleanValue smoothScrolling; - private final ModConfigSpec.IntValue maxRowsStretch; - private final SimpleEnergyUsageEntry cable; - private final ControllerEntry controller; - private final DiskDriveEntry diskDrive; - private final DiskInterfaceEntry diskInterface; - private final GridEntry grid; - private final CraftingGridEntry craftingGrid; - private final StorageBlockEntry storageBlock; - private final FluidStorageBlockEntry fluidStorageBlock; - private final SimpleEnergyUsageEntry importer; - private final SimpleEnergyUsageEntry exporter; - private final UpgradeEntry upgrade; - private final SimpleEnergyUsageEntry iface; - private final SimpleEnergyUsageEntry externalStorage; - private final SimpleEnergyUsageEntry detector; - private final SimpleEnergyUsageEntry destructor; - private final SimpleEnergyUsageEntry constructor; - private final WirelessGridEntry wirelessGrid; - private final WirelessTransmitterEntry wirelessTransmitter; - private final SimpleEnergyUsageEntry storageMonitor; - private final SimpleEnergyUsageEntry networkReceiver; - private final SimpleEnergyUsageEntry networkTransmitter; - private final PortableGridEntry portableGrid; - private final SimpleEnergyUsageEntry securityCard; - private final SimpleEnergyUsageEntry fallbackSecurityCard; - private final SimpleEnergyUsageEntry securityManager; - private final RelayEntry relay; - - public ConfigImpl() { - screenSize = builder - .comment("The screen size") - .defineEnum("screenSize", ScreenSize.STRETCH); - smoothScrolling = builder - .comment("Whether scrollbars should use smooth scrolling") - .define("smoothScrolling", true); - maxRowsStretch = builder - .comment("The maximum amount of rows that can be displayed when the screen size is stretched") - .defineInRange("maxRowsStretch", 256, 3, 256); - cable = new SimpleEnergyUsageEntryImpl("cable", "Cable", DefaultEnergyUsage.CABLE); - controller = new ControllerEntryImpl(); - diskDrive = new DiskDriveEntryImpl(); - diskInterface = new DiskInterfaceEntryImpl(); - grid = new GridEntryImpl(); - craftingGrid = new CraftingGridEntryImpl(); - storageBlock = new StorageBlockEntryImpl(); - fluidStorageBlock = new FluidStorageBlockEntryImpl(); - importer = new SimpleEnergyUsageEntryImpl("importer", "Importer", DefaultEnergyUsage.IMPORTER); - exporter = new SimpleEnergyUsageEntryImpl("exporter", "Exporter", DefaultEnergyUsage.EXPORTER); - upgrade = new UpgradeEntryImpl(); - iface = new SimpleEnergyUsageEntryImpl("interface", "Interface", DefaultEnergyUsage.INTERFACE); - externalStorage = new SimpleEnergyUsageEntryImpl( - "externalStorage", - "External Storage", - DefaultEnergyUsage.EXTERNAL_STORAGE - ); - detector = new SimpleEnergyUsageEntryImpl("detector", "Detector", DefaultEnergyUsage.DETECTOR); - destructor = new SimpleEnergyUsageEntryImpl("destructor", "Destructor", DefaultEnergyUsage.DESTRUCTOR); - constructor = new SimpleEnergyUsageEntryImpl("constructor", "Constructor", DefaultEnergyUsage.CONSTRUCTOR); - wirelessGrid = new WirelessGridEntryImpl(); - wirelessTransmitter = new WirelessTransmitterEntryImpl(); - storageMonitor = new SimpleEnergyUsageEntryImpl( - "storageMonitor", - "Storage Monitor", - DefaultEnergyUsage.STORAGE_MONITOR - ); - networkReceiver = new SimpleEnergyUsageEntryImpl( - "networkReceiver", - "Network Receiver", - DefaultEnergyUsage.NETWORK_RECEIVER - ); - networkTransmitter = new SimpleEnergyUsageEntryImpl( - "networkTransmitter", - "Network Transmitter", - DefaultEnergyUsage.NETWORK_TRANSMITTER - ); - portableGrid = new PortableGridEntryImpl(); - securityCard = new SimpleEnergyUsageEntryImpl( - "securityCard", - "Security Card", - DefaultEnergyUsage.SECURITY_CARD - ); - fallbackSecurityCard = new SimpleEnergyUsageEntryImpl( - "fallbackSecurityCard", - "Fallback Security Card", - DefaultEnergyUsage.FALLBACK_SECURITY_CARD - ); - securityManager = new SimpleEnergyUsageEntryImpl( - "securityManager", - "Security Manager", - DefaultEnergyUsage.SECURITY_MANAGER - ); - relay = new RelayEntryImpl(); - spec = builder.build(); - } - - public ModConfigSpec getSpec() { - return spec; - } - - @Override - public ScreenSize getScreenSize() { - return screenSize.get(); - } - - @Override - public boolean isSmoothScrolling() { - return smoothScrolling.get(); - } - - @Override - public int getMaxRowsStretch() { - return maxRowsStretch.get(); - } - - @Override - public void setScreenSize(final ScreenSize screenSize) { - this.screenSize.set(screenSize); - } - - @Override - public GridEntry getGrid() { - return grid; - } - - @Override - public CraftingGridEntry getCraftingGrid() { - return craftingGrid; - } - - @Override - public ControllerEntry getController() { - return controller; - } - - @Override - public DiskDriveEntry getDiskDrive() { - return diskDrive; - } - - @Override - public DiskInterfaceEntry getDiskInterface() { - return diskInterface; - } - - @Override - public SimpleEnergyUsageEntry getCable() { - return cable; - } - - @Override - public StorageBlockEntry getStorageBlock() { - return storageBlock; - } - - @Override - public FluidStorageBlockEntry getFluidStorageBlock() { - return fluidStorageBlock; - } - - @Override - public SimpleEnergyUsageEntry getImporter() { - return importer; - } - - @Override - public SimpleEnergyUsageEntry getExporter() { - return exporter; - } - - @Override - public UpgradeEntry getUpgrade() { - return upgrade; - } - - @Override - public SimpleEnergyUsageEntry getInterface() { - return iface; - } - - @Override - public SimpleEnergyUsageEntry getExternalStorage() { - return externalStorage; - } - - @Override - public SimpleEnergyUsageEntry getDetector() { - return detector; - } - - @Override - public SimpleEnergyUsageEntry getDestructor() { - return destructor; - } - - @Override - public SimpleEnergyUsageEntry getConstructor() { - return constructor; - } - - @Override - public WirelessGridEntry getWirelessGrid() { - return wirelessGrid; - } - - @Override - public WirelessTransmitterEntry getWirelessTransmitter() { - return wirelessTransmitter; - } - - @Override - public SimpleEnergyUsageEntry getStorageMonitor() { - return storageMonitor; - } - - @Override - public SimpleEnergyUsageEntry getNetworkReceiver() { - return networkReceiver; - } - - @Override - public SimpleEnergyUsageEntry getNetworkTransmitter() { - return networkTransmitter; - } - - @Override - public PortableGridEntry getPortableGrid() { - return portableGrid; - } - - @Override - public SimpleEnergyUsageEntry getSecurityCard() { - return securityCard; - } - - @Override - public SimpleEnergyUsageEntry getFallbackSecurityCard() { - return fallbackSecurityCard; - } - - @Override - public SimpleEnergyUsageEntry getSecurityManager() { - return securityManager; - } - - @Override - public RelayEntry getRelay() { - return relay; - } - - private class SimpleEnergyUsageEntryImpl implements SimpleEnergyUsageEntry { - private final ModConfigSpec.LongValue energyUsage; - - SimpleEnergyUsageEntryImpl(final String path, final String readableName, final long defaultValue) { - builder.push(path); - energyUsage = builder - .comment("The energy used by the " + readableName) - .defineInRange(ENERGY_USAGE, defaultValue, 0, Long.MAX_VALUE); - builder.pop(); - } - - @Override - public long getEnergyUsage() { - return energyUsage.get(); - } - } - - private class ControllerEntryImpl implements ControllerEntry { - private final ModConfigSpec.LongValue energyCapacity; - - private ControllerEntryImpl() { - builder.push("controller"); - energyCapacity = builder.comment("The energy capacity of the Controller") - .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.CONTROLLER_CAPACITY, 0, Long.MAX_VALUE); - builder.pop(); - } - - @Override - public long getEnergyCapacity() { - return energyCapacity.get(); - } - } - - private class DiskDriveEntryImpl implements DiskDriveEntry { - private final ModConfigSpec.LongValue energyUsage; - private final ModConfigSpec.LongValue energyUsagePerDisk; - - private DiskDriveEntryImpl() { - builder.push("diskDrive"); - energyUsage = builder.comment("The energy used by the Disk Drive") - .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.DISK_DRIVE, 0, Long.MAX_VALUE); - energyUsagePerDisk = builder.comment("The energy used per disk") - .defineInRange("energyUsagePerDisk", DefaultEnergyUsage.DISK_DRIVE_PER_DISK, 0, Long.MAX_VALUE); - builder.pop(); - } - - @Override - public long getEnergyUsage() { - return energyUsage.get(); - } - - @Override - public long getEnergyUsagePerDisk() { - return energyUsagePerDisk.get(); - } - } - - private class DiskInterfaceEntryImpl implements DiskInterfaceEntry { - private final ModConfigSpec.LongValue energyUsage; - private final ModConfigSpec.LongValue energyUsagePerDisk; - - private DiskInterfaceEntryImpl() { - builder.push("diskInterface"); - energyUsage = builder.comment("The energy used by the Disk Interface") - .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.DISK_INTERFACE, 0, Long.MAX_VALUE); - energyUsagePerDisk = builder.comment("The energy used per disk") - .defineInRange("energyUsagePerDisk", DefaultEnergyUsage.DISK_INTERFACE_PER_DISK, 0, Long.MAX_VALUE); - builder.pop(); - } - - @Override - public long getEnergyUsage() { - return energyUsage.get(); - } - - @Override - public long getEnergyUsagePerDisk() { - return energyUsagePerDisk.get(); - } - } - - private class GridEntryImpl implements GridEntry { - private final ModConfigSpec.BooleanValue largeFont; - private final ModConfigSpec.BooleanValue preventSortingWhileShiftIsDown; - private final ModConfigSpec.BooleanValue detailedTooltip; - private final ModConfigSpec.BooleanValue rememberSearchQuery; - private final ModConfigSpec.LongValue energyUsage; - private final ModConfigSpec.BooleanValue autoSelected; - private final ModConfigSpec.ConfigValue synchronizer; - private final ModConfigSpec.ConfigValue resourceType; - private final ModConfigSpec.EnumValue sortingDirection; - private final ModConfigSpec.EnumValue sortingType; - - GridEntryImpl() { - builder.push("grid"); - largeFont = builder - .comment("Whether the Grid should use a large font for quantities") - .define("largeFont", false); - preventSortingWhileShiftIsDown = builder - .comment("Whether the Grid should avoid sorting when shift is held down") - .define("preventSortingWhileShiftIsDown", true); - detailedTooltip = builder - .comment("Whether the Grid should show a detailed tooltip") - .define("detailedTooltip", true); - rememberSearchQuery = builder - .comment("Whether the search query should persist when closing and re-opening the Grid") - .define("rememberSearchQuery", false); - energyUsage = builder - .comment("The energy used by the Grid") - .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.GRID, 0, Long.MAX_VALUE); - autoSelected = builder - .comment("Whether the Grid search box is auto selected") - .define("autoSelected", false); - synchronizer = builder - .comment("The synchronization type of the Grid search box") - .define("synchronizer", ""); - resourceType = builder - .comment("The resource type to be shown") - .define("resourceType", ""); - sortingDirection = builder - .comment("The sorting direction") - .defineEnum("sortingDirection", GridSortingDirection.ASCENDING); - sortingType = builder - .comment("The sorting type") - .defineEnum("sortingType", GridSortingTypes.QUANTITY); - builder.pop(); - } - - @Override - public boolean isLargeFont() { - return largeFont.get(); - } - - @Override - public boolean isPreventSortingWhileShiftIsDown() { - return preventSortingWhileShiftIsDown.get(); - } - - @Override - public boolean isDetailedTooltip() { - return detailedTooltip.get(); - } - - @Override - public boolean isRememberSearchQuery() { - return rememberSearchQuery.get(); - } - - @Override - public long getEnergyUsage() { - return energyUsage.get(); - } - - @Override - public boolean isAutoSelected() { - return autoSelected.get(); - } - - @Override - public void setAutoSelected(final boolean autoSelected) { - this.autoSelected.set(autoSelected); - } - - @Override - public Optional getSynchronizer() { - if (synchronizer == null || synchronizer.get().trim().isBlank()) { - return Optional.empty(); - } - return Optional.of(synchronizer.get()).map(ResourceLocation::tryParse); - } - - @Override - public void setSynchronizer(final ResourceLocation synchronizerId) { - this.synchronizer.set(synchronizerId.toString()); - } - - @Override - public void clearSynchronizer() { - this.synchronizer.set(""); - } - - @Override - public GridSortingDirection getSortingDirection() { - return sortingDirection.get(); - } - - @Override - public void setSortingDirection(final GridSortingDirection sortingDirection) { - this.sortingDirection.set(sortingDirection); - } - - @Override - public GridSortingTypes getSortingType() { - return sortingType.get(); - } - - @Override - public void setSortingType(final GridSortingTypes sortingType) { - this.sortingType.set(sortingType); - } - - @Override - public Optional getResourceTypeId() { - if (resourceType == null || resourceType.get().trim().isBlank()) { - return Optional.empty(); - } - return Optional.of(resourceType.get()).map(ResourceLocation::tryParse); - } - - @Override - public void setResourceTypeId(final ResourceLocation resourceTypeId) { - this.resourceType.set(resourceTypeId.toString()); - } - - @Override - public void clearResourceType() { - this.resourceType.set(""); - } - } - - private class CraftingGridEntryImpl implements CraftingGridEntry { - private final ModConfigSpec.LongValue energyUsage; - private final ModConfigSpec.EnumValue craftingMatrixCloseBehavior; - - CraftingGridEntryImpl() { - builder.push("craftingGrid"); - energyUsage = builder - .comment("The energy used by the Crafting Grid") - .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.CRAFTING_GRID, 0, Long.MAX_VALUE); - craftingMatrixCloseBehavior = builder - .comment("What should happen to the crafting matrix slots when closing the Crafting Grid") - .defineEnum("craftingMatrixCloseBehavior", CraftingGridMatrixCloseBehavior.NONE); - builder.pop(); - } - - @Override - public long getEnergyUsage() { - return energyUsage.get(); - } - - @Override - public CraftingGridMatrixCloseBehavior getCraftingMatrixCloseBehavior() { - return craftingMatrixCloseBehavior.get(); - } - } - - private class StorageBlockEntryImpl implements StorageBlockEntry { - private final ModConfigSpec.LongValue oneKEnergyUsage; - private final ModConfigSpec.LongValue fourKEnergyUsage; - private final ModConfigSpec.LongValue sixteenKEnergyUsage; - private final ModConfigSpec.LongValue sixtyFourKEnergyUsage; - private final ModConfigSpec.LongValue creativeUsage; - - StorageBlockEntryImpl() { - builder.push("storageBlock"); - oneKEnergyUsage = builder - .comment("The energy used by the 1K Storage Block") - .defineInRange("1kEnergyUsage", DefaultEnergyUsage.ONE_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); - fourKEnergyUsage = builder - .comment("The energy used by the 4K Storage Block") - .defineInRange("4kEnergyUsage", DefaultEnergyUsage.FOUR_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); - sixteenKEnergyUsage = builder - .comment("The energy used by the 16K Storage Block") - .defineInRange("16kEnergyUsage", DefaultEnergyUsage.SIXTEEN_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); - sixtyFourKEnergyUsage = builder - .comment("The energy used by the 64K Storage Block") - .defineInRange("64kEnergyUsage", DefaultEnergyUsage.SIXTY_FOUR_K_STORAGE_BLOCK, 0, Long.MAX_VALUE); - creativeUsage = builder - .comment("The energy used by the Creative Storage Block") - .defineInRange("creativeEnergyUsage", DefaultEnergyUsage.CREATIVE_STORAGE_BLOCK, 0, Long.MAX_VALUE); - builder.pop(); - } - - @Override - public long get1kEnergyUsage() { - return oneKEnergyUsage.get(); - } - - @Override - public long get4kEnergyUsage() { - return fourKEnergyUsage.get(); - } - - @Override - public long get16kEnergyUsage() { - return sixteenKEnergyUsage.get(); - } - - @Override - public long get64kEnergyUsage() { - return sixtyFourKEnergyUsage.get(); - } - - @Override - public long getCreativeEnergyUsage() { - return creativeUsage.get(); - } - } - - private class FluidStorageBlockEntryImpl implements FluidStorageBlockEntry { - private final ModConfigSpec.LongValue sixtyFourBEnergyUsage; - private final ModConfigSpec.LongValue twoHundredFiftySixBEnergyUsage; - private final ModConfigSpec.LongValue thousandTwentyFourBEnergyUsage; - private final ModConfigSpec.LongValue fourThousandNinetySixBEnergyUsage; - private final ModConfigSpec.LongValue creativeUsage; - - FluidStorageBlockEntryImpl() { - builder.push("fluidStorageBlock"); - sixtyFourBEnergyUsage = builder - .comment("The energy used by the 64B Fluid Storage Block") - .defineInRange( - "64bEnergyUsage", - DefaultEnergyUsage.SIXTY_FOUR_B_FLUID_STORAGE_BLOCK, - 0, - Long.MAX_VALUE - ); - twoHundredFiftySixBEnergyUsage = builder - .comment("The energy used by the 256B Fluid Storage Block") - .defineInRange( - "256bEnergyUsage", - DefaultEnergyUsage.TWO_HUNDRED_FIFTY_SIX_B_FLUID_STORAGE_BLOCK, - 0, - Long.MAX_VALUE - ); - thousandTwentyFourBEnergyUsage = builder - .comment("The energy used by the 1024B Fluid Storage Block") - .defineInRange( - "1024bEnergyUsage", - DefaultEnergyUsage.THOUSAND_TWENTY_FOUR_B_FLUID_STORAGE_BLOCK, - 0, - Long.MAX_VALUE - ); - fourThousandNinetySixBEnergyUsage = builder - .comment("The energy used by the 4096B Fluid Storage Block") - .defineInRange( - "4096bEnergyUsage", - DefaultEnergyUsage.FOUR_THOUSAND_NINETY_SIX_B_FLUID_STORAGE_BLOCK, - 0, - Long.MAX_VALUE - ); - creativeUsage = builder - .comment("The energy used by the Creative Fluid Storage Block") - .defineInRange( - "creativeEnergyUsage", - DefaultEnergyUsage.CREATIVE_FLUID_STORAGE_BLOCK, - 0, - Long.MAX_VALUE - ); - builder.pop(); - } - - @Override - public long get64bEnergyUsage() { - return sixtyFourBEnergyUsage.get(); - } - - @Override - public long get256bEnergyUsage() { - return twoHundredFiftySixBEnergyUsage.get(); - } - - @Override - public long get1024bEnergyUsage() { - return thousandTwentyFourBEnergyUsage.get(); - } - - @Override - public long get4096bEnergyUsage() { - return fourThousandNinetySixBEnergyUsage.get(); - } - - @Override - public long getCreativeEnergyUsage() { - return creativeUsage.get(); - } - } - - private class UpgradeEntryImpl implements UpgradeEntry { - private final ModConfigSpec.LongValue speedUpgradeEnergyUsage; - private final ModConfigSpec.LongValue stackUpgradeEnergyUsage; - private final ModConfigSpec.LongValue fortune1UpgradeEnergyUsage; - private final ModConfigSpec.LongValue fortune2UpgradeEnergyUsage; - private final ModConfigSpec.LongValue fortune3UpgradeEnergyUsage; - private final ModConfigSpec.LongValue silkTouchUpgradeEnergyUsage; - private final ModConfigSpec.LongValue regulatorUpgradeEnergyUsage; - private final ModConfigSpec.LongValue rangeUpgradeEnergyUsage; - private final ModConfigSpec.LongValue creativeRangeUpgradeEnergyUsage; - private final ModConfigSpec.IntValue rangeUpgradeRange; - - UpgradeEntryImpl() { - builder.push("upgrade"); - speedUpgradeEnergyUsage = builder - .comment("The additional energy used per Speed Upgrade") - .defineInRange("speedUpgradeEnergyUsage", DefaultEnergyUsage.SPEED_UPGRADE, 0, Long.MAX_VALUE); - stackUpgradeEnergyUsage = builder - .comment("The additional energy used by the Stack Upgrade") - .defineInRange("stackUpgradeEnergyUsage", DefaultEnergyUsage.STACK_UPGRADE, 0, Long.MAX_VALUE); - fortune1UpgradeEnergyUsage = builder - .comment("The additional energy used by the Fortune 1 Upgrade") - .defineInRange("fortune1UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_1_UPGRADE, 0, Long.MAX_VALUE); - fortune2UpgradeEnergyUsage = builder - .comment("The additional energy used by the Fortune 2 Upgrade") - .defineInRange("fortune2UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_2_UPGRADE, 0, Long.MAX_VALUE); - fortune3UpgradeEnergyUsage = builder - .comment("The additional energy used by the Fortune 3 Upgrade") - .defineInRange("fortune3UpgradeEnergyUsage", DefaultEnergyUsage.FORTUNE_3_UPGRADE, 0, Long.MAX_VALUE); - silkTouchUpgradeEnergyUsage = builder - .comment("The additional energy used by the Silk Touch Upgrade") - .defineInRange("silkTouchUpgradeEnergyUsage", DefaultEnergyUsage.SILK_TOUCH_UPGRADE, 0, Long.MAX_VALUE); - regulatorUpgradeEnergyUsage = builder - .comment("The additional energy used by the Regulator Upgrade") - .defineInRange("regulatorUpgradeEnergyUsage", DefaultEnergyUsage.REGULATOR_UPGRADE, 0, Long.MAX_VALUE); - rangeUpgradeEnergyUsage = builder - .comment("The additional energy used by the Range Upgrade") - .defineInRange("rangeUpgradeEnergyUsage", DefaultEnergyUsage.RANGE_UPGRADE, 0, Long.MAX_VALUE); - creativeRangeUpgradeEnergyUsage = builder - .comment("The additional energy used by the Creative Range Upgrade") - .defineInRange( - "creativeRangeUpgradeEnergyUsage", - DefaultEnergyUsage.CREATIVE_RANGE_UPGRADE, - 0, - Long.MAX_VALUE - ); - rangeUpgradeRange = builder - .comment("The additional range by the Range Upgrade") - .defineInRange("rangeUpgradeRange", DefaultEnergyUsage.RANGE_UPGRADE_RANGE, 0, Integer.MAX_VALUE); - builder.pop(); - } - - @Override - public long getSpeedUpgradeEnergyUsage() { - return speedUpgradeEnergyUsage.get(); - } - - @Override - public long getStackUpgradeEnergyUsage() { - return stackUpgradeEnergyUsage.get(); - } - - @Override - public long getFortune1UpgradeEnergyUsage() { - return fortune1UpgradeEnergyUsage.get(); - } - - @Override - public long getFortune2UpgradeEnergyUsage() { - return fortune2UpgradeEnergyUsage.get(); - } - - @Override - public long getFortune3UpgradeEnergyUsage() { - return fortune3UpgradeEnergyUsage.get(); - } - - @Override - public long getSilkTouchUpgradeEnergyUsage() { - return silkTouchUpgradeEnergyUsage.get(); - } - - @Override - public long getRegulatorUpgradeEnergyUsage() { - return regulatorUpgradeEnergyUsage.get(); - } - - @Override - public long getRangeUpgradeEnergyUsage() { - return rangeUpgradeEnergyUsage.get(); - } - - @Override - public long getCreativeRangeUpgradeEnergyUsage() { - return creativeRangeUpgradeEnergyUsage.get(); - } - - @Override - public int getRangeUpgradeRange() { - return rangeUpgradeRange.get(); - } - } - - private class WirelessGridEntryImpl implements WirelessGridEntry { - private final ModConfigSpec.LongValue energyCapacity; - private final ModConfigSpec.LongValue openEnergyUsage; - private final ModConfigSpec.LongValue extractEnergyUsage; - private final ModConfigSpec.LongValue insertEnergyUsage; - - WirelessGridEntryImpl() { - builder.push("wirelessGrid"); - energyCapacity = builder.comment("The energy capacity of the Wireless Grid") - .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.WIRELESS_GRID_CAPACITY, 0, Long.MAX_VALUE); - openEnergyUsage = builder.comment("The energy used by the Wireless Grid to open") - .defineInRange("openEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_OPEN, 0, Long.MAX_VALUE); - extractEnergyUsage = builder.comment("The energy used by the Wireless Grid to extract resources") - .defineInRange("extractEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_EXTRACT, 0, Long.MAX_VALUE); - insertEnergyUsage = builder.comment("The energy used by the Wireless Grid to insert resources") - .defineInRange("insertEnergyUsage", DefaultEnergyUsage.WIRELESS_GRID_INSERT, 0, Long.MAX_VALUE); - builder.pop(); - } - - public long getEnergyCapacity() { - return energyCapacity.get(); - } - - public long getOpenEnergyUsage() { - return openEnergyUsage.get(); - } - - public long getExtractEnergyUsage() { - return extractEnergyUsage.get(); - } - - public long getInsertEnergyUsage() { - return insertEnergyUsage.get(); - } - } - - private class WirelessTransmitterEntryImpl implements WirelessTransmitterEntry { - private final ModConfigSpec.LongValue energyUsage; - private final ModConfigSpec.IntValue baseRange; - - WirelessTransmitterEntryImpl() { - builder.push("wirelessTransmitter"); - - energyUsage = builder.comment("The energy used by the Wireless Transmitter") - .defineInRange(ENERGY_USAGE, DefaultEnergyUsage.WIRELESS_TRANSMITTER, 0, Long.MAX_VALUE); - baseRange = builder.comment("The base range of the Wireless Transmitter") - .defineInRange("baseRange", DefaultEnergyUsage.WIRELESS_TRANSMITTER_BASE_RANGE, 0, Integer.MAX_VALUE); - - builder.pop(); - } - - public long getEnergyUsage() { - return energyUsage.get(); - } - - public int getBaseRange() { - return baseRange.get(); - } - } - - private class PortableGridEntryImpl implements PortableGridEntry { - private final ModConfigSpec.LongValue energyCapacity; - private final ModConfigSpec.LongValue openEnergyUsage; - private final ModConfigSpec.LongValue extractEnergyUsage; - private final ModConfigSpec.LongValue insertEnergyUsage; - - PortableGridEntryImpl() { - builder.push("portableGrid"); - energyCapacity = builder.comment("The energy capacity of the Portable Grid") - .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.PORTABLE_GRID_CAPACITY, 0, Long.MAX_VALUE); - openEnergyUsage = builder.comment("The energy used by the Portable Grid to open") - .defineInRange("openEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_OPEN, 0, Long.MAX_VALUE); - extractEnergyUsage = builder.comment("The energy used by the Portable Grid to extract resources") - .defineInRange("extractEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_EXTRACT, 0, Long.MAX_VALUE); - insertEnergyUsage = builder.comment("The energy used by the Portable Grid to insert resources") - .defineInRange("insertEnergyUsage", DefaultEnergyUsage.PORTABLE_GRID_INSERT, 0, Long.MAX_VALUE); - builder.pop(); - } - - public long getEnergyCapacity() { - return energyCapacity.get(); - } - - public long getOpenEnergyUsage() { - return openEnergyUsage.get(); - } - - public long getExtractEnergyUsage() { - return extractEnergyUsage.get(); - } - - public long getInsertEnergyUsage() { - return insertEnergyUsage.get(); - } - } - - private class RelayEntryImpl implements RelayEntry { - private final ModConfigSpec.LongValue inputNetworkEnergyUsage; - private final ModConfigSpec.LongValue outputNetworkEnergyUsage; - - RelayEntryImpl() { - builder.push("relay"); - inputNetworkEnergyUsage = builder.comment("The energy used by the Relay in the input network") - .defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.RELAY_INPUT_NETWORK, 8, Long.MAX_VALUE); - outputNetworkEnergyUsage = builder.comment( - "The energy used by the Relay in the output network (if not in pass through mode)" - ).defineInRange(ENERGY_CAPACITY, DefaultEnergyUsage.RELAY_OUTPUT_NETWORK, 8, Long.MAX_VALUE); - builder.pop(); - } - - @Override - public long getInputNetworkEnergyUsage() { - return inputNetworkEnergyUsage.get(); - } - - @Override - public long getOutputNetworkEnergyUsage() { - return outputNetworkEnergyUsage.get(); - } - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/PlatformImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/PlatformImpl.java deleted file mode 100644 index e994685ab..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/PlatformImpl.java +++ /dev/null @@ -1,325 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.view.GridResourceFactory; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; -import com.refinedmods.refinedstorage2.platform.common.AbstractPlatform; -import com.refinedmods.refinedstorage2.platform.common.Config; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferManager; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.util.CustomBlockPlaceContext; -import com.refinedmods.refinedstorage2.platform.forge.grid.strategy.ItemGridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.forge.grid.view.ForgeFluidGridResourceFactory; -import com.refinedmods.refinedstorage2.platform.forge.grid.view.ForgeItemGridResourceFactory; -import com.refinedmods.refinedstorage2.platform.forge.support.containermenu.ContainerTransferDestination; -import com.refinedmods.refinedstorage2.platform.forge.support.containermenu.MenuOpenerImpl; -import com.refinedmods.refinedstorage2.platform.forge.support.energy.EnergyStorageAdapter; -import com.refinedmods.refinedstorage2.platform.forge.support.render.FluidStackFluidRenderer; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.UUID; -import javax.annotation.Nullable; - -import com.mojang.blaze3d.platform.InputConstants; -import net.minecraft.client.KeyMapping; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.NonNullList; -import net.minecraft.network.chat.Component; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.Container; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.CraftingContainer; -import net.minecraft.world.inventory.tooltip.TooltipComponent; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.item.crafting.CraftingInput; -import net.minecraft.world.item.crafting.CraftingRecipe; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.Vec3; -import net.neoforged.fml.ModContainer; -import net.neoforged.fml.config.ModConfig; -import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.client.ClientHooks; -import net.neoforged.neoforge.common.CommonHooks; -import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.common.util.FakePlayerFactory; -import net.neoforged.neoforge.event.EventHooks; -import net.neoforged.neoforge.event.level.BlockEvent; -import net.neoforged.neoforge.fluids.FluidActionResult; -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.FluidType; -import net.neoforged.neoforge.fluids.FluidUtil; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import net.neoforged.neoforge.fluids.capability.templates.FluidTank; -import net.neoforged.neoforge.items.ItemHandlerHelper; -import net.neoforged.neoforge.items.wrapper.InvWrapper; -import net.neoforged.neoforge.network.PacketDistributor; - -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.ofFluidStack; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidStack; - -public final class PlatformImpl extends AbstractPlatform { - private final ConfigImpl config = new ConfigImpl(); - - public PlatformImpl(final ModContainer modContainer) { - super(new MenuOpenerImpl(), new FluidStackFluidRenderer(), ItemGridInsertionStrategy::new); - modContainer.registerConfig(ModConfig.Type.COMMON, config.getSpec()); - } - - @Override - public long getBucketAmount() { - return FluidType.BUCKET_VOLUME; - } - - @Override - public Config getConfig() { - return config; - } - - @Override - public boolean canEditBoxLoseFocus(final EditBox editBox) { - return editBox.canLoseFocus; - } - - @Override - public boolean isKeyDown(final KeyMapping keyMapping) { - return !keyMapping.isUnbound() && InputConstants.isKeyDown( - Minecraft.getInstance().getWindow().getWindow(), - keyMapping.getKey().getValue() - ); - } - - @Override - public GridResourceFactory getItemGridResourceFactory() { - return new ForgeItemGridResourceFactory(); - } - - @Override - public GridResourceFactory getFluidGridResourceFactory() { - return new ForgeFluidGridResourceFactory(); - } - - @Override - public Optional getContainedFluid(final ItemStack stack) { - final FluidTank tank = new FluidTank(Integer.MAX_VALUE); - final FluidActionResult result = FluidUtil.tryEmptyContainer( - stack, - tank, - Integer.MAX_VALUE, - null, - true - ); - if (!result.isSuccess() || tank.isEmpty()) { - return Optional.empty(); - } - final FluidResource fluidResource = ofFluidStack(tank.getFluid()); - return Optional.of(new ContainedFluid( - result.getResult(), - fluidResource, - tank.getFluidAmount() - )); - } - - @Override - public Optional convertToBucket(final FluidResource fluidResource) { - return Optional.ofNullable( - new ItemStack(Items.BUCKET).getCapability(Capabilities.FluidHandler.ITEM) - ).map(dest -> { - dest.fill( - toFluidStack(fluidResource, FluidType.BUCKET_VOLUME), - IFluidHandler.FluidAction.EXECUTE - ); - return dest.getContainer(); - }); - } - - @Override - public TransferManager createTransferManager(final AbstractContainerMenu containerMenu) { - return new TransferManager(containerMenu, ContainerTransferDestination::new); - } - - @Override - public long insertIntoContainer(final Container container, - final ItemResource itemResource, - final long amount, - final Action action) { - final InvWrapper wrapper = new InvWrapper(container); - final ItemStack stack = itemResource.toItemStack(amount); - final ItemStack remainder = ItemHandlerHelper.insertItem(wrapper, stack, action == Action.SIMULATE); - return amount - remainder.getCount(); - } - - @Override - public ItemStack getCloneItemStack(final BlockState state, - final Level level, - final BlockHitResult hitResult, - final Player player) { - return state.getCloneItemStack(hitResult, level, hitResult.getBlockPos(), player); - } - - @Override - @SuppressWarnings("DataFlowIssue") // NeoForge allows null - public NonNullList getRemainingCraftingItems(final Player player, - final CraftingRecipe craftingRecipe, - final CraftingInput input) { - CommonHooks.setCraftingPlayer(player); - final NonNullList remainingItems = craftingRecipe.getRemainingItems(input); - CommonHooks.setCraftingPlayer(null); - return remainingItems; - } - - @Override - public void onItemCrafted(final Player player, final ItemStack craftedStack, final CraftingContainer container) { - EventHooks.firePlayerCraftingEvent(player, craftedStack, container); - } - - @Override - public Player getFakePlayer(final ServerLevel level, @Nullable final UUID playerId) { - return Optional.ofNullable(playerId) - .flatMap(id -> level.getServer().getProfileCache().get(id)) - .map(profile -> FakePlayerFactory.get(level, profile)) - .orElseGet(() -> FakePlayerFactory.getMinecraft(level)); - } - - @Override - public boolean canBreakBlock(final Level level, final BlockPos pos, final BlockState state, final Player player) { - final BlockEvent.BreakEvent e = new BlockEvent.BreakEvent(level, pos, state, player); - return !NeoForge.EVENT_BUS.post(e).isCanceled(); - } - - @Override - public boolean placeBlock( - final Level level, - final BlockPos pos, - final Direction direction, - final Player player, - final ItemStack stack - ) { - final BlockPlaceContext ctx = new CustomBlockPlaceContext( - level, - player, - InteractionHand.MAIN_HAND, - stack, - new BlockHitResult(Vec3.ZERO, direction, pos, false) - ); - final InteractionResult result = CommonHooks.onPlaceItemIntoWorld(ctx); - return result.consumesAction(); - } - - @Override - public boolean placeFluid( - final Level level, - final BlockPos pos, - final Direction direction, - final Player player, - final FluidResource fluidResource - ) { - if (level.getBlockState(pos).getFluidState().isSource()) { - return false; - } - final FluidStack stack = toFluidStack(fluidResource, FluidType.BUCKET_VOLUME); - final FluidTank tank = new FluidTank(FluidType.BUCKET_VOLUME); - tank.fill(stack, IFluidHandler.FluidAction.EXECUTE); - return FluidUtil.tryPlaceFluid( - player, - level, - InteractionHand.MAIN_HAND, - pos, - tank, - toFluidStack(fluidResource, FluidType.BUCKET_VOLUME) - ); - } - - @Override - public ItemStack getBlockAsItemStack(final Block block, - final BlockState state, - final Direction direction, - final LevelReader level, - final BlockPos position, - final Player player) { - return block.getCloneItemStack( - state, - new BlockHitResult(Vec3.ZERO, direction, position, false), - level, - position, - player - ); - } - - @Override - public Optional getBucketPickupSound(final LiquidBlock liquidBlock, final BlockState state) { - return liquidBlock.getPickupSound(state); - } - - @Override - public List processTooltipComponents( - final ItemStack stack, - final GuiGraphics graphics, - final int mouseX, - final Optional imageComponent, - final List components - ) { - return new ArrayList<>(ClientHooks.gatherTooltipComponents( - stack, - components, - imageComponent, - mouseX, - graphics.guiWidth(), - graphics.guiHeight(), - Minecraft.getInstance().font - )); // make modifiable - } - - @Override - public void renderTooltip(final GuiGraphics graphics, - final List components, - final int x, - final int y) { - graphics.renderTooltipInternal( - Minecraft.getInstance().font, - components, - x, - y, - DefaultTooltipPositioner.INSTANCE - ); - } - - @Override - public Optional getEnergyStorage(final ItemStack stack) { - return Optional.ofNullable(stack.getCapability(Capabilities.EnergyStorage.ITEM)) - .filter(EnergyStorageAdapter.class::isInstance) - .map(EnergyStorageAdapter.class::cast) - .map(EnergyStorageAdapter::getEnergyStorage); - } - - @Override - public void sendPacketToServer(final T packet) { - PacketDistributor.sendToServer(packet); - } - - @Override - public void sendPacketToClient(final ServerPlayer player, final T packet) { - PacketDistributor.sendToPlayer(player, packet); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/package-info.java deleted file mode 100644 index bb0f9e640..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/loot/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.datagen.loot; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/package-info.java deleted file mode 100644 index 7e0433405..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.datagen; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/package-info.java deleted file mode 100644 index 0847f8977..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/recipe/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.datagen.recipe; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/ItemTagsProviderImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/ItemTagsProviderImpl.java deleted file mode 100644 index 254ce5918..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/ItemTagsProviderImpl.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.datagen.tag; - -import com.refinedmods.refinedstorage2.platform.common.content.Blocks; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType; -import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType; -import com.refinedmods.refinedstorage2.platform.common.support.BaseBlockItem; - -import java.util.Arrays; -import java.util.Collection; -import java.util.concurrent.CompletableFuture; -import java.util.function.Supplier; - -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.tags.TagKey; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.neoforged.neoforge.common.data.ExistingFileHelper; - -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.CABLES; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.CONSTRUCTORS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.CONTROLLERS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.CRAFTING_GRIDS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.CREATIVE_CONTROLLERS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.DESTRUCTORS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.DETECTORS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.DISK_INTERFACES; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.EXPORTERS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.EXTERNAL_STORAGES; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.FLUID_STORAGE_DISKS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.GRIDS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.IMPORTERS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.NETWORK_RECEIVERS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.NETWORK_TRANSMITTERS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.RELAYS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.SECURITY_MANAGERS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.STORAGE_DISKS; -import static com.refinedmods.refinedstorage2.platform.common.content.Tags.WIRELESS_TRANSMITTERS; -import static com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil.MOD_ID; - -public class ItemTagsProviderImpl extends ItemTagsProvider { - public ItemTagsProviderImpl(final PackOutput packOutput, - final CompletableFuture registries, - final TagsProvider blockTagsProvider, - final ExistingFileHelper existingFileHelper) { - super(packOutput, registries, blockTagsProvider.contentsGetter(), MOD_ID, existingFileHelper); - } - - @Override - protected void addTags(final HolderLookup.Provider provider) { - addAllToTag2(CABLES, Items.INSTANCE.getCables()); - addAllToTag(CONTROLLERS, Items.INSTANCE.getControllers()); - addAllToTag(CREATIVE_CONTROLLERS, Blocks.INSTANCE.getCreativeController().values().stream() - .map(Block::asItem) - .map(c -> (Supplier) () -> c) - .toList()); - addAllToTag(FLUID_STORAGE_DISKS, - Arrays.stream(FluidStorageType.Variant.values()) - .filter(variant -> variant != FluidStorageType.Variant.CREATIVE) - .map(Items.INSTANCE::getFluidStorageDisk) - .map(t -> (Supplier) () -> t) - .toList()); - addAllToTag(GRIDS, - Blocks.INSTANCE.getGrid().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(CRAFTING_GRIDS, - Blocks.INSTANCE.getCraftingGrid().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(STORAGE_DISKS, - Arrays.stream(ItemStorageType.Variant.values()) - .filter(variant -> variant != ItemStorageType.Variant.CREATIVE) - .map(Items.INSTANCE::getItemStorageDisk) - .map(t -> (Supplier) () -> t) - .toList()); - addAllToTag(IMPORTERS, - Blocks.INSTANCE.getImporter().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(EXPORTERS, - Blocks.INSTANCE.getExporter().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(EXTERNAL_STORAGES, - Blocks.INSTANCE.getExternalStorage().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(DETECTORS, - Blocks.INSTANCE.getDetector().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(CONSTRUCTORS, - Blocks.INSTANCE.getConstructor().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(DESTRUCTORS, - Blocks.INSTANCE.getDestructor().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(WIRELESS_TRANSMITTERS, - Blocks.INSTANCE.getWirelessTransmitter().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(NETWORK_RECEIVERS, - Blocks.INSTANCE.getNetworkReceiver().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(NETWORK_TRANSMITTERS, - Blocks.INSTANCE.getNetworkTransmitter().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(SECURITY_MANAGERS, - Blocks.INSTANCE.getSecurityManager().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(RELAYS, - Blocks.INSTANCE.getRelay().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - addAllToTag(DISK_INTERFACES, - Blocks.INSTANCE.getDiskInterface().values().stream() - .map(block -> (Supplier) block::asItem) - .toList()); - } - - private void addAllToTag(final TagKey t, final Collection> items) { - tag(t).add(items.stream().map(Supplier::get).toArray(Item[]::new)).replace(false); - } - - private void addAllToTag2(final TagKey t, final Collection> items) { - tag(t).add(items.stream().map(Supplier::get).toArray(Item[]::new)).replace(false); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/package-info.java deleted file mode 100644 index 0b3cd5c64..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/datagen/tag/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.datagen.tag; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/FluidHandlerExporterTransferStrategyFactory.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/FluidHandlerExporterTransferStrategyFactory.java deleted file mode 100644 index f9f457d80..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/FluidHandlerExporterTransferStrategyFactory.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.exporter; - -import com.refinedmods.refinedstorage2.api.network.impl.node.exporter.ExporterTransferStrategyImpl; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.common.Platform; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.exporter.FuzzyExporterTransferStrategy; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCache; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCacheImpl; -import com.refinedmods.refinedstorage2.platform.forge.storage.FluidHandlerInsertableStorage; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class FluidHandlerExporterTransferStrategyFactory implements ExporterTransferStrategyFactory { - @Override - public ExporterTransferStrategy create(final ServerLevel level, - final BlockPos pos, - final Direction direction, - final UpgradeState upgradeState, - final AmountOverride amountOverride, - final boolean fuzzyMode) { - final CapabilityCache coordinates = new CapabilityCacheImpl(level, pos, direction); - final FluidHandlerInsertableStorage destination = new FluidHandlerInsertableStorage( - coordinates, - amountOverride - ); - final long transferQuota = (upgradeState.has(Items.INSTANCE.getStackUpgrade()) ? 64 : 1) - * Platform.INSTANCE.getBucketAmount(); - if (fuzzyMode) { - return new FuzzyExporterTransferStrategy(destination, transferQuota); - } - return new ExporterTransferStrategyImpl(destination, transferQuota); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/ItemHandlerExporterTransferStrategyFactory.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/ItemHandlerExporterTransferStrategyFactory.java deleted file mode 100644 index 1c170b677..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/ItemHandlerExporterTransferStrategyFactory.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.exporter; - -import com.refinedmods.refinedstorage2.api.network.impl.node.exporter.ExporterTransferStrategyImpl; -import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.exporter.ExporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.common.exporter.FuzzyExporterTransferStrategy; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCacheImpl; -import com.refinedmods.refinedstorage2.platform.forge.storage.ItemHandlerInsertableStorage; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class ItemHandlerExporterTransferStrategyFactory implements ExporterTransferStrategyFactory { - @Override - public ExporterTransferStrategy create(final ServerLevel level, - final BlockPos pos, - final Direction direction, - final UpgradeState upgradeState, - final AmountOverride amountOverride, - final boolean fuzzyMode) { - final CapabilityCacheImpl coordinates = new CapabilityCacheImpl(level, pos, direction); - final ItemHandlerInsertableStorage destination = new ItemHandlerInsertableStorage(coordinates, amountOverride); - final int transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) ? 64 : 1; - if (fuzzyMode) { - return new FuzzyExporterTransferStrategy(destination, transferQuota); - } - return new ExporterTransferStrategyImpl(destination, transferQuota); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/package-info.java deleted file mode 100644 index b6d6cf5d7..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/exporter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.exporter; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridExtractionStrategy.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridExtractionStrategy.java deleted file mode 100644 index 7ceb604d2..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridExtractionStrategy.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.EmptyActor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; - -import javax.annotation.Nullable; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem; -import net.neoforged.neoforge.items.IItemHandler; -import net.neoforged.neoforge.items.ItemHandlerHelper; -import net.neoforged.neoforge.items.wrapper.PlayerMainInvWrapper; - -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidAction; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidStack; - -public class FluidGridExtractionStrategy implements GridExtractionStrategy { - private static final ItemResource BUCKET_ITEM_RESOURCE = new ItemResource(Items.BUCKET); - - private final AbstractContainerMenu menu; - private final GridOperations gridOperations; - private final PlayerMainInvWrapper playerInventoryStorage; - private final Storage itemStorage; - - public FluidGridExtractionStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - this.menu = containerMenu; - this.gridOperations = grid.createOperations(ResourceTypes.FLUID, player); - this.playerInventoryStorage = new PlayerMainInvWrapper(player.getInventory()); - this.itemStorage = grid.getItemStorage(); - } - - @Override - public boolean onExtract(final PlatformResourceKey resource, - final GridExtractMode extractMode, - final boolean cursor) { - if (resource instanceof FluidResource fluidResource) { - final boolean bucketInInventory = hasBucketInInventory(); - final boolean bucketInStorageChannel = hasBucketInStorage(); - if (bucketInInventory) { - extract(fluidResource, extractMode, cursor, true); - } else if (bucketInStorageChannel) { - extract(fluidResource, extractMode, cursor, false); - } - return true; - } - return false; - } - - @Nullable - private IFluidHandlerItem getFluidStorage(final ItemStack stack) { - return stack.getCapability(Capabilities.FluidHandler.ITEM); - } - - private void extract(final FluidResource fluidResource, - final GridExtractMode mode, - final boolean cursor, - final boolean bucketFromInventory) { - final IFluidHandlerItem destination = getFluidStorage(BUCKET_ITEM_RESOURCE.toItemStack()); - if (destination == null) { - return; // shouldn't happen - } - gridOperations.extract(fluidResource, mode, (resource, amount, action, source) -> { - if (!(resource instanceof FluidResource fluidResource2)) { - return 0; - } - final int inserted = destination.fill(toFluidStack(fluidResource2, amount), toFluidAction(action)); - if (action == Action.EXECUTE) { - extractSourceBucket(bucketFromInventory, source); - if (!insertResultingBucket(cursor, destination)) { - insertSourceBucket(bucketFromInventory, source); - return 0; - } - } - return inserted; - }); - } - - private void extractSourceBucket(final boolean bucketFromInventory, final Actor actor) { - if (bucketFromInventory) { - extractBucket(playerInventoryStorage, Action.EXECUTE); - } else { - itemStorage.extract(BUCKET_ITEM_RESOURCE, 1, Action.EXECUTE, actor); - } - } - - private void insertSourceBucket(final boolean bucketFromInventory, final Actor actor) { - if (bucketFromInventory) { - insertBucket(playerInventoryStorage); - } else { - itemStorage.insert(BUCKET_ITEM_RESOURCE, 1, Action.EXECUTE, actor); - } - } - - private boolean insertResultingBucket(final boolean cursor, final IFluidHandlerItem destination) { - if (cursor) { - menu.setCarried(destination.getContainer()); - return true; - } else { - final ItemStack remainder = ItemHandlerHelper.insertItem( - playerInventoryStorage, - destination.getContainer(), - false - ); - return remainder.isEmpty(); - } - } - - private boolean hasBucketInStorage() { - return itemStorage.extract(BUCKET_ITEM_RESOURCE, 1, Action.SIMULATE, EmptyActor.INSTANCE) == 1; - } - - private boolean hasBucketInInventory() { - return extractBucket(playerInventoryStorage, Action.SIMULATE); - } - - private boolean extractBucket(final IItemHandler source, final Action action) { - final ItemStack toExtractStack = BUCKET_ITEM_RESOURCE.toItemStack(); - for (int slot = 0; slot < source.getSlots(); ++slot) { - final boolean relevant = isSame(source.getStackInSlot(slot), toExtractStack); - if (!relevant) { - continue; - } - if (source.extractItem(slot, 1, action == Action.SIMULATE).getCount() == 1) { - return true; - } - } - return false; - } - - private void insertBucket(final IItemHandler destination) { - ItemHandlerHelper.insertItem(destination, BUCKET_ITEM_RESOURCE.toItemStack(), false); - } - - private boolean isSame(final ItemStack a, final ItemStack b) { - return ItemStack.isSameItemSameComponents(a, b); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridInsertionStrategy.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridInsertionStrategy.java deleted file mode 100644 index a63e81e68..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/FluidGridInsertionStrategy.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; - -import javax.annotation.Nullable; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.ItemStack; -import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem; - -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.ofFluidStack; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidAction; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidStack; - -public class FluidGridInsertionStrategy implements GridInsertionStrategy { - private final AbstractContainerMenu menu; - private final GridOperations gridOperations; - - public FluidGridInsertionStrategy(final AbstractContainerMenu menu, final ServerPlayer player, final Grid grid) { - this.menu = menu; - this.gridOperations = grid.createOperations(ResourceTypes.FLUID, player); - } - - @Override - public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { - final IFluidHandlerItem cursorStorage = getFluidCursorStorage(); - if (cursorStorage == null) { - return false; - } - final FluidStack extractableResource = cursorStorage.getFluidInTank(0); - if (extractableResource.isEmpty()) { - return false; - } - final FluidResource fluidResource = ofFluidStack(extractableResource); - gridOperations.insert(fluidResource, insertMode, (resource, amount, action, source) -> { - if (!(resource instanceof FluidResource fluidResource2)) { - return 0; - } - final FluidStack toDrain = toFluidStack( - fluidResource2, - amount == Long.MAX_VALUE ? Integer.MAX_VALUE : amount - ); - final FluidStack drained = cursorStorage.drain(toDrain, toFluidAction(action)); - if (action == Action.EXECUTE) { - menu.setCarried(cursorStorage.getContainer()); - } - return drained.getAmount(); - }); - return true; - } - - @Nullable - private IFluidHandlerItem getFluidCursorStorage() { - return getFluidStorage(menu.getCarried()); - } - - @Nullable - private IFluidHandlerItem getFluidStorage(final ItemStack stack) { - return stack.getCapability(Capabilities.FluidHandler.ITEM); - } - - @Override - public boolean onTransfer(final int slotIndex) { - throw new UnsupportedOperationException(); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridExtractionStrategy.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridExtractionStrategy.java deleted file mode 100644 index f1d24744b..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridExtractionStrategy.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.grid.strategy; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCache; -import com.refinedmods.refinedstorage2.platform.forge.storage.ItemHandlerInsertableStorage; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.neoforged.neoforge.items.IItemHandler; -import net.neoforged.neoforge.items.wrapper.PlayerMainInvWrapper; - -public class ItemGridExtractionStrategy implements GridExtractionStrategy { - private final GridOperations gridOperations; - private final PlayerMainInvWrapper playerInventoryStorage; - private final CursorItemHandler playerCursorItemHandler; - - public ItemGridExtractionStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); - this.playerInventoryStorage = new PlayerMainInvWrapper(player.getInventory()); - this.playerCursorItemHandler = new CursorItemHandler(containerMenu); - } - - @Override - public boolean onExtract(final PlatformResourceKey resource, - final GridExtractMode extractMode, - final boolean cursor) { - if (resource instanceof ItemResource itemResource) { - final IItemHandler handler = cursor ? playerCursorItemHandler : playerInventoryStorage; - gridOperations.extract( - itemResource, - extractMode, - new ItemHandlerInsertableStorage(CapabilityCache.ofItemHandler(handler), AmountOverride.NONE) - ); - return true; - } - return false; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridInsertionStrategy.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridInsertionStrategy.java deleted file mode 100644 index 567c5180e..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridInsertionStrategy.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.grid.strategy; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCache; -import com.refinedmods.refinedstorage2.platform.forge.storage.ItemHandlerExtractableStorage; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.ItemStack; -import net.neoforged.neoforge.items.wrapper.InvWrapper; -import net.neoforged.neoforge.items.wrapper.RangedWrapper; - -import static com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource.ofItemStack; - -public class ItemGridInsertionStrategy implements GridInsertionStrategy { - private final AbstractContainerMenu containerMenu; - private final GridOperations gridOperations; - private final CursorItemHandler playerCursorItemHandler; - - public ItemGridInsertionStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - this.containerMenu = containerMenu; - this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); - this.playerCursorItemHandler = new CursorItemHandler(containerMenu); - } - - @Override - public boolean onInsert(final GridInsertMode insertMode, final boolean tryAlternatives) { - final ItemStack carried = containerMenu.getCarried(); - if (carried.isEmpty()) { - return false; - } - final ItemResource itemResource = ItemResource.ofItemStack(carried); - gridOperations.insert( - itemResource, - insertMode, - new ItemHandlerExtractableStorage( - CapabilityCache.ofItemHandler(playerCursorItemHandler), - AmountOverride.NONE - ) - ); - return true; - } - - @Override - public boolean onTransfer(final int slotIndex) { - final Slot slot = containerMenu.getSlot(slotIndex); - final RangedWrapper storage = new RangedWrapper( - new InvWrapper(slot.container), - slot.getContainerSlot(), - slot.getContainerSlot() + 1 - ); - final ItemStack itemStackInSlot = storage.getStackInSlot(0); - if (itemStackInSlot.isEmpty()) { - return false; - } - final ItemResource itemResource = ofItemStack(itemStackInSlot); - gridOperations.insert( - itemResource, - GridInsertMode.ENTIRE_RESOURCE, - new ItemHandlerExtractableStorage( - CapabilityCache.ofItemHandler(storage), - AmountOverride.NONE - ) - ); - return true; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridScrollingStrategy.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridScrollingStrategy.java deleted file mode 100644 index 8093f7982..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/ItemGridScrollingStrategy.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.grid.strategy; - -import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode; -import com.refinedmods.refinedstorage2.api.grid.operations.GridOperations; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.grid.Grid; -import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode; -import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy; -import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource; -import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceTypes; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCache; -import com.refinedmods.refinedstorage2.platform.forge.storage.ItemHandlerExtractableStorage; -import com.refinedmods.refinedstorage2.platform.forge.storage.ItemHandlerInsertableStorage; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.neoforged.neoforge.items.IItemHandler; -import net.neoforged.neoforge.items.wrapper.InvWrapper; -import net.neoforged.neoforge.items.wrapper.PlayerMainInvWrapper; -import net.neoforged.neoforge.items.wrapper.RangedWrapper; - -public class ItemGridScrollingStrategy implements GridScrollingStrategy { - private final GridOperations gridOperations; - private final Inventory playerInventory; - private final PlayerMainInvWrapper playerInventoryStorage; - private final CursorItemHandler playerCursorItemHandler; - - public ItemGridScrollingStrategy(final AbstractContainerMenu containerMenu, - final ServerPlayer player, - final Grid grid) { - this.gridOperations = grid.createOperations(ResourceTypes.ITEM, player); - this.playerInventory = player.getInventory(); - this.playerInventoryStorage = new PlayerMainInvWrapper(playerInventory); - this.playerCursorItemHandler = new CursorItemHandler(containerMenu); - } - - @Override - public boolean onScroll(final PlatformResourceKey resource, final GridScrollMode scrollMode, final int slotIndex) { - if (resource instanceof ItemResource itemResource) { - final IItemHandler playerStorage = slotIndex >= 0 - ? new RangedWrapper(new InvWrapper(playerInventory), slotIndex, slotIndex + 1) - : playerInventoryStorage; - switch (scrollMode) { - case GRID_TO_INVENTORY -> handleGridToInventoryScroll(itemResource, playerStorage); - case INVENTORY_TO_GRID -> handleInventoryToGridScroll(itemResource, playerStorage); - case GRID_TO_CURSOR -> handleGridToInventoryScroll(itemResource, playerCursorItemHandler); - } - return true; - } - return false; - } - - private void handleInventoryToGridScroll(final ItemResource itemResource, final IItemHandler sourceStorage) { - gridOperations.insert( - itemResource, - GridInsertMode.SINGLE_RESOURCE, - new ItemHandlerExtractableStorage( - CapabilityCache.ofItemHandler(sourceStorage), - AmountOverride.NONE - ) - ); - } - - private void handleGridToInventoryScroll(final ItemResource itemResource, final IItemHandler destinationStorage) { - gridOperations.extract( - itemResource, - GridExtractMode.SINGLE_RESOURCE, - new ItemHandlerInsertableStorage( - CapabilityCache.ofItemHandler(destinationStorage), - AmountOverride.NONE - ) - ); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/package-info.java deleted file mode 100644 index a993a0085..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/strategy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.grid.strategy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeFluidGridResourceFactory.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeFluidGridResourceFactory.java deleted file mode 100644 index b2e5f8ac1..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/ForgeFluidGridResourceFactory.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.grid.view; - -import com.refinedmods.refinedstorage2.platform.common.grid.view.AbstractFluidGridResourceFactory; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; - -import net.neoforged.fml.ModList; -import net.neoforged.neoforge.fluids.FluidType; - -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidStack; - -public class ForgeFluidGridResourceFactory extends AbstractFluidGridResourceFactory { - @Override - protected String getTooltip(final FluidResource resource) { - return getName(resource); - } - - @Override - protected String getModName(final String modId) { - return ModList - .get() - .getModContainerById(modId) - .map(container -> container.getModInfo().getDisplayName()) - .orElse(""); - } - - @Override - protected String getName(final FluidResource fluidResource) { - return toFluidStack(fluidResource, FluidType.BUCKET_VOLUME).getHoverName().getString(); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/package-info.java deleted file mode 100644 index 9558fc998..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/grid/view/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.grid.view; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/FluidHandlerImporterSource.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/FluidHandlerImporterSource.java deleted file mode 100644 index e8403490b..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/FluidHandlerImporterSource.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.importer; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterSource; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCache; -import com.refinedmods.refinedstorage2.platform.forge.storage.FluidHandlerExtractableStorage; -import com.refinedmods.refinedstorage2.platform.forge.storage.FluidHandlerInsertableStorage; - -import java.util.Iterator; - -class FluidHandlerImporterSource implements ImporterSource { - private final CapabilityCache capabilityCache; - private final InsertableStorage insertTarget; - private final ExtractableStorage extractTarget; - - FluidHandlerImporterSource(final CapabilityCache capabilityCache, - final AmountOverride amountOverride) { - this.capabilityCache = capabilityCache; - this.insertTarget = new FluidHandlerInsertableStorage(capabilityCache, AmountOverride.NONE); - this.extractTarget = new FluidHandlerExtractableStorage(capabilityCache, amountOverride); - } - - @Override - public Iterator getResources() { - return capabilityCache.getFluidIterator(); - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return extractTarget.extract(resource, amount, action, actor); - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return insertTarget.insert(resource, amount, action, actor); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/FluidHandlerImporterTransferStrategyFactory.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/FluidHandlerImporterTransferStrategyFactory.java deleted file mode 100644 index e9387f480..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/FluidHandlerImporterTransferStrategyFactory.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.importer; - -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterSource; -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterTransferStrategyImpl; -import com.refinedmods.refinedstorage2.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCacheImpl; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; -import net.neoforged.neoforge.fluids.FluidType; - -public class FluidHandlerImporterTransferStrategyFactory implements ImporterTransferStrategyFactory { - @Override - public ImporterTransferStrategy create(final ServerLevel level, - final BlockPos pos, - final Direction direction, - final UpgradeState upgradeState, - final AmountOverride amountOverride) { - final ImporterSource source = new FluidHandlerImporterSource(new CapabilityCacheImpl( - level, - pos, - direction - ), amountOverride); - final int transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) - ? FluidType.BUCKET_VOLUME * 64 - : FluidType.BUCKET_VOLUME; - return new ImporterTransferStrategyImpl(source, transferQuota); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/ItemHandlerImporterSource.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/ItemHandlerImporterSource.java deleted file mode 100644 index 33b1ca6dd..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/ItemHandlerImporterSource.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.importer; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterSource; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCache; -import com.refinedmods.refinedstorage2.platform.forge.storage.ItemHandlerExtractableStorage; -import com.refinedmods.refinedstorage2.platform.forge.storage.ItemHandlerInsertableStorage; - -import java.util.Iterator; - -class ItemHandlerImporterSource implements ImporterSource { - private final CapabilityCache capabilityCache; - private final InsertableStorage insertTarget; - private final ExtractableStorage extractTarget; - - ItemHandlerImporterSource(final CapabilityCache capabilityCache, - final AmountOverride amountOverride) { - this.capabilityCache = capabilityCache; - this.insertTarget = new ItemHandlerInsertableStorage(capabilityCache, AmountOverride.NONE); - this.extractTarget = new ItemHandlerExtractableStorage(capabilityCache, amountOverride); - } - - @Override - public Iterator getResources() { - return capabilityCache.getItemIterator(); - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return extractTarget.extract(resource, amount, action, actor); - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return insertTarget.insert(resource, amount, action, actor); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/ItemHandlerImporterTransferStrategyFactory.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/ItemHandlerImporterTransferStrategyFactory.java deleted file mode 100644 index 7dd1c21d7..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/ItemHandlerImporterTransferStrategyFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.importer; - -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterSource; -import com.refinedmods.refinedstorage2.api.network.impl.node.importer.ImporterTransferStrategyImpl; -import com.refinedmods.refinedstorage2.api.network.node.importer.ImporterTransferStrategy; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.api.importer.ImporterTransferStrategyFactory; -import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState; -import com.refinedmods.refinedstorage2.platform.common.content.Items; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCacheImpl; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class ItemHandlerImporterTransferStrategyFactory implements ImporterTransferStrategyFactory { - @Override - public ImporterTransferStrategy create(final ServerLevel level, - final BlockPos pos, - final Direction direction, - final UpgradeState upgradeState, - final AmountOverride amountOverride) { - final ImporterSource source = new ItemHandlerImporterSource(new CapabilityCacheImpl( - level, - pos, - direction - ), amountOverride); - final int transferQuota = upgradeState.has(Items.INSTANCE.getStackUpgrade()) ? 64 : 1; - return new ImporterTransferStrategyImpl(source, transferQuota); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/package-info.java deleted file mode 100644 index 6ca708383..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/importer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.importer; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/package-info.java deleted file mode 100644 index 10a89028b..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/FluidHandlerExtractableStorage.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/FluidHandlerExtractableStorage.java deleted file mode 100644 index cfe13b84d..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/FluidHandlerExtractableStorage.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; - -import net.neoforged.neoforge.fluids.FluidStack; - -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidAction; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidStack; - -public class FluidHandlerExtractableStorage implements ExtractableStorage { - private final CapabilityCache capabilityCache; - private final AmountOverride amountOverride; - - public FluidHandlerExtractableStorage(final CapabilityCache capabilityCache, - final AmountOverride amountOverride) { - this.capabilityCache = capabilityCache; - this.amountOverride = amountOverride; - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - if (!(resource instanceof FluidResource fluidResource)) { - return 0; - } - return capabilityCache.getFluidHandler().map(fluidHandler -> { - final long correctedAmount = amountOverride.overrideAmount( - resource, - amount, - () -> ForgeHandlerUtil.getCurrentAmount(fluidHandler, fluidResource) - ); - if (correctedAmount == 0) { - return 0L; - } - final FluidStack toExtractStack = toFluidStack(fluidResource, correctedAmount); - return (long) fluidHandler.drain(toExtractStack, toFluidAction(action)).getAmount(); - }).orElse(0L); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/FluidHandlerInsertableStorage.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/FluidHandlerInsertableStorage.java deleted file mode 100644 index 35ad156c2..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/FluidHandlerInsertableStorage.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; - -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; - -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidAction; -import static com.refinedmods.refinedstorage2.platform.forge.support.resource.VariantUtil.toFluidStack; - -public class FluidHandlerInsertableStorage implements InsertableStorage { - private final CapabilityCache capabilityCache; - private final AmountOverride amountOverride; - - public FluidHandlerInsertableStorage(final CapabilityCache capabilityCache, - final AmountOverride amountOverride) { - this.capabilityCache = capabilityCache; - this.amountOverride = amountOverride; - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - if (!(resource instanceof FluidResource fluidResource)) { - return 0; - } - return capabilityCache.getFluidHandler().map(fluidHandler -> { - final long correctedAmount = amountOverride.overrideAmount( - fluidResource, - amount, - () -> ForgeHandlerUtil.getCurrentAmount(fluidHandler, fluidResource) - ); - if (correctedAmount == 0) { - return 0L; - } - return doInsert(fluidResource, correctedAmount, action, fluidHandler); - }).orElse(0L); - } - - private long doInsert(final FluidResource resource, - final long amount, - final Action action, - final IFluidHandler fluidHandler) { - final FluidStack stack = toFluidStack(resource, amount); - return fluidHandler.fill(stack, toFluidAction(action)); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBakedModel.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBakedModel.java deleted file mode 100644 index 89fd3bb60..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBakedModel.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskdrive; - -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveBlock; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.forge.storage.DiskContainerItemOverrides; -import com.refinedmods.refinedstorage2.platform.forge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker; -import com.refinedmods.refinedstorage2.platform.forge.support.render.TransformationBuilder; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import javax.annotation.Nullable; - -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.mojang.math.Transformation; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.Direction; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.client.model.BakedModelWrapper; -import net.neoforged.neoforge.client.model.data.ModelData; -import org.joml.Vector3f; - -class DiskDriveBakedModel extends BakedModelWrapper { - private final LoadingCache> cache; - private final DiskContainerItemOverrides itemOverrides; - private final Vector3f[] diskTranslations = new Vector3f[8]; - - DiskDriveBakedModel(final BakedModel baseModel, - final RotationTranslationModelBaker baseModelBaker, - final DiskModelBaker diskModelBaker, - final RotationTranslationModelBaker ledInactiveModelBaker) { - super(baseModel); - int i = 0; - for (int y = 0; y < 4; ++y) { - for (int x = 0; x < 2; ++x) { - this.diskTranslations[i++] = getDiskTranslation(x, y); - } - } - this.cache = CacheBuilder.newBuilder().build(CacheLoader.from(cacheKey -> { - final Transformation rotation = TransformationBuilder.create().rotate(cacheKey.direction).build(); - final RandomSource rand = RandomSource.create(); - final List quads = baseModelBaker.bake(rotation, cacheKey.side, rand); - for (int j = 0; j < diskTranslations.length; ++j) { - final Disk disk = cacheKey.disks[j]; - quads.addAll(getDiskQuads(diskModelBaker, cacheKey, disk, j)); - if (cacheKey.withInactiveLed && disk.state() == StorageState.INACTIVE) { - final Transformation ledTransform = TransformationBuilder - .create() - .rotate(cacheKey.direction) - .translate(diskTranslations[j]) - .build(); - quads.addAll(ledInactiveModelBaker.bake(ledTransform, cacheKey.side, rand)); - } - } - return quads; - })); - this.itemOverrides = new DiskContainerItemOverrides<>( - cache, - baseModel, - diskTranslations, - disks -> new CacheKey(null, true, BiDirection.NORTH, disks), - CacheKey::withSide - ); - } - - @Override - public ItemOverrides getOverrides() { - return itemOverrides; - } - - @Override - public List getQuads(@Nullable final BlockState state, - @Nullable final Direction side, - final RandomSource rand, - final ModelData extraData, - @Nullable final RenderType renderType) { - if (state == null || !(state.getBlock() instanceof DiskDriveBlock diskDriveBlock)) { - return super.getQuads(state, side, rand); - } - final BiDirection direction = diskDriveBlock.getDirection(state); - if (direction == null) { - return super.getQuads(state, side, rand); - } - final Disk[] disks = extraData.get(ForgeDiskDriveBlockEntity.DISKS_PROPERTY); - if (disks == null) { - return super.getQuads(state, side, rand); - } - return cache.getUnchecked(new CacheKey(side, false, direction, disks)); - } - - private List getDiskQuads(final DiskModelBaker diskBakers, - final CacheKey cacheKey, - final Disk disk, - final int index) { - if (disk.state() == StorageState.NONE || disk.item() == null) { - return Collections.emptyList(); - } - final RotationTranslationModelBaker diskBaker = diskBakers.forDisk(disk.item()); - if (diskBaker == null) { - return Collections.emptyList(); - } - final Transformation diskTransform = TransformationBuilder.create() - .rotate(cacheKey.direction) - .translate(diskTranslations[index]) - .build(); - return diskBaker.bake(diskTransform, cacheKey.side, RandomSource.create()); - } - - private static Vector3f getDiskTranslation(final int x, final int y) { - return new Vector3f( - x == 0 ? -(2F / 16F) : -(9F / 16F), - -((y * 3F) / 16F) - (2F / 16F), - 0 - ); - } - - private record CacheKey(@Nullable Direction side, boolean withInactiveLed, BiDirection direction, Disk[] disks) { - CacheKey withSide(final Direction newSide) { - return new CacheKey(newSide, withInactiveLed, direction, disks); - } - - @Override - public boolean equals(final Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - final CacheKey cacheKey = (CacheKey) o; - return side == cacheKey.side && direction == cacheKey.direction && Arrays.equals(disks, cacheKey.disks) - && withInactiveLed == cacheKey.withInactiveLed; - } - - @Override - public int hashCode() { - int result = Objects.hash(side, direction, withInactiveLed); - result = 31 * result + Arrays.hashCode(disks); - return result; - } - - @Override - public String toString() { - return "CacheKey{" - + "side=" + side - + ", withInactiveLed=" + withInactiveLed - + ", direction=" + direction - + ", disks=" + Arrays.toString(disks) - + '}'; - } - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java deleted file mode 100644 index 3469f6361..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/DiskDriveBlockEntityRendererImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskdrive; - -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.AbstractDiskDriveBlockEntityRenderer; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RenderTypes; - -public class DiskDriveBlockEntityRendererImpl - extends AbstractDiskDriveBlockEntityRenderer { - public DiskDriveBlockEntityRendererImpl() { - super(RenderTypes.DISK_LED); - } - - @Override - protected Disk[] getDisks(final AbstractDiskDriveBlockEntity blockEntity) { - return blockEntity.getModelData().get(ForgeDiskDriveBlockEntity.DISKS_PROPERTY); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/package-info.java deleted file mode 100644 index 85c0f7486..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskdrive/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.storage.diskdrive; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceBakedModel.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceBakedModel.java deleted file mode 100644 index e8d124d39..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceBakedModel.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskinterface; - -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.DiskInterfaceBlock; -import com.refinedmods.refinedstorage2.platform.common.support.AbstractActiveColoredDirectionalBlock; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.forge.storage.DiskContainerItemOverrides; -import com.refinedmods.refinedstorage2.platform.forge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker; -import com.refinedmods.refinedstorage2.platform.forge.support.render.TransformationBuilder; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import javax.annotation.Nullable; - -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.mojang.math.Transformation; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.Direction; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.client.model.BakedModelWrapper; -import net.neoforged.neoforge.client.model.data.ModelData; -import org.joml.Vector3f; - -public class DiskInterfaceBakedModel extends BakedModelWrapper { - private final LoadingCache> cache; - private final DiskContainerItemOverrides itemOverrides; - private final Vector3f[] diskTranslations = new Vector3f[6]; - - DiskInterfaceBakedModel(final BakedModel baseModel, - final RotationTranslationModelBaker inactiveBaseModelBaker, - final RotationTranslationModelBaker baseModelBaker, - final DiskModelBaker diskModelBaker, - final RotationTranslationModelBaker ledInactiveModelBaker) { - super(baseModel); - for (int i = 0; i < 6; ++i) { - this.diskTranslations[i] = getDiskTranslation(i); - } - this.cache = CacheBuilder.newBuilder().build(CacheLoader.from(cacheKey -> { - final Transformation rotation = TransformationBuilder.create().rotate(cacheKey.direction).build(); - final RandomSource rand = RandomSource.create(); - final List quads = (cacheKey.active ? baseModelBaker : inactiveBaseModelBaker) - .bake(rotation, cacheKey.side, rand); - for (int j = 0; j < diskTranslations.length; ++j) { - final Disk disk = cacheKey.disks[j]; - quads.addAll(getDiskQuads(diskModelBaker, cacheKey, disk, j)); - if (cacheKey.withInactiveLed && disk.state() == StorageState.INACTIVE) { - final Transformation ledTransform = TransformationBuilder - .create() - .rotate(cacheKey.direction) - .translate(diskTranslations[j]) - .build(); - quads.addAll(ledInactiveModelBaker.bake(ledTransform, cacheKey.side, rand)); - } - } - return quads; - })); - this.itemOverrides = new DiskContainerItemOverrides<>( - cache, - baseModel, - diskTranslations, - disks -> new CacheKey(null, true, true, BiDirection.NORTH, disks), - CacheKey::withSide - ); - } - - @Override - public ItemOverrides getOverrides() { - return itemOverrides; - } - - @Override - public List getQuads(@Nullable final BlockState state, - @Nullable final Direction side, - final RandomSource rand, - final ModelData extraData, - @Nullable final RenderType renderType) { - if (state == null || !(state.getBlock() instanceof DiskInterfaceBlock diskInterfaceBlock)) { - return super.getQuads(state, side, rand); - } - final BiDirection direction = diskInterfaceBlock.getDirection(state); - if (direction == null) { - return super.getQuads(state, side, rand); - } - final Disk[] disks = extraData.get(ForgeDiskInterfaceBlockEntity.DISKS_PROPERTY); - if (disks == null) { - return super.getQuads(state, side, rand); - } - final boolean active = state.getValue(AbstractActiveColoredDirectionalBlock.ACTIVE); - return cache.getUnchecked(new CacheKey(side, active, false, direction, disks)); - } - - private List getDiskQuads(final DiskModelBaker diskBakers, - final CacheKey cacheKey, - final Disk disk, - final int index) { - if (disk.state() == StorageState.NONE || disk.item() == null) { - return Collections.emptyList(); - } - final RotationTranslationModelBaker diskBaker = diskBakers.forDisk(disk.item()); - if (diskBaker == null) { - return Collections.emptyList(); - } - final Transformation diskTransform = TransformationBuilder.create() - .rotate(cacheKey.direction) - .translate(diskTranslations[index]) - .build(); - return diskBaker.bake(diskTransform, cacheKey.side, RandomSource.create()); - } - - private static Vector3f getDiskTranslation(final int i) { - final int x = i < 3 ? 0 : 1; - final int y = i % 3; - return new Vector3f( - x == 0 ? -(2F / 16F) : -(9F / 16F), - -((y * 3F) / 16F) - (6F / 16F), - 0 - ); - } - - private record CacheKey(@Nullable Direction side, - boolean active, - boolean withInactiveLed, - BiDirection direction, - Disk[] disks) { - CacheKey withSide(final Direction newSide) { - return new CacheKey(newSide, active, withInactiveLed, direction, disks); - } - - @Override - public boolean equals(final Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - final CacheKey cacheKey = (CacheKey) o; - return side == cacheKey.side && direction == cacheKey.direction && Arrays.equals(disks, cacheKey.disks) - && withInactiveLed == cacheKey.withInactiveLed && active == cacheKey.active; - } - - @Override - public int hashCode() { - int result = Objects.hash(side, active, direction, withInactiveLed); - result = 31 * result + Arrays.hashCode(disks); - return result; - } - - @Override - public String toString() { - return "CacheKey{" - + "side=" + side - + ", active=" + active - + ", withInactiveLed=" + withInactiveLed - + ", direction=" + direction - + ", disks=" + Arrays.toString(disks) - + '}'; - } - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java deleted file mode 100644 index 0e13258da..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/DiskInterfaceBlockEntityRendererImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.diskinterface; - -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.diskinterface.AbstractDiskInterfaceBlockEntityRenderer; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RenderTypes; - -public class DiskInterfaceBlockEntityRendererImpl - extends AbstractDiskInterfaceBlockEntityRenderer { - public DiskInterfaceBlockEntityRendererImpl() { - super(RenderTypes.DISK_LED); - } - - @Override - protected Disk[] getDisks(final AbstractDiskInterfaceBlockEntity blockEntity) { - return blockEntity.getModelData().get(ForgeDiskInterfaceBlockEntity.DISKS_PROPERTY); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/package-info.java deleted file mode 100644 index 8ab276a04..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/diskinterface/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.storage.diskinterface; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/FluidHandlerExternalStorageProvider.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/FluidHandlerExternalStorageProvider.java deleted file mode 100644 index c91f7cc4e..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/FluidHandlerExternalStorageProvider.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCache; -import com.refinedmods.refinedstorage2.platform.forge.storage.FluidHandlerExtractableStorage; -import com.refinedmods.refinedstorage2.platform.forge.storage.FluidHandlerInsertableStorage; - -import java.util.Iterator; - -class FluidHandlerExternalStorageProvider implements ExternalStorageProvider { - private final CapabilityCache capabilityCache; - private final InsertableStorage insertTarget; - private final ExtractableStorage extractTarget; - - FluidHandlerExternalStorageProvider(final CapabilityCache capabilityCache) { - this.capabilityCache = capabilityCache; - this.insertTarget = new FluidHandlerInsertableStorage(capabilityCache, AmountOverride.NONE); - this.extractTarget = new FluidHandlerExtractableStorage(capabilityCache, AmountOverride.NONE); - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return extractTarget.extract(resource, amount, action, actor); - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return insertTarget.insert(resource, amount, action, actor); - } - - @Override - public Iterator iterator() { - return capabilityCache.getFluidAmountIterator(); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java deleted file mode 100644 index b5ad12fed..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage2.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCacheImpl; - -import java.util.Optional; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class FluidHandlerPlatformExternalStorageProviderFactory implements PlatformExternalStorageProviderFactory { - @Override - public Optional create(final ServerLevel level, - final BlockPos pos, - final Direction direction) { - return Optional.of(new FluidHandlerExternalStorageProvider(new CapabilityCacheImpl(level, pos, direction))); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/ItemHandlerExternalStorageProvider.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/ItemHandlerExternalStorageProvider.java deleted file mode 100644 index 42913da59..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/ItemHandlerExternalStorageProvider.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCache; -import com.refinedmods.refinedstorage2.platform.forge.storage.ItemHandlerExtractableStorage; -import com.refinedmods.refinedstorage2.platform.forge.storage.ItemHandlerInsertableStorage; - -import java.util.Iterator; - -class ItemHandlerExternalStorageProvider implements ExternalStorageProvider { - private final CapabilityCache capabilityCache; - private final InsertableStorage insertTarget; - private final ExtractableStorage extractTarget; - - ItemHandlerExternalStorageProvider(final CapabilityCache capabilityCache) { - this.capabilityCache = capabilityCache; - this.insertTarget = new ItemHandlerInsertableStorage(capabilityCache, AmountOverride.NONE); - this.extractTarget = new ItemHandlerExtractableStorage(capabilityCache, AmountOverride.NONE); - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return extractTarget.extract(resource, amount, action, actor); - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return insertTarget.insert(resource, amount, action, actor); - } - - @Override - public Iterator iterator() { - return capabilityCache.getItemAmountIterator(); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java deleted file mode 100644 index cf1fa0c57..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.storage.external.ExternalStorageProvider; -import com.refinedmods.refinedstorage2.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory; -import com.refinedmods.refinedstorage2.platform.forge.storage.CapabilityCacheImpl; - -import java.util.Optional; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; - -public class ItemHandlerPlatformExternalStorageProviderFactory implements PlatformExternalStorageProviderFactory { - @Override - public Optional create(final ServerLevel level, - final BlockPos pos, - final Direction direction) { - return Optional.of(new ItemHandlerExternalStorageProvider(new CapabilityCacheImpl(level, pos, direction))); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/package-info.java deleted file mode 100644 index 03a5fada8..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/externalstorage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.storage.externalstorage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/package-info.java deleted file mode 100644 index 64a1e40c2..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.storage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/DiskLedBakers.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/DiskLedBakers.java deleted file mode 100644 index cfb3f61b9..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/DiskLedBakers.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker; - -record DiskLedBakers( - RotationTranslationModelBaker inactiveBaker, - RotationTranslationModelBaker normalBaker, - RotationTranslationModelBaker nearCapacityBaker, - RotationTranslationModelBaker fullBaker -) { - RotationTranslationModelBaker forState(final StorageState state) { - return switch (state) { - case INACTIVE -> inactiveBaker; - case NEAR_CAPACITY -> nearCapacityBaker; - case FULL -> fullBaker; - default -> normalBaker; - }; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/ForgePortableGridBlockEntity.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/ForgePortableGridBlockEntity.java deleted file mode 100644 index 44e47e042..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/ForgePortableGridBlockEntity.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid; - -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType; - -import javax.annotation.Nonnull; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.client.model.data.ModelData; -import net.neoforged.neoforge.client.model.data.ModelProperty; - -public class ForgePortableGridBlockEntity extends AbstractPortableGridBlockEntity { - public static final ModelProperty DISK_PROPERTY = new ModelProperty<>(); - - public ForgePortableGridBlockEntity(final PortableGridType type, final BlockPos pos, final BlockState state) { - super(type, pos, state); - } - - @Override - protected void onClientDriveStateUpdated() { - requestModelDataUpdate(); - super.onClientDriveStateUpdated(); - } - - @Nonnull - @Override - public ModelData getModelData() { - return ModelData.builder().with(DISK_PROPERTY, disk).build(); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java deleted file mode 100644 index 79365c6a3..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBakedModel.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.storage.StorageState; -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlock; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItem; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlockItemRenderInfo; -import com.refinedmods.refinedstorage2.platform.common.support.direction.BiDirection; -import com.refinedmods.refinedstorage2.platform.forge.support.render.DiskModelBaker; -import com.refinedmods.refinedstorage2.platform.forge.support.render.ItemBakedModel; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RotationTranslationModelBaker; -import com.refinedmods.refinedstorage2.platform.forge.support.render.TransformationBuilder; - -import java.util.Collections; -import java.util.List; -import javax.annotation.Nullable; - -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.Direction; -import net.minecraft.util.RandomSource; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.client.model.BakedModelWrapper; -import net.neoforged.neoforge.client.model.data.ModelData; -import org.joml.Vector3f; - -class PortableGridBakedModel extends BakedModelWrapper { - private static final Vector3f MOVE_TO_DISK_LOCATION = new Vector3f(0, -12 / 16F, 9 / 16F); - private static final Vector3f MOVE_TO_DISK_LED_LOCATION = new Vector3f(0, -12 / 16F, 9 / 16F); - - private final LoadingCache> cache; - private final PortableGridItemOverrides itemOverrides = new PortableGridItemOverrides(); - - PortableGridBakedModel(final BakedModel baseModel, - final RotationTranslationModelBaker activeModelBaker, - final RotationTranslationModelBaker inactiveModelBaker, - final DiskModelBaker diskModelBaker, - final DiskLedBakers diskLedBakers) { - super(baseModel); - this.cache = CacheBuilder.newBuilder().build(CacheLoader.from(cacheKey -> { - final RotationTranslationModelBaker baseModelBaker = cacheKey.active - ? activeModelBaker - : inactiveModelBaker; - final List quads = baseModelBaker.bake( - TransformationBuilder.create().rotate(cacheKey.direction).build(), - cacheKey.side(), - RandomSource.create() - ); - if (cacheKey.disk.item() == null) { - return quads; - } - final RotationTranslationModelBaker diskBaker = diskModelBaker.forDisk(cacheKey.disk.item()); - if (diskBaker != null) { - quads.addAll(diskBaker.bake(TransformationBuilder.create() - .rotate(cacheKey.direction) - .translate(MOVE_TO_DISK_LOCATION) - .rotate(BiDirection.WEST) - .build(), cacheKey.side(), RandomSource.create())); - } - if (cacheKey.includeLed && cacheKey.disk.state() != StorageState.NONE) { - quads.addAll(diskLedBakers.forState(cacheKey.disk.state()).bake(TransformationBuilder.create() - .translate(MOVE_TO_DISK_LED_LOCATION) - .rotate(BiDirection.WEST) - .build(), cacheKey.side(), RandomSource.create())); - } - return quads; - })); - } - - @Override - public List getQuads(@Nullable final BlockState state, - @Nullable final Direction side, - final RandomSource randomSource, - final ModelData extraData, - @Nullable final RenderType renderType) { - if (state == null || !(state.getBlock() instanceof PortableGridBlock portableGridBlock)) { - return super.getQuads(state, side, randomSource); - } - final BiDirection direction = portableGridBlock.getDirection(state); - if (direction == null) { - return super.getQuads(state, side, randomSource); - } - final Disk disk = extraData.get(ForgePortableGridBlockEntity.DISK_PROPERTY); - if (disk == null) { - return super.getQuads(state, side, randomSource); - } - final boolean active = state.getValue(PortableGridBlock.ACTIVE); - return cache.getUnchecked(new CacheKey(side, direction, active, disk, false)); - } - - @Override - public ItemOverrides getOverrides() { - return itemOverrides; - } - - private class PortableGridItemOverrides extends ItemOverrides { - private final LoadingCache itemCache = CacheBuilder.newBuilder().build( - CacheLoader.from(cacheKey -> new ItemBakedModel( - originalModel, - cache.getUnchecked(cacheKey), - Collections.emptyMap() - )) - ); - - @Override - @Nullable - public BakedModel resolve(final BakedModel bakedModel, - final ItemStack stack, - @Nullable final ClientLevel level, - @Nullable final LivingEntity entity, - final int seed) { - if (level == null) { - return null; - } - final PortableGridBlockItemRenderInfo renderInfo = PortableGridBlockItem.getRenderInfo(stack, level); - return itemCache.getUnchecked(new CacheKey( - null, - BiDirection.NORTH, - renderInfo.active(), - renderInfo.disk(), - true - )); - } - } - - private record CacheKey(@Nullable Direction side, - BiDirection direction, - boolean active, - Disk disk, - boolean includeLed) { - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java deleted file mode 100644 index d4ba2585f..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/PortableGridBlockEntityRendererImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid; - -import com.refinedmods.refinedstorage2.platform.common.storage.Disk; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity; -import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntityRenderer; -import com.refinedmods.refinedstorage2.platform.forge.support.render.RenderTypes; - -import javax.annotation.Nullable; - -public class PortableGridBlockEntityRendererImpl - extends AbstractPortableGridBlockEntityRenderer { - public PortableGridBlockEntityRendererImpl() { - super(RenderTypes.DISK_LED); - } - - @Override - @Nullable - protected Disk getDisk(final T blockEntity) { - return blockEntity.getModelData().get(ForgePortableGridBlockEntity.DISK_PROPERTY); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/package-info.java deleted file mode 100644 index 5e7b5c9cf..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/storage/portablegrid/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.storage.portablegrid; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/ContainerTransferDestination.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/ContainerTransferDestination.java deleted file mode 100644 index 2b0bfd443..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/ContainerTransferDestination.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.containermenu; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.TransferDestination; - -import net.minecraft.world.Container; -import net.minecraft.world.item.ItemStack; -import net.neoforged.neoforge.items.ItemHandlerHelper; -import net.neoforged.neoforge.items.wrapper.InvWrapper; - -public record ContainerTransferDestination(Container destination) implements TransferDestination { - @Override - public ItemStack transfer(final ItemStack stack) { - final InvWrapper destinationInv = new InvWrapper(destination); - return ItemHandlerHelper.insertItem(destinationInv, stack, false); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/MenuOpenerImpl.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/MenuOpenerImpl.java deleted file mode 100644 index c4c5ef686..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/MenuOpenerImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.containermenu; - -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider; -import com.refinedmods.refinedstorage2.platform.common.support.containermenu.MenuOpener; - -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.MenuProvider; - -public class MenuOpenerImpl implements MenuOpener { - @Override - public void openMenu(final ServerPlayer player, final MenuProvider menuProvider) { - if (menuProvider instanceof ExtendedMenuProvider extendedMenuProvider) { - openExtendedMenu(player, extendedMenuProvider); - } else { - player.openMenu(menuProvider); - } - } - - private static void openExtendedMenu(final ServerPlayer player, - final ExtendedMenuProvider extendedMenuProvider) { - player.openMenu( - extendedMenuProvider, - buf -> extendedMenuProvider.getMenuCodec().encode(buf, extendedMenuProvider.getMenuData()) - ); - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/package-info.java deleted file mode 100644 index 7cd95f468..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/containermenu/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.support.containermenu; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/energy/EnergyStorageAdapter.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/energy/EnergyStorageAdapter.java deleted file mode 100644 index 50597f01a..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/energy/EnergyStorageAdapter.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.energy; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage; - -import net.neoforged.neoforge.energy.IEnergyStorage; - -public class EnergyStorageAdapter implements IEnergyStorage { - private final EnergyStorage energyStorage; - - public EnergyStorageAdapter(final EnergyStorage energyStorage) { - this.energyStorage = energyStorage; - } - - public EnergyStorage getEnergyStorage() { - return energyStorage; - } - - @Override - public int receiveEnergy(final int maxReceive, final boolean simulate) { - return (int) energyStorage.receive(maxReceive, simulate ? Action.SIMULATE : Action.EXECUTE); - } - - @Override - public int extractEnergy(final int maxExtract, final boolean simulate) { - return (int) energyStorage.extract(maxExtract, simulate ? Action.SIMULATE : Action.EXECUTE); - } - - @Override - public int getEnergyStored() { - return (int) energyStorage.getStored(); - } - - @Override - public int getMaxEnergyStored() { - return (int) energyStorage.getCapacity(); - } - - @Override - public boolean canExtract() { - return false; - } - - @Override - public boolean canReceive() { - return true; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/energy/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/energy/package-info.java deleted file mode 100644 index 08446aa01..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/energy/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.support.energy; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/package-info.java deleted file mode 100644 index b8c2ddf96..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/inventory/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.support.inventory; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RenderTypes.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RenderTypes.java deleted file mode 100644 index 7a219bfdd..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/RenderTypes.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.render; - -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.VertexFormat; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.RenderStateShard; -import net.minecraft.client.renderer.RenderType; - -public final class RenderTypes { - public static final RenderType DISK_LED = RenderType.create( - "disk_led", - DefaultVertexFormat.POSITION_COLOR, - VertexFormat.Mode.QUADS, - 32565, - false, - true, - RenderType.CompositeState.builder() - .setShaderState(new RenderStateShard.ShaderStateShard(GameRenderer::getPositionColorShader)) - .createCompositeState(false) - ); - - private RenderTypes() { - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/package-info.java deleted file mode 100644 index fbbef2d45..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/render/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.support.render; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/VariantUtil.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/VariantUtil.java deleted file mode 100644 index bc880fd65..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/VariantUtil.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.refinedmods.refinedstorage2.platform.forge.support.resource; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource; - -import java.util.Objects; - -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public final class VariantUtil { - private static final Logger LOGGER = LoggerFactory.getLogger(VariantUtil.class); - - private VariantUtil() { - } - - public static boolean isSame(final FluidResource resource, final FluidStack stack) { - return resource.fluid() == stack.getFluid() && Objects.equals( - resource.components(), - stack.getComponents().asPatch() - ); - } - - public static FluidResource ofFluidStack(final FluidStack fluidStack) { - return new FluidResource(fluidStack.getFluid(), fluidStack.getComponents().asPatch()); - } - - @SuppressWarnings("deprecation") - public static FluidStack toFluidStack(final FluidResource fluidResource, final long amount) { - if (amount > Integer.MAX_VALUE) { - LOGGER.warn("Truncating too large amount for {} to fit into FluidStack {}", fluidResource, amount); - } - return new FluidStack( - fluidResource.fluid().builtInRegistryHolder(), - (int) amount, - fluidResource.components() - ); - } - - public static Action toAction(final IFluidHandler.FluidAction action) { - return action == IFluidHandler.FluidAction.SIMULATE ? Action.SIMULATE : Action.EXECUTE; - } - - public static IFluidHandler.FluidAction toFluidAction(final Action action) { - return action == Action.SIMULATE ? IFluidHandler.FluidAction.SIMULATE : IFluidHandler.FluidAction.EXECUTE; - } -} diff --git a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/package-info.java b/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/package-info.java deleted file mode 100644 index 48edca2fd..000000000 --- a/refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/support/resource/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.platform.forge.support.resource; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-query-parser/build.gradle b/refinedstorage2-query-parser/build.gradle deleted file mode 100644 index 5d6610f0e..000000000 --- a/refinedstorage2-query-parser/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage2-query-parser' - -dependencies { - api project(':refinedstorage2-core-api') - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerTokenMapping.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerTokenMapping.java deleted file mode 100644 index 5867511ab..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/LexerTokenMapping.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.refinedmods.refinedstorage2.query.lexer; - -public record LexerTokenMapping(String value, - TokenType type) { -} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenType.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenType.java deleted file mode 100644 index f372ffda8..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/TokenType.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.query.lexer; - -public enum TokenType { - INTEGER_NUMBER, - FLOATING_NUMBER, - IDENTIFIER, - PAREN_OPEN, - PAREN_CLOSE, - BIN_OP, - UNARY_OP -} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/package-info.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/package-info.java deleted file mode 100644 index f0fcfe964..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/lexer/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.query.lexer; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Associativity.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Associativity.java deleted file mode 100644 index 1c318aba4..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Associativity.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.refinedmods.refinedstorage2.query.parser; - -public enum Associativity { - LEFT, - RIGHT -} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Operator.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Operator.java deleted file mode 100644 index ede11b93a..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/Operator.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.refinedmods.refinedstorage2.query.parser; - -public record Operator(int level, Associativity associativity) { -} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/ParserException.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/ParserException.java deleted file mode 100644 index 2588b0e80..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/ParserException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.refinedmods.refinedstorage2.query.parser; - -import com.refinedmods.refinedstorage2.query.lexer.Token; - -public class ParserException extends RuntimeException { - private final transient Token token; - - public ParserException(final String message, final Token token) { - super(message); - this.token = token; - } - - public Token getToken() { - return token; - } -} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/BinOpNode.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/BinOpNode.java deleted file mode 100644 index 68cb44b7d..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/BinOpNode.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.query.parser.node; - -import com.refinedmods.refinedstorage2.query.lexer.Token; - -public record BinOpNode(Node left, - Node right, - Token binOp) implements Node { - @Override - public String toString() { - return "(" + left + " " + binOp.content() + " " + right + ")"; - } -} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/LiteralNode.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/LiteralNode.java deleted file mode 100644 index 931392635..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/LiteralNode.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.query.parser.node; - -import com.refinedmods.refinedstorage2.query.lexer.Token; - -public record LiteralNode(Token token) implements Node { - @Override - public String toString() { - return token.content(); - } -} - diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/Node.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/Node.java deleted file mode 100644 index f0a3eb40e..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/Node.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.refinedmods.refinedstorage2.query.parser.node; - -public interface Node { -} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/UnaryOpNode.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/UnaryOpNode.java deleted file mode 100644 index 5993bbce9..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/UnaryOpNode.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.refinedmods.refinedstorage2.query.parser.node; - -import com.refinedmods.refinedstorage2.query.lexer.Token; - -public record UnaryOpNode(Node node, Token operator) implements Node { - @Override - public String toString() { - return operator.content() + node; - } -} diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/package-info.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/package-info.java deleted file mode 100644 index 717873bb2..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/node/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.query.parser.node; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/package-info.java b/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/package-info.java deleted file mode 100644 index 9d4006a45..000000000 --- a/refinedstorage2-query-parser/src/main/java/com/refinedmods/refinedstorage2/query/parser/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.query.parser; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-query-parser/src/main/resources/fabric.mod.json b/refinedstorage2-query-parser/src/main/resources/fabric.mod.json deleted file mode 100644 index 7b57211c5..000000000 --- a/refinedstorage2-query-parser/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage2-query-parser", - "version": "${version}", - "name": "Refined Storage 2 Query Parser", - "authors": [ - "Refined Mods" - ], - "license": "MIT", - "environment": "*", - "custom": { - "modmenu": { - "parent": "refinedstorage2", - "badges": [ - "library" - ] - } - } -} diff --git a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/parser/ParserBuilder.java b/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/parser/ParserBuilder.java deleted file mode 100644 index 350d22fae..000000000 --- a/refinedstorage2-query-parser/src/test/java/com/refinedmods/refinedstorage2/query/parser/ParserBuilder.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.refinedmods.refinedstorage2.query.parser; - -import com.refinedmods.refinedstorage2.query.lexer.Source; -import com.refinedmods.refinedstorage2.query.lexer.Token; -import com.refinedmods.refinedstorage2.query.lexer.TokenPosition; -import com.refinedmods.refinedstorage2.query.lexer.TokenRange; -import com.refinedmods.refinedstorage2.query.lexer.TokenType; -import com.refinedmods.refinedstorage2.query.parser.node.Node; - -import java.util.ArrayList; -import java.util.List; - -class ParserBuilder { - private static final TokenPosition DUMMY_POSITION = - new TokenPosition(new Source("", ""), new TokenRange(0, 0, 0, 0)); - - private static final ParserOperatorMappings OPERATOR_MAPPINGS = new ParserOperatorMappings() - .addBinaryOperator("=", new Operator(0, Associativity.RIGHT)) - .addBinaryOperator("||", new Operator(1, Associativity.LEFT)) - .addBinaryOperator("&&", new Operator(2, Associativity.LEFT)) - .addBinaryOperator("+", new Operator(3, Associativity.LEFT)) - .addBinaryOperator("-", new Operator(3, Associativity.LEFT)) - .addBinaryOperator("*", new Operator(4, Associativity.LEFT)) - .addBinaryOperator("/", new Operator(4, Associativity.LEFT)) - .addBinaryOperator("^", new Operator(5, Associativity.RIGHT)); - - private final List tokens = new ArrayList<>(); - - ParserBuilder token(final String content, final TokenType type) { - tokens.add(new Token(content, type, DUMMY_POSITION)); - return this; - } - - List getNodes() { - final Parser parser = new Parser(tokens, OPERATOR_MAPPINGS); - parser.parse(); - return parser.getNodes(); - } -} diff --git a/refinedstorage2-resource-api/build.gradle b/refinedstorage2-resource-api/build.gradle deleted file mode 100644 index 0ff1b7d23..000000000 --- a/refinedstorage2-resource-api/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage2-resource-api' - -dependencies { - api libs.apiguardian - api project(":refinedstorage2-core-api") - testImplementation libs.junit.api - testRuntimeOnly libs.junit.engine - testImplementation libs.assertj -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/ResourceKey.java b/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/ResourceKey.java deleted file mode 100644 index daebbc4e5..000000000 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/ResourceKey.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.api.resource; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.4") -public interface ResourceKey { -} diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/FilterMode.java b/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/FilterMode.java deleted file mode 100644 index fd2a97fc0..000000000 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/FilterMode.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.refinedmods.refinedstorage2.api.resource.filter; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public enum FilterMode { - ALLOW, - BLOCK -} diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/package-info.java b/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/package-info.java deleted file mode 100644 index a28d22e92..000000000 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/filter/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.resource.filter; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/package-info.java b/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/package-info.java deleted file mode 100644 index 3b175841c..000000000 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/listenable/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.resource.list.listenable; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/package-info.java b/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/package-info.java deleted file mode 100644 index 3cc4bbfbc..000000000 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/list/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.resource.list; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/package-info.java b/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/package-info.java deleted file mode 100644 index 4ff8b7ce5..000000000 --- a/refinedstorage2-resource-api/src/main/java/com/refinedmods/refinedstorage2/api/resource/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.resource; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-resource-api/src/main/resources/fabric.mod.json b/refinedstorage2-resource-api/src/main/resources/fabric.mod.json deleted file mode 100644 index 176416c01..000000000 --- a/refinedstorage2-resource-api/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage2-resource-api", - "version": "${version}", - "name": "Refined Storage 2 Resource API", - "authors": [ - "Refined Mods" - ], - "license": "MIT", - "environment": "*", - "custom": { - "modmenu": { - "parent": "refinedstorage2", - "badges": [ - "library" - ] - } - } -} diff --git a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/TestResource.java b/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/TestResource.java deleted file mode 100644 index 9673135e4..000000000 --- a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/TestResource.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.refinedmods.refinedstorage2.api.resource; - -public enum TestResource implements ResourceKey { - A, - B, - C -} diff --git a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceListImplTest.java b/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceListImplTest.java deleted file mode 100644 index fd971ee0d..000000000 --- a/refinedstorage2-resource-api/src/test/java/com/refinedmods/refinedstorage2/api/resource/list/ResourceListImplTest.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.refinedmods.refinedstorage2.api.resource.list; - -class ResourceListImplTest extends AbstractResourceListTest { - @Override - protected ResourceList createList() { - return new ResourceListImpl(); - } -} diff --git a/refinedstorage2-storage-api/build.gradle b/refinedstorage2-storage-api/build.gradle deleted file mode 100644 index aa004399e..000000000 --- a/refinedstorage2-storage-api/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - id 'java-library' -} - -archivesBaseName = 'refinedstorage2-storage-api' - -dependencies { - api libs.apiguardian - api project(':refinedstorage2-resource-api') - api project(':refinedstorage2-core-api') - implementation libs.slf4j.api - testImplementation libs.junit.api - testImplementation libs.junit.params - testRuntimeOnly libs.junit.engine - testRuntimeOnly libs.slf4j.impl - testImplementation libs.assertj - testImplementation libs.mockito -} - -test { - useJUnitPlatform() -} - -enableMutationTesting() -enableJavadoc() -enablePublishing() diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/NoopStorage.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/NoopStorage.java deleted file mode 100644 index b72527b03..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/NoopStorage.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -import java.util.Collection; -import java.util.Collections; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.3") -public class NoopStorage implements Storage { - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return 0; - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return 0; - } - - @Override - public Collection getAll() { - return Collections.emptyList(); - } - - @Override - public long getStored() { - return 0; - } -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/TrackedResourceAmount.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/TrackedResourceAmount.java deleted file mode 100644 index 0aca3dbc5..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/TrackedResourceAmount.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; - -import javax.annotation.Nullable; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.3.0") -public record TrackedResourceAmount(ResourceAmount resourceAmount, @Nullable TrackedResource trackedResource) { -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannel.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannel.java deleted file mode 100644 index 55cf8eb60..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannel.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.channel; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.listenable.ResourceListListener; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedStorage; - -import java.util.Optional; -import java.util.function.Predicate; - -import org.apiguardian.api.API; - -/** - * A storage channel is the entry-point for various storage operations. - * It acts as a storage, and is usually backed by a - * {@link com.refinedmods.refinedstorage2.api.storage.composite.CompositeStorage}. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public interface StorageChannel extends Storage, TrackedStorage { - /** - * Adds a listener to the storage channel. - * - * @param listener the listener - */ - void addListener(ResourceListListener listener); - - /** - * Removes a listener from the storage channel. - * - * @param listener the listener - */ - void removeListener(ResourceListListener listener); - - /** - * @param resource the resource to retrieve - * @return the resource amount for the given resource, if present - */ - Optional get(ResourceKey resource); - - /** - * Sorts the sources in the backing storage. - */ - void sortSources(); - - /** - * Adds a source to the channel and resorts all the sources. - * - * @param source the source - */ - void addSource(Storage source); - - /** - * Removes a source from the channel. - * - * @param source the source - */ - void removeSource(Storage source); - - /** - * Checks if a source is present. - * - * @param matcher a predicate - * @return whether the predicate matched - */ - boolean hasSource(Predicate matcher); -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannelImpl.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannelImpl.java deleted file mode 100644 index da97fe035..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/StorageChannelImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.channel; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl; -import com.refinedmods.refinedstorage2.api.resource.list.listenable.ListenableResourceList; -import com.refinedmods.refinedstorage2.api.resource.list.listenable.ResourceListListener; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; -import com.refinedmods.refinedstorage2.api.storage.composite.CompositeStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource; - -import java.util.Collection; -import java.util.Optional; -import java.util.function.Predicate; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public class StorageChannelImpl implements StorageChannel { - protected final CompositeStorageImpl storage; - private final ListenableResourceList list; - - public StorageChannelImpl() { - this(new ResourceListImpl()); - } - - public StorageChannelImpl(final ResourceList list) { - this.list = new ListenableResourceList(list); - this.storage = new CompositeStorageImpl(this.list); - } - - @Override - public void sortSources() { - storage.sortSources(); - } - - @Override - public void addSource(final Storage source) { - storage.addSource(source); - } - - @Override - public void removeSource(final Storage source) { - storage.removeSource(source); - } - - @Override - public boolean hasSource(final Predicate matcher) { - return storage.getSources().stream().anyMatch(matcher); - } - - @Override - public void addListener(final ResourceListListener listener) { - list.addListener(listener); - } - - @Override - public void removeListener(final ResourceListListener listener) { - list.removeListener(listener); - } - - @Override - public Optional get(final ResourceKey resource) { - return list.get(resource); - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return storage.extract(resource, amount, action, actor); - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return storage.insert(resource, amount, action, actor); - } - - @Override - public Collection getAll() { - return storage.getAll(); - } - - @Override - public long getStored() { - return storage.getStored(); - } - - @Override - public Optional findTrackedResourceByActorType(final ResourceKey resource, - final Class actorType) { - return storage.findTrackedResourceByActorType(resource, actorType); - } -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/package-info.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/package-info.java deleted file mode 100644 index ab85d85e0..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/channel/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.storage.channel; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityProvider.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityProvider.java deleted file mode 100644 index 6514597f3..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/PriorityProvider.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.composite; - -import org.apiguardian.api.API; - -/** - * Implement this on {@link com.refinedmods.refinedstorage2.api.storage.Storage}s that have a priority that - * are contained in an {@link CompositeStorage}. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0") -public interface PriorityProvider { - /** - * The priority. Higher priority storages will be inserted into and extracted from first. - * - * @return the priority - */ - int getPriority(); -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/package-info.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/package-info.java deleted file mode 100644 index 110633698..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/composite/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.storage.composite; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageListener.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageListener.java deleted file mode 100644 index 3752d38fc..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageListener.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.external; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.5") -public interface ExternalStorageListener { - void beforeDetectChanges(ResourceKey resource, Actor actor); -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageProvider.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageProvider.java deleted file mode 100644 index dbd2ff8a1..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageProvider.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.external; - -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.storage.ExtractableStorage; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; - -import java.util.Iterator; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.2.4") -public interface ExternalStorageProvider extends InsertableStorage, ExtractableStorage { - Iterator iterator(); -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/package-info.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/package-info.java deleted file mode 100644 index d06ebdd79..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/external/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.storage.external; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/LimitedStorage.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/LimitedStorage.java deleted file mode 100644 index 2463d2aef..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/LimitedStorage.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.limited; - -import com.refinedmods.refinedstorage2.api.storage.Storage; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") -public interface LimitedStorage extends Storage { - long getCapacity(); -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/LimitedStorageImpl.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/LimitedStorageImpl.java deleted file mode 100644 index 340d5ee20..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/LimitedStorageImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.limited; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.core.CoreValidations; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.AbstractProxyStorage; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; -import com.refinedmods.refinedstorage2.api.storage.InsertableStorage; -import com.refinedmods.refinedstorage2.api.storage.Storage; - -import org.apiguardian.api.API; - -/** - * This class can decorate any other {@link Storage} to add a capacity to it. - * {@link InsertableStorage#insert(com.refinedmods.refinedstorage2.api.resource.ResourceKey, long, Action, Actor)} - * operations will respect this capacity. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.2") -public class LimitedStorageImpl extends AbstractProxyStorage implements LimitedStorage { - private final long capacity; - - /** - * @param delegate the storage that is being decorated - * @param capacity the capacity, must be 0 or larger than 0 - */ - public LimitedStorageImpl(final Storage delegate, final long capacity) { - super(delegate); - this.capacity = CoreValidations.validateNotNegative(capacity, "Capacity cannot be negative"); - } - - /** - * Constructs the limited storage with a {@link InMemoryStorageImpl} storage. - * - * @param capacity the capacity, must be 0 or larger than 0 - */ - public LimitedStorageImpl(final long capacity) { - this(new InMemoryStorageImpl(), capacity); - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - final long spaceRemaining = capacity - delegate.getStored(); - if (spaceRemaining == 0) { - return 0; - } - final long maxInsert = Math.min(amount, spaceRemaining); - return super.insert(resource, maxInsert, action, actor); - } - - @Override - public long getCapacity() { - return capacity; - } -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/package-info.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/package-info.java deleted file mode 100644 index 49c472a22..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/limited/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.storage.limited; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/package-info.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/package-info.java deleted file mode 100644 index 6946c9603..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.storage; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorage.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorage.java deleted file mode 100644 index 7467bad00..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorage.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.tracked; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; - -import java.util.Optional; - -import org.apiguardian.api.API; - -/** - * A storage that is able to track resources being modified. - */ -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") -public interface TrackedStorage extends Storage { - /** - * Finds the tracked resource by actor type. - * - * @param resource the resource - * @param actorType the actor type - * @return the tracked resource modified by the given actor type, if present - */ - Optional findTrackedResourceByActorType(ResourceKey resource, Class actorType); -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageRepository.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageRepository.java deleted file mode 100644 index 9f3948b9d..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/TrackedStorageRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.tracked; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import java.util.Optional; - -import org.apiguardian.api.API; - -@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.4") -public interface TrackedStorageRepository { - void update(ResourceKey resource, Actor actor, long time); - - Optional findTrackedResourceByActorType(ResourceKey resource, Class actorType); -} diff --git a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/package-info.java b/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/package-info.java deleted file mode 100644 index 4e72a9254..000000000 --- a/refinedstorage2-storage-api/src/main/java/com/refinedmods/refinedstorage2/api/storage/tracked/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -@ParametersAreNonnullByDefault -@FieldsAndMethodsAreNonnullByDefault -package com.refinedmods.refinedstorage2.api.storage.tracked; - -import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedstorage2-storage-api/src/main/resources/fabric.mod.json b/refinedstorage2-storage-api/src/main/resources/fabric.mod.json deleted file mode 100644 index d874cdc93..000000000 --- a/refinedstorage2-storage-api/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "schemaVersion": 1, - "id": "refinedstorage2-storage-api", - "version": "${version}", - "name": "Refined Storage 2 Storage API", - "authors": [ - "Refined Mods" - ], - "license": "MIT", - "environment": "*", - "custom": { - "modmenu": { - "parent": "refinedstorage2", - "badges": [ - "library" - ] - } - } -} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/TestResource.java b/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/TestResource.java deleted file mode 100644 index 8b36a05e5..000000000 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/TestResource.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -public enum TestResource implements ResourceKey { - A, - B, - C -} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageProviderImpl.java b/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageProviderImpl.java deleted file mode 100644 index df78ba786..000000000 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalStorageProviderImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.external; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceAmount; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.Storage; - -import java.util.Iterator; - -class ExternalStorageProviderImpl implements ExternalStorageProvider { - private final Storage storage; - - ExternalStorageProviderImpl(final Storage storage) { - this.storage = storage; - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return storage.extract(resource, amount, action, actor); - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return storage.insert(resource, amount, action, actor); - } - - @Override - public Iterator iterator() { - return storage.getAll().iterator(); - } -} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalTestResource.java b/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalTestResource.java deleted file mode 100644 index 0614971fb..000000000 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/ExternalTestResource.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.external; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; - -enum ExternalTestResource implements ResourceKey { - A, - A_TRANSFORMED, - A_ALTERNATIVE, - B, - B_TRANSFORMED -} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/SpyingExternalStorageListener.java b/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/SpyingExternalStorageListener.java deleted file mode 100644 index f9773c7a3..000000000 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/SpyingExternalStorageListener.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.external; - -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.Actor; - -import java.util.ArrayList; -import java.util.List; - -class SpyingExternalStorageListener implements ExternalStorageListener { - public final List resources = new ArrayList<>(); - public final List actors = new ArrayList<>(); - - @Override - public void beforeDetectChanges(final ResourceKey resource, final Actor actor) { - resources.add(resource); - actors.add(actor); - } -} diff --git a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/TransformingStorage.java b/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/TransformingStorage.java deleted file mode 100644 index 4458aa0af..000000000 --- a/refinedstorage2-storage-api/src/test/java/com/refinedmods/refinedstorage2/api/storage/external/TransformingStorage.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.refinedmods.refinedstorage2.api.storage.external; - -import com.refinedmods.refinedstorage2.api.core.Action; -import com.refinedmods.refinedstorage2.api.resource.ResourceKey; -import com.refinedmods.refinedstorage2.api.storage.AbstractProxyStorage; -import com.refinedmods.refinedstorage2.api.storage.Actor; -import com.refinedmods.refinedstorage2.api.storage.InMemoryStorageImpl; - -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.A_ALTERNATIVE; -import static com.refinedmods.refinedstorage2.api.storage.external.ExternalTestResource.A_TRANSFORMED; - -class TransformingStorage extends AbstractProxyStorage { - TransformingStorage() { - super(new InMemoryStorageImpl()); - } - - private ResourceKey transform(final ResourceKey resource) { - if (resource == ExternalTestResource.A) { - return A_TRANSFORMED; - } else if (resource == ExternalTestResource.B) { - return ExternalTestResource.B_TRANSFORMED; - } - return resource; - } - - @Override - public long insert(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - return super.insert(transform(resource), amount, action, actor); - } - - @Override - public long extract(final ResourceKey resource, final long amount, final Action action, final Actor actor) { - final long extracted = super.extract(resource, amount, action, actor); - if (resource == A_TRANSFORMED) { - super.extract(A_ALTERNATIVE, amount / 2, action, actor); - } - return extracted; - } -} diff --git a/settings.gradle b/settings.gradle index b196264c1..9f353bdd6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,16 +17,16 @@ dependencyResolutionManagement { } } -rootProject.name = 'refinedstorage2' -include 'refinedstorage2-core-api' -include 'refinedstorage2-resource-api' -include 'refinedstorage2-storage-api' -include 'refinedstorage2-query-parser' -include 'refinedstorage2-grid-api' -include 'refinedstorage2-network-api' -include 'refinedstorage2-network' -include 'refinedstorage2-platform-api' -include 'refinedstorage2-platform-fabric' -include 'refinedstorage2-platform-forge' -include 'refinedstorage2-platform-common' -include 'refinedstorage2-network-test' +rootProject.name = 'refinedstorage' +include 'refinedstorage-core-api' +include 'refinedstorage-resource-api' +include 'refinedstorage-storage-api' +include 'refinedstorage-query-parser' +include 'refinedstorage-grid-api' +include 'refinedstorage-network-api' +include 'refinedstorage-network' +include 'refinedstorage-platform-api' +include 'refinedstorage-platform-fabric' +include 'refinedstorage-platform-neoforge' +include 'refinedstorage-platform-common' +include 'refinedstorage-network-test' From a98df115b1fb22d094330f9d0455787a3cf7556e Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 4 Jul 2024 14:11:13 +0200 Subject: [PATCH 8/9] chore: add git-blame-ignore-revs file --- .git-blame-ignore-revs | 4 ++++ CHANGELOG.md | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..0f3897062 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,4 @@ +# Use via: git config --local --add blame.ignoreRevsFile .git-blame-ignore-revs + +# Rename "refinedstorage2" to "refinedstorage" +03d02f1e07e1e6e9726404c236c3af227126ade0 diff --git a/CHANGELOG.md b/CHANGELOG.md index c52c14de8..92a32be6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,16 +14,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Quartz Enriched Copper, used to craft cables. - Block of Quartz Enriched Copper +### Changed + +- The mod ID has been changed from "refinedstorage2" to "refinedstorage". Worlds that used milestone 3 on Minecraft 1.20.4 are no longer compatible. +- Recipes now use common tag conventions from NeoForge and Fabric. + ### Fixed - Regulator Upgrade having wrong GUI title. - Crafting Grid not dropping crafting matrix contents when broken. -- "+1" amount screen button not doing anything. - -### Changed - -- The mod ID has been changed to "refinedstorage". Worlds that used milestone 3 on Minecraft 1.20.4 are no longer compatible. -- Recipes now use common tag conventions from NeoForge and Fabric. +- "+1" button on amount screen not doing anything. ## [2.0.0-milestone.3.14] - 2024-06-28 From 006b396f62ee5fce18899bcec54081eb5705c739 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 4 Jul 2024 12:27:19 +0000 Subject: [PATCH 9/9] chore: prepare release v2.0.0-milestone.4.0 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92a32be6d..ee35870ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [2.0.0-milestone.4.0] - 2024-07-04 + ### Added - Ported to Minecraft 1.21. @@ -637,7 +639,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - The Grid can now use smooth scrolling. - The Grid now has syntax highlighting for the search query. -[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.14...HEAD +[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.0...HEAD + +[2.0.0-milestone.4.0]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.14...v2.0.0-milestone.4.0 [2.0.0-milestone.3.14]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.3.13...v2.0.0-milestone.3.14